From 208c2c31501f6eb2b81b6bf80fcf39f4646eb38b Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 1 May 2011 20:04:01 -0400 Subject: [PATCH] Minor --- test/test-unicode.c | 476 ++++++++++++++++++++++---------------------- 1 file changed, 242 insertions(+), 234 deletions(-) diff --git a/test/test-unicode.c b/test/test-unicode.c index 9b9566c8b..fc506c75a 100644 --- a/test/test-unicode.c +++ b/test/test-unicode.c @@ -51,314 +51,322 @@ typedef struct { static const test_pair_t combining_class_tests[] = { - { 0x111111, (unsigned int) 0 }, - - { 0x0020, (unsigned int) 0 }, - { 0x0334, (unsigned int) 1 }, - { 0x093C, (unsigned int) 7 }, - { 0x3099, (unsigned int) 8 }, - { 0x094D, (unsigned int) 9 }, - { 0x05B0, (unsigned int) 10 }, - { 0x05B1, (unsigned int) 11 }, - { 0x05B2, (unsigned int) 12 }, - { 0x05B3, (unsigned int) 13 }, - { 0x05B4, (unsigned int) 14 }, - { 0x05B5, (unsigned int) 15 }, - { 0x05B6, (unsigned int) 16 }, - { 0x05B7, (unsigned int) 17 }, - { 0x05B8, (unsigned int) 18 }, - { 0x05B9, (unsigned int) 19 }, - { 0x05BB, (unsigned int) 20 }, - { 0x05BC, (unsigned int) 21 }, - { 0x05BD, (unsigned int) 22 }, - { 0x05BF, (unsigned int) 23 }, - { 0x05C1, (unsigned int) 24 }, - { 0x05C2, (unsigned int) 25 }, - { 0xFB1E, (unsigned int) 26 }, - { 0x064B, (unsigned int) 27 }, - { 0x064C, (unsigned int) 28 }, - { 0x064D, (unsigned int) 29 }, + { 0x0020, 0 }, + { 0x0334, 1 }, + { 0x093C, 7 }, + { 0x3099, 8 }, + { 0x094D, 9 }, + { 0x05B0, 10 }, + { 0x05B1, 11 }, + { 0x05B2, 12 }, + { 0x05B3, 13 }, + { 0x05B4, 14 }, + { 0x05B5, 15 }, + { 0x05B6, 16 }, + { 0x05B7, 17 }, + { 0x05B8, 18 }, + { 0x05B9, 19 }, + { 0x05BB, 20 }, + { 0x05BC, 21 }, + { 0x05BD, 22 }, + { 0x05BF, 23 }, + { 0x05C1, 24 }, + { 0x05C2, 25 }, + { 0xFB1E, 26 }, + { 0x064B, 27 }, + { 0x064C, 28 }, + { 0x064D, 29 }, /* ... */ - { 0x05AE, (unsigned int) 228 }, - { 0x0300, (unsigned int) 230 }, - { 0x302C, (unsigned int) 232 }, - { 0x0362, (unsigned int) 233 }, - { 0x0360, (unsigned int) 234 }, - { 0x1DCD, (unsigned int) 234 }, - { 0x0345, (unsigned int) 240 }, + { 0x05AE, 228 }, + { 0x0300, 230 }, + { 0x302C, 232 }, + { 0x0362, 233 }, + { 0x0360, 234 }, + { 0x1DCD, 234 }, + { 0x0345, 240 }, + + { 0x111111, 0 } }; static const test_pair_t combining_class_tests_more[] = { /* Unicode-5.2 character additions */ - { 0xA8E0, (unsigned int) 230 }, + { 0xA8E0, 230 }, /* Unicode-6.0 character additions */ - { 0x135D, (unsigned int) 230 }, + { 0x135D, 230 }, + + { 0x111111, 0 } }; static const test_pair_t eastasian_width_tests[] = { - { 0x111111, (unsigned int) 1 }, - /* Neutral */ - { 0x0000, (unsigned int) 1 }, - { 0x0483, (unsigned int) 1 }, - { 0x0641, (unsigned int) 1 }, - { 0xFFFC, (unsigned int) 1 }, - { 0x10000, (unsigned int) 1 }, - { 0xE0001, (unsigned int) 1 }, + { 0x0000, 1 }, + { 0x0483, 1 }, + { 0x0641, 1 }, + { 0xFFFC, 1 }, + { 0x10000, 1 }, + { 0xE0001, 1 }, /* Narrow */ - { 0x0020, (unsigned int) 1 }, - { 0x0041, (unsigned int) 1 }, - { 0x27E6, (unsigned int) 1 }, + { 0x0020, 1 }, + { 0x0041, 1 }, + { 0x27E6, 1 }, /* Halfwidth */ - { 0x20A9, (unsigned int) 1 }, - { 0xFF61, (unsigned int) 1 }, - { 0xFF69, (unsigned int) 1 }, - { 0xFFEE, (unsigned int) 1 }, + { 0x20A9, 1 }, + { 0xFF61, 1 }, + { 0xFF69, 1 }, + { 0xFFEE, 1 }, /* Ambiguous */ - { 0x00A1, (unsigned int) 1 }, - { 0x00D8, (unsigned int) 1 }, - { 0x02DD, (unsigned int) 1 }, - { 0xE0100, (unsigned int) 1 }, - { 0x100000, (unsigned int) 1 }, + { 0x00A1, 1 }, + { 0x00D8, 1 }, + { 0x02DD, 1 }, + { 0xE0100, 1 }, + { 0x100000, 1 }, /* Fullwidth */ - { 0x3000, (unsigned int) 2 }, - { 0xFF60, (unsigned int) 2 }, + { 0x3000, 2 }, + { 0xFF60, 2 }, /* Wide */ - { 0x2329, (unsigned int) 2 }, - { 0x3001, (unsigned int) 2 }, - { 0xFE69, (unsigned int) 2 }, - { 0x30000, (unsigned int) 2 }, - { 0x3FFFD, (unsigned int) 2 }, + { 0x2329, 2 }, + { 0x3001, 2 }, + { 0xFE69, 2 }, + { 0x30000, 2 }, + { 0x3FFFD, 2 }, + + { 0x111111, 1 } }; static const test_pair_t eastasian_width_tests_more[] = { /* Default Wide blocks */ - { 0x4DBF, (unsigned int) 2 }, - { 0x9FFF, (unsigned int) 2 }, - { 0xFAFF, (unsigned int) 2 }, - { 0x2A6DF, (unsigned int) 2 }, - { 0x2B73F, (unsigned int) 2 }, - { 0x2B81F, (unsigned int) 2 }, - { 0x2FA1F, (unsigned int) 2 }, + { 0x4DBF, 2 }, + { 0x9FFF, 2 }, + { 0xFAFF, 2 }, + { 0x2A6DF, 2 }, + { 0x2B73F, 2 }, + { 0x2B81F, 2 }, + { 0x2FA1F, 2 }, /* Uniode-5.2 character additions */ /* Wide */ - { 0x115F, (unsigned int) 2 }, + { 0x115F, 2 }, /* Uniode-6.0 character additions */ /* Wide */ - { 0x2B740, (unsigned int) 2 }, - { 0x1B000, (unsigned int) 2 }, + { 0x2B740, 2 }, + { 0x1B000, 2 }, + + { 0x111111, 1 } }; static const test_pair_t general_category_tests[] = { - { 0x111111, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED }, + { 0x000D, HB_UNICODE_GENERAL_CATEGORY_CONTROL }, + { 0x200E, HB_UNICODE_GENERAL_CATEGORY_FORMAT }, + { 0x0378, HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED }, + { 0xE000, HB_UNICODE_GENERAL_CATEGORY_PRIVATE_USE }, + { 0xD800, HB_UNICODE_GENERAL_CATEGORY_SURROGATE }, + { 0x0061, HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER }, + { 0x02B0, HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER }, + { 0x3400, HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER }, + { 0x01C5, HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER }, + { 0xFF21, HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER }, + { 0x0903, HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK }, + { 0x20DD, HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK }, + { 0xA806, HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK }, + { 0xFF10, HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER }, + { 0x16EE, HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER }, + { 0x17F0, HB_UNICODE_GENERAL_CATEGORY_OTHER_NUMBER }, + { 0x005F, HB_UNICODE_GENERAL_CATEGORY_CONNECT_PUNCTUATION }, + { 0x058A, HB_UNICODE_GENERAL_CATEGORY_DASH_PUNCTUATION }, + { 0x0F3B, HB_UNICODE_GENERAL_CATEGORY_CLOSE_PUNCTUATION }, + { 0x2019, HB_UNICODE_GENERAL_CATEGORY_FINAL_PUNCTUATION }, + { 0x2018, HB_UNICODE_GENERAL_CATEGORY_INITIAL_PUNCTUATION }, + { 0x2016, HB_UNICODE_GENERAL_CATEGORY_OTHER_PUNCTUATION }, + { 0x0F3A, HB_UNICODE_GENERAL_CATEGORY_OPEN_PUNCTUATION }, + { 0x20A0, HB_UNICODE_GENERAL_CATEGORY_CURRENCY_SYMBOL }, + { 0x309B, HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL }, + { 0xFB29, HB_UNICODE_GENERAL_CATEGORY_MATH_SYMBOL }, + { 0x00A6, HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL }, + { 0x2028, HB_UNICODE_GENERAL_CATEGORY_LINE_SEPARATOR }, + { 0x2029, HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR }, + { 0x202F, HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR }, - { 0x000D, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_CONTROL }, - { 0x200E, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_FORMAT }, - { 0x0378, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED }, - { 0xE000, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_PRIVATE_USE }, - { 0xD800, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_SURROGATE }, - { 0x0061, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER }, - { 0x02B0, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER }, - { 0x3400, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER }, - { 0x01C5, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER }, - { 0xFF21, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER }, - { 0x0903, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK }, - { 0x20DD, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK }, - { 0xA806, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK }, - { 0xFF10, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER }, - { 0x16EE, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER }, - { 0x17F0, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_OTHER_NUMBER }, - { 0x005F, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_CONNECT_PUNCTUATION }, - { 0x058A, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_DASH_PUNCTUATION }, - { 0x0F3B, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_CLOSE_PUNCTUATION }, - { 0x2019, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_FINAL_PUNCTUATION }, - { 0x2018, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_INITIAL_PUNCTUATION }, - { 0x2016, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_OTHER_PUNCTUATION }, - { 0x0F3A, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_OPEN_PUNCTUATION }, - { 0x20A0, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_CURRENCY_SYMBOL }, - { 0x309B, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL }, - { 0xFB29, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_MATH_SYMBOL }, - { 0x00A6, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL }, - { 0x2028, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_LINE_SEPARATOR }, - { 0x2029, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR }, - { 0x202F, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR } + { 0x111111, HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED } }; static const test_pair_t general_category_tests_more[] = { /* Unicode-5.2 character additions */ - { 0x1F131, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL }, + { 0x1F131, HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL }, /* Unicode-6.0 character additions */ - { 0x0620, (unsigned int) HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER }, + { 0x0620, HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER }, + + { 0x111111, HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED } }; static const test_pair_t mirroring_tests[] = { - { 0x111111, (unsigned int) 0x111111 }, - /* Some characters that do NOT mirror */ - { 0x0020, (unsigned int) 0x0020 }, - { 0x0041, (unsigned int) 0x0041 }, - { 0x00F0, (unsigned int) 0x00F0 }, - { 0x27CC, (unsigned int) 0x27CC }, - { 0xE01EF, (unsigned int) 0xE01EF }, - { 0x1D7C3, (unsigned int) 0x1D7C3 }, - { 0x100000, (unsigned int) 0x100000 }, + { 0x0020, 0x0020 }, + { 0x0041, 0x0041 }, + { 0x00F0, 0x00F0 }, + { 0x27CC, 0x27CC }, + { 0xE01EF, 0xE01EF }, + { 0x1D7C3, 0x1D7C3 }, + { 0x100000, 0x100000 }, /* Some characters that do mirror */ - { 0x0029, (unsigned int) 0x0028 }, - { 0x0028, (unsigned int) 0x0029 }, - { 0x003E, (unsigned int) 0x003C }, - { 0x003C, (unsigned int) 0x003E }, - { 0x005D, (unsigned int) 0x005B }, - { 0x005B, (unsigned int) 0x005D }, - { 0x007D, (unsigned int) 0x007B }, - { 0x007B, (unsigned int) 0x007D }, - { 0x00BB, (unsigned int) 0x00AB }, - { 0x00AB, (unsigned int) 0x00BB }, - { 0x226B, (unsigned int) 0x226A }, - { 0x226A, (unsigned int) 0x226B }, - { 0x22F1, (unsigned int) 0x22F0 }, - { 0x22F0, (unsigned int) 0x22F1 }, - { 0xFF60, (unsigned int) 0xFF5F }, - { 0xFF5F, (unsigned int) 0xFF60 }, - { 0xFF63, (unsigned int) 0xFF62 }, - { 0xFF62, (unsigned int) 0xFF63 }, + { 0x0029, 0x0028 }, + { 0x0028, 0x0029 }, + { 0x003E, 0x003C }, + { 0x003C, 0x003E }, + { 0x005D, 0x005B }, + { 0x005B, 0x005D }, + { 0x007D, 0x007B }, + { 0x007B, 0x007D }, + { 0x00BB, 0x00AB }, + { 0x00AB, 0x00BB }, + { 0x226B, 0x226A }, + { 0x226A, 0x226B }, + { 0x22F1, 0x22F0 }, + { 0x22F0, 0x22F1 }, + { 0xFF60, 0xFF5F }, + { 0xFF5F, 0xFF60 }, + { 0xFF63, 0xFF62 }, + { 0xFF62, 0xFF63 }, + + { 0x111111, 0x111111 }, }; static const test_pair_t mirroring_tests_more[] = { /* No new mirroring characters have been encoded in recent Unicode versions. */ - { 0xFFFF, (unsigned int) 0xFFFF }, + { 0x111111, 0x111111 } }; static const test_pair_t script_tests[] = { - { 0x111111, (unsigned int) HB_SCRIPT_UNKNOWN }, - - { 0x002A, (unsigned int) HB_SCRIPT_COMMON }, - { 0x0670, (unsigned int) HB_SCRIPT_INHERITED }, - { 0x060D, (unsigned int) HB_SCRIPT_ARABIC }, - { 0x0559, (unsigned int) HB_SCRIPT_ARMENIAN }, - { 0x09CD, (unsigned int) HB_SCRIPT_BENGALI }, - { 0x31B6, (unsigned int) HB_SCRIPT_BOPOMOFO }, - { 0x13A2, (unsigned int) HB_SCRIPT_CHEROKEE }, - { 0x2CFD, (unsigned int) HB_SCRIPT_COPTIC }, - { 0x0482, (unsigned int) HB_SCRIPT_CYRILLIC }, - { 0x10401, (unsigned int) HB_SCRIPT_DESERET }, - { 0x094D, (unsigned int) HB_SCRIPT_DEVANAGARI }, - { 0x1258, (unsigned int) HB_SCRIPT_ETHIOPIC }, - { 0x10FC, (unsigned int) HB_SCRIPT_GEORGIAN }, - { 0x10341, (unsigned int) HB_SCRIPT_GOTHIC }, - { 0x0375, (unsigned int) HB_SCRIPT_GREEK }, - { 0x0A83, (unsigned int) HB_SCRIPT_GUJARATI }, - { 0x0A3C, (unsigned int) HB_SCRIPT_GURMUKHI }, - { 0x3005, (unsigned int) HB_SCRIPT_HAN }, - { 0x1100, (unsigned int) HB_SCRIPT_HANGUL }, - { 0x05BF, (unsigned int) HB_SCRIPT_HEBREW }, - { 0x309F, (unsigned int) HB_SCRIPT_HIRAGANA }, - { 0x0CBC, (unsigned int) HB_SCRIPT_KANNADA }, - { 0x30FF, (unsigned int) HB_SCRIPT_KATAKANA }, - { 0x17DD, (unsigned int) HB_SCRIPT_KHMER }, - { 0x0EDD, (unsigned int) HB_SCRIPT_LAO }, - { 0x0061, (unsigned int) HB_SCRIPT_LATIN }, - { 0x0D3D, (unsigned int) HB_SCRIPT_MALAYALAM }, - { 0x1843, (unsigned int) HB_SCRIPT_MONGOLIAN }, - { 0x1031, (unsigned int) HB_SCRIPT_MYANMAR }, - { 0x169C, (unsigned int) HB_SCRIPT_OGHAM }, - { 0x10322, (unsigned int) HB_SCRIPT_OLD_ITALIC }, - { 0x0B3C, (unsigned int) HB_SCRIPT_ORIYA }, - { 0x16EF, (unsigned int) HB_SCRIPT_RUNIC }, - { 0x0DBD, (unsigned int) HB_SCRIPT_SINHALA }, - { 0x0711, (unsigned int) HB_SCRIPT_SYRIAC }, - { 0x0B82, (unsigned int) HB_SCRIPT_TAMIL }, - { 0x0C03, (unsigned int) HB_SCRIPT_TELUGU }, - { 0x07B1, (unsigned int) HB_SCRIPT_THAANA }, - { 0x0E31, (unsigned int) HB_SCRIPT_THAI }, - { 0x0FD4, (unsigned int) HB_SCRIPT_TIBETAN }, - { 0x1401, (unsigned int) HB_SCRIPT_CANADIAN_ABORIGINAL }, - { 0xA015, (unsigned int) HB_SCRIPT_YI }, - { 0x1700, (unsigned int) HB_SCRIPT_TAGALOG }, - { 0x1720, (unsigned int) HB_SCRIPT_HANUNOO }, - { 0x1740, (unsigned int) HB_SCRIPT_BUHID }, - { 0x1760, (unsigned int) HB_SCRIPT_TAGBANWA }, + { 0x002A, HB_SCRIPT_COMMON }, + { 0x0670, HB_SCRIPT_INHERITED }, + { 0x060D, HB_SCRIPT_ARABIC }, + { 0x0559, HB_SCRIPT_ARMENIAN }, + { 0x09CD, HB_SCRIPT_BENGALI }, + { 0x31B6, HB_SCRIPT_BOPOMOFO }, + { 0x13A2, HB_SCRIPT_CHEROKEE }, + { 0x2CFD, HB_SCRIPT_COPTIC }, + { 0x0482, HB_SCRIPT_CYRILLIC }, + { 0x10401, HB_SCRIPT_DESERET }, + { 0x094D, HB_SCRIPT_DEVANAGARI }, + { 0x1258, HB_SCRIPT_ETHIOPIC }, + { 0x10FC, HB_SCRIPT_GEORGIAN }, + { 0x10341, HB_SCRIPT_GOTHIC }, + { 0x0375, HB_SCRIPT_GREEK }, + { 0x0A83, HB_SCRIPT_GUJARATI }, + { 0x0A3C, HB_SCRIPT_GURMUKHI }, + { 0x3005, HB_SCRIPT_HAN }, + { 0x1100, HB_SCRIPT_HANGUL }, + { 0x05BF, HB_SCRIPT_HEBREW }, + { 0x309F, HB_SCRIPT_HIRAGANA }, + { 0x0CBC, HB_SCRIPT_KANNADA }, + { 0x30FF, HB_SCRIPT_KATAKANA }, + { 0x17DD, HB_SCRIPT_KHMER }, + { 0x0EDD, HB_SCRIPT_LAO }, + { 0x0061, HB_SCRIPT_LATIN }, + { 0x0D3D, HB_SCRIPT_MALAYALAM }, + { 0x1843, HB_SCRIPT_MONGOLIAN }, + { 0x1031, HB_SCRIPT_MYANMAR }, + { 0x169C, HB_SCRIPT_OGHAM }, + { 0x10322, HB_SCRIPT_OLD_ITALIC }, + { 0x0B3C, HB_SCRIPT_ORIYA }, + { 0x16EF, HB_SCRIPT_RUNIC }, + { 0x0DBD, HB_SCRIPT_SINHALA }, + { 0x0711, HB_SCRIPT_SYRIAC }, + { 0x0B82, HB_SCRIPT_TAMIL }, + { 0x0C03, HB_SCRIPT_TELUGU }, + { 0x07B1, HB_SCRIPT_THAANA }, + { 0x0E31, HB_SCRIPT_THAI }, + { 0x0FD4, HB_SCRIPT_TIBETAN }, + { 0x1401, HB_SCRIPT_CANADIAN_ABORIGINAL }, + { 0xA015, HB_SCRIPT_YI }, + { 0x1700, HB_SCRIPT_TAGALOG }, + { 0x1720, HB_SCRIPT_HANUNOO }, + { 0x1740, HB_SCRIPT_BUHID }, + { 0x1760, HB_SCRIPT_TAGBANWA }, /* Unicode-4.0 additions */ - { 0x2800, (unsigned int) HB_SCRIPT_BRAILLE }, - { 0x10808, (unsigned int) HB_SCRIPT_CYPRIOT }, - { 0x1932, (unsigned int) HB_SCRIPT_LIMBU }, - { 0x10480, (unsigned int) HB_SCRIPT_OSMANYA }, - { 0x10450, (unsigned int) HB_SCRIPT_SHAVIAN }, - { 0x10000, (unsigned int) HB_SCRIPT_LINEAR_B }, - { 0x1950, (unsigned int) HB_SCRIPT_TAI_LE }, - { 0x1039F, (unsigned int) HB_SCRIPT_UGARITIC }, + { 0x2800, HB_SCRIPT_BRAILLE }, + { 0x10808, HB_SCRIPT_CYPRIOT }, + { 0x1932, HB_SCRIPT_LIMBU }, + { 0x10480, HB_SCRIPT_OSMANYA }, + { 0x10450, HB_SCRIPT_SHAVIAN }, + { 0x10000, HB_SCRIPT_LINEAR_B }, + { 0x1950, HB_SCRIPT_TAI_LE }, + { 0x1039F, HB_SCRIPT_UGARITIC }, /* Unicode-4.1 additions */ - { 0x1980, (unsigned int) HB_SCRIPT_NEW_TAI_LUE }, - { 0x1A1F, (unsigned int) HB_SCRIPT_BUGINESE }, - { 0x2C00, (unsigned int) HB_SCRIPT_GLAGOLITIC }, - { 0x2D6F, (unsigned int) HB_SCRIPT_TIFINAGH }, - { 0xA800, (unsigned int) HB_SCRIPT_SYLOTI_NAGRI }, - { 0x103D0, (unsigned int) HB_SCRIPT_OLD_PERSIAN }, - { 0x10A3F, (unsigned int) HB_SCRIPT_KHAROSHTHI }, + { 0x1980, HB_SCRIPT_NEW_TAI_LUE }, + { 0x1A1F, HB_SCRIPT_BUGINESE }, + { 0x2C00, HB_SCRIPT_GLAGOLITIC }, + { 0x2D6F, HB_SCRIPT_TIFINAGH }, + { 0xA800, HB_SCRIPT_SYLOTI_NAGRI }, + { 0x103D0, HB_SCRIPT_OLD_PERSIAN }, + { 0x10A3F, HB_SCRIPT_KHAROSHTHI }, /* Unicode-5.0 additions */ - { 0x0378, (unsigned int) HB_SCRIPT_UNKNOWN }, - { 0x1B04, (unsigned int) HB_SCRIPT_BALINESE }, - { 0x12000, (unsigned int) HB_SCRIPT_CUNEIFORM }, - { 0x10900, (unsigned int) HB_SCRIPT_PHOENICIAN }, - { 0xA840, (unsigned int) HB_SCRIPT_PHAGS_PA }, - { 0x07C0, (unsigned int) HB_SCRIPT_NKO }, + { 0x0378, HB_SCRIPT_UNKNOWN }, + { 0x1B04, HB_SCRIPT_BALINESE }, + { 0x12000, HB_SCRIPT_CUNEIFORM }, + { 0x10900, HB_SCRIPT_PHOENICIAN }, + { 0xA840, HB_SCRIPT_PHAGS_PA }, + { 0x07C0, HB_SCRIPT_NKO }, /* Unicode-5.1 additions */ - { 0xA900, (unsigned int) HB_SCRIPT_KAYAH_LI }, - { 0x1C00, (unsigned int) HB_SCRIPT_LEPCHA }, - { 0xA930, (unsigned int) HB_SCRIPT_REJANG }, - { 0x1B80, (unsigned int) HB_SCRIPT_SUNDANESE }, - { 0xA880, (unsigned int) HB_SCRIPT_SAURASHTRA }, - { 0xAA00, (unsigned int) HB_SCRIPT_CHAM }, - { 0x1C50, (unsigned int) HB_SCRIPT_OL_CHIKI }, - { 0xA500, (unsigned int) HB_SCRIPT_VAI }, - { 0x102A0, (unsigned int) HB_SCRIPT_CARIAN }, - { 0x10280, (unsigned int) HB_SCRIPT_LYCIAN }, - { 0x1093F, (unsigned int) HB_SCRIPT_LYDIAN }, + { 0xA900, HB_SCRIPT_KAYAH_LI }, + { 0x1C00, HB_SCRIPT_LEPCHA }, + { 0xA930, HB_SCRIPT_REJANG }, + { 0x1B80, HB_SCRIPT_SUNDANESE }, + { 0xA880, HB_SCRIPT_SAURASHTRA }, + { 0xAA00, HB_SCRIPT_CHAM }, + { 0x1C50, HB_SCRIPT_OL_CHIKI }, + { 0xA500, HB_SCRIPT_VAI }, + { 0x102A0, HB_SCRIPT_CARIAN }, + { 0x10280, HB_SCRIPT_LYCIAN }, + { 0x1093F, HB_SCRIPT_LYDIAN }, + + { 0x111111, HB_SCRIPT_UNKNOWN } }; static const test_pair_t script_tests_more[] = { /* Unicode-5.2 additions */ - { 0x10B00, (unsigned int) HB_SCRIPT_AVESTAN }, - { 0xA6A0, (unsigned int) HB_SCRIPT_BAMUM }, - { 0x13000, (unsigned int) HB_SCRIPT_EGYPTIAN_HIEROGLYPHS }, - { 0x10840, (unsigned int) HB_SCRIPT_IMPERIAL_ARAMAIC }, - { 0x10B60, (unsigned int) HB_SCRIPT_INSCRIPTIONAL_PAHLAVI }, - { 0x10B40, (unsigned int) HB_SCRIPT_INSCRIPTIONAL_PARTHIAN }, - { 0xA980, (unsigned int) HB_SCRIPT_JAVANESE }, - { 0x11082, (unsigned int) HB_SCRIPT_KAITHI }, - { 0xA4D0, (unsigned int) HB_SCRIPT_LISU }, - { 0xABE5, (unsigned int) HB_SCRIPT_MEETEI_MAYEK }, - { 0x10A60, (unsigned int) HB_SCRIPT_OLD_SOUTH_ARABIAN }, - { 0x10C00, (unsigned int) HB_SCRIPT_OLD_TURKIC }, - { 0x0800, (unsigned int) HB_SCRIPT_SAMARITAN }, - { 0x1A20, (unsigned int) HB_SCRIPT_TAI_THAM }, - { 0xAA80, (unsigned int) HB_SCRIPT_TAI_VIET }, + { 0x10B00, HB_SCRIPT_AVESTAN }, + { 0xA6A0, HB_SCRIPT_BAMUM }, + { 0x13000, HB_SCRIPT_EGYPTIAN_HIEROGLYPHS }, + { 0x10840, HB_SCRIPT_IMPERIAL_ARAMAIC }, + { 0x10B60, HB_SCRIPT_INSCRIPTIONAL_PAHLAVI }, + { 0x10B40, HB_SCRIPT_INSCRIPTIONAL_PARTHIAN }, + { 0xA980, HB_SCRIPT_JAVANESE }, + { 0x11082, HB_SCRIPT_KAITHI }, + { 0xA4D0, HB_SCRIPT_LISU }, + { 0xABE5, HB_SCRIPT_MEETEI_MAYEK }, + { 0x10A60, HB_SCRIPT_OLD_SOUTH_ARABIAN }, + { 0x10C00, HB_SCRIPT_OLD_TURKIC }, + { 0x0800, HB_SCRIPT_SAMARITAN }, + { 0x1A20, HB_SCRIPT_TAI_THAM }, + { 0xAA80, HB_SCRIPT_TAI_VIET }, /* Unicode-6.0 additions */ - { 0x1BC0, (unsigned int) HB_SCRIPT_BATAK }, - { 0x11000, (unsigned int) HB_SCRIPT_BRAHMI }, - { 0x0840, (unsigned int) HB_SCRIPT_MANDAIC }, + { 0x1BC0, HB_SCRIPT_BATAK }, + { 0x11000, HB_SCRIPT_BRAHMI }, + { 0x0840, HB_SCRIPT_MANDAIC }, /* Unicode-5.2 character additions */ - { 0x1CED, (unsigned int) HB_SCRIPT_INHERITED }, - { 0x1400, (unsigned int) HB_SCRIPT_CANADIAN_ABORIGINAL }, + { 0x1CED, HB_SCRIPT_INHERITED }, + { 0x1400, HB_SCRIPT_CANADIAN_ABORIGINAL }, + + { 0x111111, HB_SCRIPT_UNKNOWN } };