ICU-8972 minor fixes & updates for & from preparseucd.py; add remaining ICU-specific properties to ppucd.txt; generated pnames data different but equivalent

X-SVN-Rev: 31161
This commit is contained in:
Markus Scherer 2011-12-20 07:48:49 +00:00
parent cc68c8c6e2
commit 7063bdb084
4 changed files with 144 additions and 98 deletions

View File

@ -23,12 +23,12 @@ const int32_t PropNameData::valueMaps[1086]={
0xc9,0x798,0xc9,0x7b2,0xc9,0x7c5,0xc9,0x3a8,0xc9,0x72f,0xc9,0x781,0xc9,0x622,0xc9,0x64c,
0xc9,0x60e,0xc9,0x636,0xc9,0x705,0xc9,0x681,0xc9,0x699,0xc9,0x6b5,0xc9,0x6bd,0xc9,0x6c5,
0xc9,0x6cd,0xc9,0x6d5,0xc9,0x388,0xc9,0x395,0xc9,0x3fe,0xc9,0x45c,0xc9,0x43f,0xc9,0x3c2,
0xc9,0x3e0,0xc9,0x41b,0xc9,0x1000,0x1015,0x7d5,0x141,0x988,0x158,0x2358,0xcf,0x2377,0x239,0x24b5,
0x24f,0x250f,0x259,0x2870,0x295,0x2bd5,0x2d3,0x2c6a,0x2dd,0x2f8b,0x322,0x2fc9,0x32a,0x27f2,0x28b,0x2f0f,
0x30f,0x2f64,0x31c,0x2ee1,0x308,0x2f34,0x315,0x2c45,0xcf,0x38f7,0xcf,0x276c,0x27b,0x384f,0x3cc,0x391d,
0x3df,0x2000,0x2001,0x3af4,0x3f0,0x3000,0x3001,0x3ae2,0,0x4000,0x400d,0x39c7,0,0x39d0,0,0x39ea,
0,0x39fb,0,0x3a0c,0,0x3a22,0,0x3a2b,0,0x3a48,0,0x3a66,0,0x3a84,0,0x3aa2,
0,0x3ab8,0,0x3acc,0,0x7000,0x7001,0x3dc8,0,0x6a8,0x12,0,1,0x12,0x20,0x6c6,
0xc9,0x3e0,0xc9,0x41b,0xc9,0x1000,0x1015,0x7e7,0x141,0x99a,0x158,0x236a,0xcf,0x2389,0x239,0x24c7,
0x24f,0x2521,0x259,0x2882,0x295,0x2be7,0x2d3,0x2c7c,0x2dd,0x2f9d,0x322,0x2fdb,0x32a,0x2804,0x28b,0x2f21,
0x30f,0x2f76,0x31c,0x2ef3,0x308,0x2f46,0x315,0x2c57,0xcf,0x3909,0xcf,0x277e,0x27b,0x3861,0x3cc,0x392f,
0x3df,0x2000,0x2001,0x39d9,0x3f0,0x3000,0x3001,0x7d5,0,0x4000,0x400d,0x3cc4,0,0x3ccd,0,0x3ce7,
0,0x3cf8,0,0x3d09,0,0x3d1f,0,0x3d28,0,0x3d45,0,0x3d63,0,0x3d81,0,0x3d9f,
0,0x3db5,0,0x3dc9,0,0x7000,0x7001,0x3cad,0,0x6a8,0x12,0,1,0x12,0x20,0x6c6,
0x48,0,1,7,8,9,0xa,0xb,0xc,0xd,0xe,0xf,0x10,0x11,0x12,0x13,
0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,
0x24,0x54,0x5b,0x67,0x6b,0x76,0x7a,0x81,0x82,0x84,0xc8,0xca,0xd6,0xd8,0xda,0xdc,
@ -36,54 +36,54 @@ const int32_t PropNameData::valueMaps[1086]={
0x93,0xbe,0xe9,0xf6,0x103,0x110,0x11d,0x12a,0x137,0x172,0x1bd,0x203,0x24b,0x26b,0x278,0x285,
0x292,0x29f,0x2ac,0x2b9,0x2c6,0x2d3,0x2e0,0x2ed,0x2fa,0x322,0x33a,0x59,0x68,0x84,0xa0,0xaf,
0xcb,0xda,0x144,0x15e,0x17f,0x193,0x1ae,0x1ca,0x1d3,0x1e3,0x1eb,0x1f4,0x210,0x219,0x229,0x23a,
0x258,0x854,1,0,0x13,0x88f,0x907,0x84c,0x860,0x877,0x7e4,0x822,0x7f6,0x963,0x978,0x8d9,
0x8a0,0x8bd,0x918,0x92a,0x947,0x8eb,0x837,0x80d,0x9b4,1,0,0xdd,0x1c70,0xbde,0x17c0,0x17e8,
0x1836,0x1699,0x1f0b,0xf29,0x144b,0x1121,0xb6f,0x157f,0xa80,0x20ca,0x218b,0x11c6,0xbfe,0x1490,0x147d,0x1d47,
0x216f,0x217c,0x1714,0x1980,0x1ebe,0x219a,0x17b7,0x21a5,0x1c1b,0x13f0,0x14fd,0x1333,0xd17,0x2209,0x1c98,0x1e63,
0x178d,0x1bef,0x1806,0x1463,0x13ac,0x1f82,0x10d9,0xfad,0x189f,0x1c7d,0xb82,0x19d7,0x1b9a,0x1039,0x1d24,0x1269,
0xc61,0xc0f,0x13cd,0x1b10,0x1201,0xc89,0xde9,0x16fc,0x15f2,0xe2c,0x15df,0x1725,0xc2e,0x14d6,0x16ed,0xc41,
0x12cb,0xd2a,0xe71,0xe55,0x233d,0x2324,0x1555,0x15be,0x158e,0x192c,0x1e17,0xd72,0x9d1,0xae3,0xf8c,0xd48,
0x1ecf,0xb28,0x1f36,0x14a3,0x1ca5,0x143c,0x11b5,0xcc3,0x1c04,0x19a6,0xe9f,0xda6,0x20fd,0x117c,0x20d9,0x156e,
0xcb6,0x20ea,0x1a9c,0x1fad,0x1fd1,0x1ad6,0x1ff5,0x1738,0x228a,0x2057,0x2083,0x18c6,0x2108,0x179a,0x1da7,0x1b34,
0x2304,0x18fa,0x18d3,0x993,0x21f6,0x1ead,0x1d54,0x10fc,0x213d,0x22a2,0x9fe,0xa32,0xb51,0xca3,0xe13,0xf53,
0x105c,0x1346,0x138a,0x1403,0x1425,0x1776,0x1bc2,0x1c4e,0x1cbc,0x1dc9,0x202d,0x20af,0x21b6,0x22e5,0x1c67,0xba2,
0x1854,0x1872,0x1d65,0x1d90,0x108f,0x10a4,0x106b,0x1f49,0x1890,0x1d11,0x1134,0x2281,0x1158,0x1e85,0x1763,0x1e39,
0xd0c,0xa5f,0x1d78,0x194b,0xcee,0x195a,0x1969,0x1214,0x1e70,0x2248,0x2117,0x22c9,0x1921,0xbb5,0x100b,0x11dd,
0x150f,0x16b1,0x1c2c,0x212a,0x19fe,0x1532,0x161a,0x1cd5,0xb91,0x166a,0x163d,0x1cfa,0x1e48,0x16c4,0x1229,0x1293,
0x12f9,0xecd,0x1995,0xbf1,0x1366,0xc7a,0xbc2,0x16d3,0x1dfa,0x1b62,0x1254,0x21c9,0x9b2,0xefb,0xa8f,0xaaf,
0xcfd,0x1a19,0x1a43,0x1a66,0x1a91,0x1e9c,0x1ef0,0x1f5e,0x2162,0x1834,1,0,0x12,0x2446,0x238e,0x23b1,
0x23a1,0x23c1,0x23d0,0x23e0,0x23f2,0x2405,0x2417,0x2427,0x2437,0x2456,0x2465,0x2475,0x2482,0x2491,0x24a5,0x18f2,
1,0,6,0x24fc,0x24ca,0x24e4,0x24d7,0x24f1,0x2507,0x1936,1,0,0x1e,0x25ed,0x2757,0x2639,
0x2742,0x265e,0x269a,0x2686,0x25a3,0x2524,0x258a,0x2614,0x26ab,0x270b,0x2626,0x26e3,0x254f,0x25e2,0x26fb,0x2734,
0x2575,0x271f,0x25b6,0x2535,0x26bc,0x264e,0x2561,0x2672,0x26d2,0x25fc,0x25cc,0x1b61,1,0,0xc,0x27c2,
0x2788,0x2794,0x279b,0x27a6,0x27ab,0x27b2,0x27b9,0x27e8,0x27ed,0x27d8,0x27cc,0x1bb7,1,0,6,0x283e,
0x280c,0x2862,0x2851,0x282e,0x281c,0x1c13,1,0,0x3a,0x2a0b,0x2882,0x288b,0x2898,0x28a3,0x28ac,0x28e4,
0x28ed,0x2906,0x2927,0x2930,0x294d,0x2956,0x2963,0x2b2c,0x296c,0x2973,0x297c,0x298f,0x299a,0x29a3,0x29bb,0x29d4,
0x29dd,0x29ec,0x29f7,0x2a00,0x2a2e,0x2a40,0x2a47,0x2a50,0x2a5b,0x2a64,0x2a98,0x2aa1,0x2aae,0x2ab9,0x2aca,0x2ad5,
0x2aea,0x2b01,0x2b0a,0x2b13,0x2b50,0x2b5b,0x2b64,0x2b6d,0x2b84,0x2ba1,0x2bac,0x2bbd,0x2920,0x29ae,0x2bc8,0x28b7,
0x290b,0x2a37,0x2a7d,0x1dcd,1,0,6,0x2c16,0x2bf6,0x2be6,0x2c06,0x2c25,0x2c36,0x1e2b,1,0,
0x27,0x2eb9,0x2c88,0x2c79,0x2cb7,0x2c96,0x2ca6,0x2e1a,0x2d60,0x2d02,0x2d18,0x2cd8,0x2d75,0x2d85,0x2dae,0x2db9,
0x2ddb,0x2dc9,0x2e0c,0x2e3c,0x2e4b,0x2e57,0x2e6c,0x2e80,0x2e93,0x2d2b,0x2eab,0x2ea1,0x2cc6,0x2ed5,0x2e2e,0x2ec5,
0x2d8e,0x2d95,0x2df7,0x2dfe,0x2e05,0x2cec,0x2d3f,0x2d9c,0x2052,1,0,3,0x2f02,0x2f08,0x2ef9,0x2068,
0x12,0,1,0x2f27,0x2f2d,0x2075,1,0,3,0x2f57,0x2f5d,0x2f4e,0x208b,0x12,0,1,
0x2f7e,0x2f84,0x2098,1,0,4,0x2fb2,0x2f9c,0x2fa8,0x2fbd,0x20be,1,0,0x9e,0x30fd,0x3299,
0x2fdf,0x2fec,0x303b,0x305f,0x30e3,0x310a,0x313a,0x3154,0x3162,0x31ba,0x31c9,0x31e9,0x3201,0x320d,0x321c,0x322b,
0x3235,0x325b,0x3273,0x3319,0x3327,0x3371,0x33b8,0x33c2,0x3447,0x34d6,0x34fc,0x3547,0x3569,0x35c9,0x3658,0x36cd,
0x371c,0x376e,0x3785,0x379d,0x37aa,0x37b5,0x30a4,0x3846,0x3729,0x3242,0x3098,0x3737,0x307b,0x312c,0x33f1,0x3408,
0x35e6,0x369e,0x3746,0x37e8,0x3336,0x3089,0x31d8,0x3360,0x36fe,0x3520,0x37c3,0x3590,0x3009,0x302f,0x3049,0x306e,
0x30d8,0x30f2,0x3553,0x3149,0x3268,0x3189,0x3388,0x36b7,0x37dd,0x35f4,0x355e,0x3250,0x32f2,0x3351,0x33ce,0x33d9,
0x33e4,0x33fd,0x3457,0x347b,0x34bb,0x3532,0x35d5,0x3585,0x360a,0x3619,0x362a,0x364d,0x3674,0x31af,0x3830,0x317e,
0x3792,0x3810,0x381a,0x311c,0x3805,0x37f7,0x30be,0x32e7,0x33a9,0x342d,0x343a,0x35ba,0x3640,0x367f,0x36ac,0x36ee,
0x34e6,0x3486,0x3282,0x2ffb,0x30cb,0x3393,0x330c,0x3465,0x32ae,0x3635,0x3054,0x32ca,0x3664,0x3753,0x3470,0x3711,
0x3018,0x3417,0x3515,0x35a2,0x3024,0x3173,0x31a4,0x31f6,0x339e,0x3422,0x3499,0x34a4,0x357a,0x350a,0x35ff,0x36c2,
0x3825,0x2fd4,0x3301,0x34f1,0x353c,0x3690,0x36db,0x3762,0x377a,0x383b,0x337d,0x37d2,0x27d0,1,0,0xf,
0x38bc,0x3862,0x386c,0x3888,0x389a,0x38a4,0x38b0,0x38d4,0x38dc,0x38e3,0x38ed,0x3876,0x387d,0x3893,0x38c6,0x2857,
1,0,0xd,0x39bd,0x392c,0x395f,0x396a,0x397e,0x398c,0x39b1,0x394e,0x3938,0x393f,0x3977,0x3997,0x39a5,
0x258,0x854,1,0,0x13,0x8a1,0x919,0x85e,0x872,0x889,0x7f6,0x834,0x808,0x975,0x98a,0x8eb,
0x8b2,0x8cf,0x92a,0x93c,0x959,0x8fd,0x849,0x81f,0x9b4,1,0,0xdd,0x1c82,0xbf0,0x17d2,0x17fa,
0x1848,0x16ab,0x1f1d,0xf3b,0x145d,0x1133,0xb81,0x1591,0xa92,0x20dc,0x219d,0x11d8,0xc10,0x14a2,0x148f,0x1d59,
0x2181,0x218e,0x1726,0x1992,0x1ed0,0x21ac,0x17c9,0x21b7,0x1c2d,0x1402,0x150f,0x1345,0xd29,0x221b,0x1caa,0x1e75,
0x179f,0x1c01,0x1818,0x1475,0x13be,0x1f94,0x10eb,0xfbf,0x18b1,0x1c8f,0xb94,0x19e9,0x1bac,0x104b,0x1d36,0x127b,
0xc73,0xc21,0x13df,0x1b22,0x1213,0xc9b,0xdfb,0x170e,0x1604,0xe3e,0x15f1,0x1737,0xc40,0x14e8,0x16ff,0xc53,
0x12dd,0xd3c,0xe83,0xe67,0x234f,0x2336,0x1567,0x15d0,0x15a0,0x193e,0x1e29,0xd84,0x9e3,0xaf5,0xf9e,0xd5a,
0x1ee1,0xb3a,0x1f48,0x14b5,0x1cb7,0x144e,0x11c7,0xcd5,0x1c16,0x19b8,0xeb1,0xdb8,0x210f,0x118e,0x20eb,0x1580,
0xcc8,0x20fc,0x1aae,0x1fbf,0x1fe3,0x1ae8,0x2007,0x174a,0x229c,0x2069,0x2095,0x18d8,0x211a,0x17ac,0x1db9,0x1b46,
0x2316,0x190c,0x18e5,0x9a5,0x2208,0x1ebf,0x1d66,0x110e,0x214f,0x22b4,0xa10,0xa44,0xb63,0xcb5,0xe25,0xf65,
0x106e,0x1358,0x139c,0x1415,0x1437,0x1788,0x1bd4,0x1c60,0x1cce,0x1ddb,0x203f,0x20c1,0x21c8,0x22f7,0x1c79,0xbb4,
0x1866,0x1884,0x1d77,0x1da2,0x10a1,0x10b6,0x107d,0x1f5b,0x18a2,0x1d23,0x1146,0x2293,0x116a,0x1e97,0x1775,0x1e4b,
0xd1e,0xa71,0x1d8a,0x195d,0xd00,0x196c,0x197b,0x1226,0x1e82,0x225a,0x2129,0x22db,0x1933,0xbc7,0x101d,0x11ef,
0x1521,0x16c3,0x1c3e,0x213c,0x1a10,0x1544,0x162c,0x1ce7,0xba3,0x167c,0x164f,0x1d0c,0x1e5a,0x16d6,0x123b,0x12a5,
0x130b,0xedf,0x19a7,0xc03,0x1378,0xc8c,0xbd4,0x16e5,0x1e0c,0x1b74,0x1266,0x21db,0x9c4,0xf0d,0xaa1,0xac1,
0xd0f,0x1a2b,0x1a55,0x1a78,0x1aa3,0x1eae,0x1f02,0x1f70,0x2174,0x1834,1,0,0x12,0x2458,0x23a0,0x23c3,
0x23b3,0x23d3,0x23e2,0x23f2,0x2404,0x2417,0x2429,0x2439,0x2449,0x2468,0x2477,0x2487,0x2494,0x24a3,0x24b7,0x18f2,
1,0,6,0x250e,0x24dc,0x24f6,0x24e9,0x2503,0x2519,0x1936,1,0,0x1e,0x25ff,0x2769,0x264b,
0x2754,0x2670,0x26ac,0x2698,0x25b5,0x2536,0x259c,0x2626,0x26bd,0x271d,0x2638,0x26f5,0x2561,0x25f4,0x270d,0x2746,
0x2587,0x2731,0x25c8,0x2547,0x26ce,0x2660,0x2573,0x2684,0x26e4,0x260e,0x25de,0x1b61,1,0,0xc,0x27d4,
0x279a,0x27a6,0x27ad,0x27b8,0x27bd,0x27c4,0x27cb,0x27fa,0x27ff,0x27ea,0x27de,0x1bb7,1,0,6,0x2850,
0x281e,0x2874,0x2863,0x2840,0x282e,0x1c13,1,0,0x3a,0x2a1d,0x2894,0x289d,0x28aa,0x28b5,0x28be,0x28f6,
0x28ff,0x2918,0x2939,0x2942,0x295f,0x2968,0x2975,0x2b3e,0x297e,0x2985,0x298e,0x29a1,0x29ac,0x29b5,0x29cd,0x29e6,
0x29ef,0x29fe,0x2a09,0x2a12,0x2a40,0x2a52,0x2a59,0x2a62,0x2a6d,0x2a76,0x2aaa,0x2ab3,0x2ac0,0x2acb,0x2adc,0x2ae7,
0x2afc,0x2b13,0x2b1c,0x2b25,0x2b62,0x2b6d,0x2b76,0x2b7f,0x2b96,0x2bb3,0x2bbe,0x2bcf,0x2932,0x29c0,0x2bda,0x28c9,
0x291d,0x2a49,0x2a8f,0x1dcd,1,0,6,0x2c28,0x2c08,0x2bf8,0x2c18,0x2c37,0x2c48,0x1e2b,1,0,
0x27,0x2ecb,0x2c9a,0x2c8b,0x2cc9,0x2ca8,0x2cb8,0x2e2c,0x2d72,0x2d14,0x2d2a,0x2cea,0x2d87,0x2d97,0x2dc0,0x2dcb,
0x2ded,0x2ddb,0x2e1e,0x2e4e,0x2e5d,0x2e69,0x2e7e,0x2e92,0x2ea5,0x2d3d,0x2ebd,0x2eb3,0x2cd8,0x2ee7,0x2e40,0x2ed7,
0x2da0,0x2da7,0x2e09,0x2e10,0x2e17,0x2cfe,0x2d51,0x2dae,0x2052,1,0,3,0x2f14,0x2f1a,0x2f0b,0x2068,
0x12,0,1,0x2f39,0x2f3f,0x2075,1,0,3,0x2f69,0x2f6f,0x2f60,0x208b,0x12,0,1,
0x2f90,0x2f96,0x2098,1,0,4,0x2fc4,0x2fae,0x2fba,0x2fcf,0x20be,1,0,0x9e,0x310f,0x32ab,
0x2ff1,0x2ffe,0x304d,0x3071,0x30f5,0x311c,0x314c,0x3166,0x3174,0x31cc,0x31db,0x31fb,0x3213,0x321f,0x322e,0x323d,
0x3247,0x326d,0x3285,0x332b,0x3339,0x3383,0x33ca,0x33d4,0x3459,0x34e8,0x350e,0x3559,0x357b,0x35db,0x366a,0x36df,
0x372e,0x3780,0x3797,0x37af,0x37bc,0x37c7,0x30b6,0x3858,0x373b,0x3254,0x30aa,0x3749,0x308d,0x313e,0x3403,0x341a,
0x35f8,0x36b0,0x3758,0x37fa,0x3348,0x309b,0x31ea,0x3372,0x3710,0x3532,0x37d5,0x35a2,0x301b,0x3041,0x305b,0x3080,
0x30ea,0x3104,0x3565,0x315b,0x327a,0x319b,0x339a,0x36c9,0x37ef,0x3606,0x3570,0x3262,0x3304,0x3363,0x33e0,0x33eb,
0x33f6,0x340f,0x3469,0x348d,0x34cd,0x3544,0x35e7,0x3597,0x361c,0x362b,0x363c,0x365f,0x3686,0x31c1,0x3842,0x3190,
0x37a4,0x3822,0x382c,0x312e,0x3817,0x3809,0x30d0,0x32f9,0x33bb,0x343f,0x344c,0x35cc,0x3652,0x3691,0x36be,0x3700,
0x34f8,0x3498,0x3294,0x300d,0x30dd,0x33a5,0x331e,0x3477,0x32c0,0x3647,0x3066,0x32dc,0x3676,0x3765,0x3482,0x3723,
0x302a,0x3429,0x3527,0x35b4,0x3036,0x3185,0x31b6,0x3208,0x33b0,0x3434,0x34ab,0x34b6,0x358c,0x351c,0x3611,0x36d4,
0x3837,0x2fe6,0x3313,0x3503,0x354e,0x36a2,0x36ed,0x3774,0x378c,0x384d,0x338f,0x37e4,0x27d0,1,0,0xf,
0x38ce,0x3874,0x387e,0x389a,0x38ac,0x38b6,0x38c2,0x38e6,0x38ee,0x38f5,0x38ff,0x3888,0x388f,0x38a5,0x38d8,0x2857,
1,0,0xd,0x39cf,0x393e,0x3971,0x397c,0x3990,0x399e,0x39c3,0x3960,0x394a,0x3951,0x3989,0x39a9,0x39b7,
0x28de,0x36,1,2,4,8,0xe,0x10,0x20,0x3e,0x40,0x80,0x100,0x1c0,0x200,0x400,
0x800,0xe00,0x1000,0x2000,0x4000,0x7000,0x8000,0x10000,0x20000,0x40000,0x78001,0x80000,0x100000,0x200000,0x400000,0x800000,
0x1000000,0x2000000,0x4000000,0x8000000,0xf000000,0x10000000,0x20000000,0x30f80000,0x3b2c,0x3bc2,0x3b73,0x3bad,0x3b62,0x3b88,0x3b9c,0x3bd7,
0x3c05,0x3bf2,0x3be1,0x3c19,0x3c30,0x3c49,0x3c5b,0x3c6c,0x3da7,0x3d7c,0x3d8f,0x3dbb,0x3b0f,0x3b21,0x3b3b,0x3b4b,
0x3b59,0x3c90,0x3cff,0x3ca5,0x3c76,0x3ce9,0x3d51,0x3d29,0x3d3d,0x3d61,0x3d72,0x3cd1,0x3cbb,0x3d14
0x1000000,0x2000000,0x4000000,0x8000000,0xf000000,0x10000000,0x20000000,0x30f80000,0x3a11,0x3aa7,0x3a58,0x3a92,0x3a47,0x3a6d,0x3a81,0x3abc,
0x3aea,0x3ad7,0x3ac6,0x3afe,0x3b15,0x3b2e,0x3b40,0x3b51,0x3c8c,0x3c61,0x3c74,0x3ca0,0x39f4,0x3a06,0x3a20,0x3a30,
0x3a3e,0x3b75,0x3be4,0x3b8a,0x3b5b,0x3bce,0x3c36,0x3c0e,0x3c22,0x3c46,0x3c57,0x3bb6,0x3ba0,0x3bf9
};
const uint8_t PropNameData::bytesTries[11253]={
@ -872,6 +872,7 @@ const char PropNameData::nameGroups[15839]={
3,'W','S','p','a','c','e',0,'W','h','i','t','e','_','S','p','a','c','e',0,'s','p','a','c','e',0,
2,'X','I','D','C',0,'X','I','D','_','C','o','n','t','i','n','u','e',0,
2,'X','I','D','S',0,'X','I','D','_','S','t','a','r','t',0,
2,'n','v',0,'N','u','m','e','r','i','c','_','V','a','l','u','e',0,
2,'b','c',0,'B','i','d','i','_','C','l','a','s','s',0,2,'A','N',0,'A','r','a','b','i','c','_','N','u','m','b','e','r',
0,2,'B',0,'P','a','r','a','g','r','a','p','h','_','S','e','p','a','r','a','t','o','r',0,
2,'B','N',0,'B','o','u','n','d','a','r','y','_','N','e','u','t','r','a','l',0,
@ -1386,21 +1387,8 @@ const char PropNameData::nameGroups[15839]={
2,'L','F',0,'L','F',0,2,'M','L',0,'M','i','d','L','e','t','t','e','r',0,
2,'M','N',0,'M','i','d','N','u','m',0,2,'M','B',0,'M','i','d','N','u','m','L','e','t',0,
2,'N','L',0,'N','e','w','l','i','n','e',0,2,'N','U',0,'N','u','m','e','r','i','c',0,
2,'X','X',0,'O','t','h','e','r',0,2,'a','g','e',0,'A','g','e',0,
2,'b','m','g',0,'B','i','d','i','_','M','i','r','r','o','r','i','n','g','_','G','l','y','p','h',0,
2,'c','f',0,'C','a','s','e','_','F','o','l','d','i','n','g',0,
2,'i','s','c',0,'I','S','O','_','C','o','m','m','e','n','t',0,
2,'l','c',0,'L','o','w','e','r','c','a','s','e','_','M','a','p','p','i','n','g',0,
2,'n','a',0,'N','a','m','e',0,3,'s','c','f',0,'S','i','m','p','l','e','_','C','a','s','e','_','F','o','l','d','i','n',
'g',0,'s','f','c',0,2,'s','l','c',0,'S','i','m','p','l','e','_','L','o','w','e','r','c','a','s','e','_','M','a','p','p',
'i','n','g',0,2,'s','t','c',0,'S','i','m','p','l','e','_','T','i','t','l','e','c','a','s','e','_','M','a','p','p','i','n',
'g',0,2,'s','u','c',0,'S','i','m','p','l','e','_','U','p','p','e','r','c','a','s','e','_','M','a','p','p','i','n','g',0,
2,'t','c',0,'T','i','t','l','e','c','a','s','e','_','M','a','p','p','i','n','g',0,
2,'n','a','1',0,'U','n','i','c','o','d','e','_','1','_','N','a','m','e',0,
2,'u','c',0,'U','p','p','e','r','c','a','s','e','_','M','a','p','p','i','n','g',0,
2,'n','v',0,'N','u','m','e','r','i','c','_','V','a','l','u','e',0,
2,'g','c','m',0,'G','e','n','e','r','a','l','_','C','a','t','e','g','o','r','y','_','M','a','s','k',0,
3,'C','c',0,'C','o','n','t','r','o','l',0,'c','n','t','r','l',0,
2,'X','X',0,'O','t','h','e','r',0,2,'g','c','m',0,'G','e','n','e','r','a','l','_','C','a','t','e','g','o','r','y','_',
'M','a','s','k',0,3,'C','c',0,'C','o','n','t','r','o','l',0,'c','n','t','r','l',0,
2,'C','f',0,'F','o','r','m','a','t',0,2,'C','n',0,'U','n','a','s','s','i','g','n','e','d',0,
2,'C','o',0,'P','r','i','v','a','t','e','_','U','s','e',0,
2,'C','s',0,'S','u','r','r','o','g','a','t','e',0,2,'C',0,'O','t','h','e','r',0,
@ -1433,7 +1421,17 @@ const char PropNameData::nameGroups[15839]={
2,'Z','p',0,'P','a','r','a','g','r','a','p','h','_','S','e','p','a','r','a','t','o','r',0,
2,'Z','s',0,'S','p','a','c','e','_','S','e','p','a','r','a','t','o','r',0,
2,'Z',0,'S','e','p','a','r','a','t','o','r',0,2,'s','c','x',0,'S','c','r','i','p','t','_','E','x','t','e','n','s','i',
'o','n','s',0
'o','n','s',0,2,'a','g','e',0,'A','g','e',0,2,'b','m','g',0,'B','i','d','i','_','M','i','r','r','o','r','i','n','g',
'_','G','l','y','p','h',0,2,'c','f',0,'C','a','s','e','_','F','o','l','d','i','n','g',0,
2,'i','s','c',0,'I','S','O','_','C','o','m','m','e','n','t',0,
2,'l','c',0,'L','o','w','e','r','c','a','s','e','_','M','a','p','p','i','n','g',0,
2,'n','a',0,'N','a','m','e',0,3,'s','c','f',0,'S','i','m','p','l','e','_','C','a','s','e','_','F','o','l','d','i','n',
'g',0,'s','f','c',0,2,'s','l','c',0,'S','i','m','p','l','e','_','L','o','w','e','r','c','a','s','e','_','M','a','p','p',
'i','n','g',0,2,'s','t','c',0,'S','i','m','p','l','e','_','T','i','t','l','e','c','a','s','e','_','M','a','p','p','i','n',
'g',0,2,'s','u','c',0,'S','i','m','p','l','e','_','U','p','p','e','r','c','a','s','e','_','M','a','p','p','i','n','g',0,
2,'t','c',0,'T','i','t','l','e','c','a','s','e','_','M','a','p','p','i','n','g',0,
2,'n','a','1',0,'U','n','i','c','o','d','e','_','1','_','N','a','m','e',0,
2,'u','c',0,'U','p','p','e','r','c','a','s','e','_','M','a','p','p','i','n','g',0
};
U_NAMESPACE_END

View File

@ -140,6 +140,7 @@ U_CDECL_BEGIN
#define U_MASK(x) ((uint32_t)1<<(x))
/*
* TODO: update
* !! Note: Several comments in this file are machine-read by the
* genpname tool. These comments describe the correspondence between
* icu enum constants and UCD entities. Do not delete them. Update
@ -172,7 +173,8 @@ U_CDECL_BEGIN
* @stable ICU 2.1
*/
typedef enum UProperty {
/* See note !!. Comments of the form "Binary property Dash",
/* TODO: update
See note !!. Comments of the form "Binary property Dash",
"Enumerated property Script", "Double property Numeric_Value",
and "String property Age" are read by genpname. */
@ -1064,16 +1066,6 @@ enum UBlockCode {
/** @stable ICU 2.0 */
UBLOCK_LOW_SURROGATES =77, /*[DC00]*/
/**
* Same as UBLOCK_PRIVATE_USE_AREA.
* Until Unicode 3.1.1, the corresponding block name was "Private Use",
* and multiple code point ranges had this block.
* Unicode 3.2 renames the block for the BMP PUA to "Private Use Area" and
* adds separate blocks for the supplementary PUAs.
*
* @stable ICU 2.0
*/
UBLOCK_PRIVATE_USE = 78,
/**
* Same as UBLOCK_PRIVATE_USE.
* Until Unicode 3.1.1, the corresponding block name was "Private Use",
@ -1083,7 +1075,17 @@ enum UBlockCode {
*
* @stable ICU 2.0
*/
UBLOCK_PRIVATE_USE_AREA =UBLOCK_PRIVATE_USE, /*[E000]*/
UBLOCK_PRIVATE_USE_AREA =78, /*[E000]*/
/**
* Same as UBLOCK_PRIVATE_USE_AREA.
* Until Unicode 3.1.1, the corresponding block name was "Private Use",
* and multiple code point ranges had this block.
* Unicode 3.2 renames the block for the BMP PUA to "Private Use Area" and
* adds separate blocks for the supplementary PUAs.
*
* @stable ICU 2.0
*/
UBLOCK_PRIVATE_USE = UBLOCK_PRIVATE_USE_AREA,
/** @stable ICU 2.0 */
UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS =79, /*[F900]*/
@ -1115,33 +1117,33 @@ enum UBlockCode {
/* New blocks in Unicode 3.1 */
/** @stable ICU 2.0 */
UBLOCK_OLD_ITALIC = 88 , /*[10300]*/
UBLOCK_OLD_ITALIC = 88, /*[10300]*/
/** @stable ICU 2.0 */
UBLOCK_GOTHIC = 89 , /*[10330]*/
UBLOCK_GOTHIC = 89, /*[10330]*/
/** @stable ICU 2.0 */
UBLOCK_DESERET = 90 , /*[10400]*/
UBLOCK_DESERET = 90, /*[10400]*/
/** @stable ICU 2.0 */
UBLOCK_BYZANTINE_MUSICAL_SYMBOLS = 91 , /*[1D000]*/
UBLOCK_BYZANTINE_MUSICAL_SYMBOLS = 91, /*[1D000]*/
/** @stable ICU 2.0 */
UBLOCK_MUSICAL_SYMBOLS = 92 , /*[1D100]*/
UBLOCK_MUSICAL_SYMBOLS = 92, /*[1D100]*/
/** @stable ICU 2.0 */
UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS = 93 , /*[1D400]*/
UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS = 93, /*[1D400]*/
/** @stable ICU 2.0 */
UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B = 94 , /*[20000]*/
UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B = 94, /*[20000]*/
/** @stable ICU 2.0 */
UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT = 95 , /*[2F800]*/
UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT = 95, /*[2F800]*/
/** @stable ICU 2.0 */
UBLOCK_TAGS = 96, /*[E0000]*/
/* New blocks in Unicode 3.2 */
/** @stable ICU 3.0 */
UBLOCK_CYRILLIC_SUPPLEMENT = 97, /*[0500]*/
/**
* Unicode 4.0.1 renames the "Cyrillic Supplementary" block to "Cyrillic Supplement".
* @stable ICU 2.2
*/
UBLOCK_CYRILLIC_SUPPLEMENTARY = 97,
/** @stable ICU 3.0 */
UBLOCK_CYRILLIC_SUPPLEMENT = UBLOCK_CYRILLIC_SUPPLEMENTARY, /*[0500]*/
UBLOCK_CYRILLIC_SUPPLEMENTARY = UBLOCK_CYRILLIC_SUPPLEMENT,
/** @stable ICU 2.2 */
UBLOCK_TAGALOG = 98, /*[1700]*/
/** @stable ICU 2.2 */
@ -1436,10 +1438,6 @@ typedef enum UEastAsianWidth {
U_EA_WIDE, /*[W]*/
U_EA_COUNT
} UEastAsianWidth;
/*
* Implementation note:
* Keep UEastAsianWidth constant values in sync with names list in genprops/props2.c.
*/
/**
* Selector constants for u_charName().
@ -1694,9 +1692,9 @@ typedef enum ULineBreak {
U_LB_GLUE = 12, /*[GL]*/
U_LB_HYPHEN = 13, /*[HY]*/
U_LB_IDEOGRAPHIC = 14, /*[ID]*/
U_LB_INSEPERABLE = 15,
/** Renamed from the misspelled "inseperable" in Unicode 4.0.1/ICU 3.0 @stable ICU 3.0 */
U_LB_INSEPARABLE=U_LB_INSEPERABLE,/*[IN]*/
U_LB_INSEPARABLE = 15, /*[IN]*/
U_LB_INSEPERABLE = U_LB_INSEPARABLE,
U_LB_INFIX_NUMERIC = 16, /*[IS]*/
U_LB_LINE_FEED = 17, /*[LF]*/
U_LB_NONSTARTER = 18, /*[NS]*/

Binary file not shown.

View File

@ -5,10 +5,12 @@ ucd;6.1.0
property;Catalog;age;Age
property;Binary;AHex;ASCII_Hex_Digit
property;Binary;;alnum
property;Binary;Alpha;Alphabetic
property;Enumerated;bc;Bidi_Class
property;Binary;Bidi_C;Bidi_Control
property;Binary;Bidi_M;Bidi_Mirrored
property;Binary;;blank
property;Catalog;blk;Block
property;String;bmg;Bidi_Mirroring_Glyph
property;Binary;Cased;Cased
@ -35,6 +37,8 @@ property;Binary;Ext;Extender
property;String;FC_NFKC;FC_NFKC_Closure
property;Enumerated;gc;General_Category
property;Enumerated;GCB;Grapheme_Cluster_Break
property;Bitmask;gcm;General_Category_Mask
property;Binary;;graph
property;Binary;Gr_Base;Grapheme_Base
property;Binary;Gr_Ext;Grapheme_Extend
property;Binary;Gr_Link;Grapheme_Link
@ -62,15 +66,20 @@ property;Miscellaneous;na;Name
property;Miscellaneous;na1;Unicode_1_Name
property;Miscellaneous;Name_Alias;Name_Alias
property;Binary;NChar;Noncharacter_Code_Point
property;Binary;nfcinert;NFC_Inert
property;Enumerated;NFC_QC;NFC_Quick_Check
property;Binary;nfdinert;NFD_Inert
property;Enumerated;NFD_QC;NFD_Quick_Check
property;String;NFKC_CF;NFKC_Casefold
property;Binary;nfkcinert;NFKC_Inert
property;Enumerated;NFKC_QC;NFKC_Quick_Check
property;Binary;nfkdinert;NFKD_Inert
property;Enumerated;NFKD_QC;NFKD_Quick_Check
property;Enumerated;nt;Numeric_Type
property;Numeric;nv;Numeric_Value
property;Binary;Pat_Syn;Pattern_Syntax
property;Binary;Pat_WS;Pattern_White_Space
property;Binary;;print
property;Binary;QMark;Quotation_Mark
property;Binary;Radical;Radical
property;Enumerated;SB;Sentence_Break
@ -78,6 +87,8 @@ property;Catalog;sc;Script
property;String;scf;Simple_Case_Folding;sfc
property;Miscellaneous;scx;Script_Extensions
property;Binary;SD;Soft_Dotted
property;Binary;segstart;Segment_Starter
property;Binary;Sensitive;Case_Sensitive
property;String;slc;Simple_Lowercase_Mapping
property;String;stc;Simple_Titlecase_Mapping
property;Binary;STerm;STerm
@ -92,6 +103,7 @@ property;Binary;Upper;Uppercase
property;Binary;VS;Variation_Selector
property;Enumerated;WB;Word_Break
property;Binary;WSpace;White_Space;space
property;Binary;;xdigit
property;Binary;XIDC;XID_Continue
property;Binary;XIDS;XID_Start
@ -481,6 +493,44 @@ value;GCB;SM;SpacingMark
value;GCB;T;T
value;GCB;V;V
value;GCB;XX;Other
value;gcm;C;Other
value;gcm;Cc;Control;cntrl
value;gcm;Cf;Format
value;gcm;Cn;Unassigned
value;gcm;Co;Private_Use
value;gcm;Cs;Surrogate
value;gcm;L;Letter
value;gcm;LC;Cased_Letter
value;gcm;Ll;Lowercase_Letter
value;gcm;Lm;Modifier_Letter
value;gcm;Lo;Other_Letter
value;gcm;Lt;Titlecase_Letter
value;gcm;Lu;Uppercase_Letter
value;gcm;M;Mark;Combining_Mark
value;gcm;Mc;Spacing_Mark
value;gcm;Me;Enclosing_Mark
value;gcm;Mn;Nonspacing_Mark
value;gcm;N;Number
value;gcm;Nd;Decimal_Number;digit
value;gcm;Nl;Letter_Number
value;gcm;No;Other_Number
value;gcm;P;Punctuation;punct
value;gcm;Pc;Connector_Punctuation
value;gcm;Pd;Dash_Punctuation
value;gcm;Pe;Close_Punctuation
value;gcm;Pf;Final_Punctuation
value;gcm;Pi;Initial_Punctuation
value;gcm;Po;Other_Punctuation
value;gcm;Ps;Open_Punctuation
value;gcm;S;Symbol
value;gcm;Sc;Currency_Symbol
value;gcm;Sk;Modifier_Symbol
value;gcm;Sm;Math_Symbol
value;gcm;So;Other_Symbol
value;gcm;Z;Separator
value;gcm;Zl;Line_Separator
value;gcm;Zp;Paragraph_Separator
value;gcm;Zs;Space_Separator
value;hst;L;Leading_Jamo
value;hst;LV;LV_Syllable
value;hst;LVT;LVT_Syllable
@ -939,7 +989,7 @@ value;WB;NL;Newline
value;WB;NU;Numeric
value;WB;XX;Other
defaults;0000..10FFFF;age=NA;bc=L;blk=NB;bmg=<code point>;cf=<code point>;dm=<code point>;dt=None;ea=N;FC_NFKC=<code point>;gc=Cn;GCB=XX;hst=NA;InMC=NA;InSC=Other;jg=No_Joining_Group;jt=U;lb=XX;lc=<slc>;NFC_QC=Y;NFD_QC=Y;NFKC_CF=<code point>;NFKC_QC=Y;NFKD_QC=Y;nt=None;SB=XX;sc=Zzzz;scf=<code point>;scx=<script>;slc=<code point>;stc=<code point>;suc=<code point>;tc=<stc>;uc=<suc>;WB=XX
defaults;0000..10FFFF;age=NA;bc=L;blk=NB;bmg=<code point>;cf=<code point>;dm=<code point>;dt=None;ea=N;FC_NFKC=<code point>;gc=Cn;GCB=XX;gcm=Cn;hst=NA;InMC=NA;InSC=Other;jg=No_Joining_Group;jt=U;lb=XX;lc=<slc>;NFC_QC=Y;NFD_QC=Y;NFKC_CF=<code point>;NFKC_QC=Y;NFKD_QC=Y;nt=None;SB=XX;sc=Zzzz;scf=<code point>;scx=<script>;slc=<code point>;stc=<code point>;suc=<code point>;tc=<stc>;uc=<suc>;WB=XX
block;0000..007F;age=1.1;blk=ASCII;ea=Na;gc=Cc;Gr_Base;lb=AL;sc=Zyyy
# 0000..007F C0 Controls and Basic Latin (Basic Latin)