diff --git a/ChangeLog b/ChangeLog index 3b22af5c4..5de448383 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2017-05-08 Sascha Brawer + Werner Lemberg [truetype] Add tricky font `DFGirl-W6-WIN-BF' (from Dynalab). diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c index 4d60bac88..7d37e8739 100644 --- a/src/autofit/afblue.c +++ b/src/autofit/afblue.c @@ -74,6 +74,10 @@ '\0', '\xE1', '\x99', '\x86', ' ', '\xE1', '\x97', '\xAE', ' ', '\xE1', '\x92', '\xBB', ' ', '\xE1', '\x90', '\x9E', ' ', '\xE1', '\x94', '\x86', ' ', '\xE1', '\x92', '\xA1', ' ', '\xE1', '\x92', '\xA2', ' ', '\xE1', '\x93', '\x91', /* ᙆ ᗮ ᒻ ᐞ ᔆ ᒡ ᒢ ᓑ */ '\0', + '\xF0', '\x90', '\x8A', '\xA7', ' ', '\xF0', '\x90', '\x8A', '\xAB', ' ', '\xF0', '\x90', '\x8A', '\xAC', ' ', '\xF0', '\x90', '\x8A', '\xAD', ' ', '\xF0', '\x90', '\x8A', '\xB1', ' ', '\xF0', '\x90', '\x8A', '\xBA', ' ', '\xF0', '\x90', '\x8A', '\xBC', ' ', '\xF0', '\x90', '\x8A', '\xBF', /* 𐊧 𐊫 𐊬 𐊭 𐊱 𐊺 𐊼 𐊿 */ + '\0', + '\xF0', '\x90', '\x8A', '\xA3', ' ', '\xF0', '\x90', '\x8A', '\xA7', ' ', '\xF0', '\x90', '\x8A', '\xB7', ' ', '\xF0', '\x90', '\x8B', '\x80', ' ', '\xF0', '\x90', '\x8A', '\xAB', ' ', '\xF0', '\x90', '\x8A', '\xB8', ' ', '\xF0', '\x90', '\x8B', '\x89', /* 𐊣 𐊧 𐊷 𐋀 𐊫 𐊸 𐋉 */ + '\0', '\xE1', '\x8F', '\x86', ' ', '\xE1', '\x8E', '\xBB', ' ', '\xE1', '\x8E', '\xAC', ' ', '\xE1', '\x8F', '\x83', ' ', '\xE1', '\x8E', '\xA4', ' ', '\xE1', '\x8F', '\xA3', ' ', '\xE1', '\x8E', '\xA6', ' ', '\xE1', '\x8F', '\x95', /* Ꮖ Ꮋ Ꭼ Ꮓ Ꭴ Ꮳ Ꭶ Ꮥ */ '\0', '\xEA', '\xAE', '\x92', ' ', '\xEA', '\xAE', '\xA4', ' ', '\xEA', '\xAE', '\xB6', ' ', '\xEA', '\xAD', '\xB4', ' ', '\xEA', '\xAD', '\xBE', ' ', '\xEA', '\xAE', '\x97', ' ', '\xEA', '\xAE', '\x9D', ' ', '\xEA', '\xAE', '\xBF', /* ꮒ ꮤ ꮶ ꭴ ꭾ ꮗ ꮝ ꮿ */ @@ -413,6 +417,9 @@ { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM, 0 }, { AF_BLUE_STRING_MAX, 0 }, + { AF_BLUE_STRING_CARIAN_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_CARIAN_BOTTOM, 0 }, + { AF_BLUE_STRING_MAX, 0 }, { AF_BLUE_STRING_CHEROKEE_CAPITAL, AF_BLUE_PROPERTY_LATIN_TOP }, { AF_BLUE_STRING_CHEROKEE_CAPITAL, 0 }, { AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP }, diff --git a/src/autofit/afblue.dat b/src/autofit/afblue.dat index 07a606e81..ba7406067 100644 --- a/src/autofit/afblue.dat +++ b/src/autofit/afblue.dat @@ -133,6 +133,11 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN: AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM "ᙆ ᗮ ᒻ ᐞ ᔆ ᒡ ᒢ ᓑ" + AF_BLUE_STRING_CARIAN_TOP + "𐊧 𐊫 𐊬 𐊭 𐊱 𐊺 𐊼 𐊿" + AF_BLUE_STRING_CARIAN_BOTTOM + "𐊣 𐊧 𐊷 𐋀 𐊫 𐊸 𐋉" + AF_BLUE_STRING_CHEROKEE_CAPITAL "Ꮖ Ꮋ Ꭼ Ꮓ Ꭴ Ꮳ Ꭶ Ꮥ" AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER @@ -642,6 +647,11 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN: { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM, 0 } { AF_BLUE_STRING_MAX, 0 } + AF_BLUE_STRINGSET_CARI + { AF_BLUE_STRING_CARIAN_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_CARIAN_BOTTOM, 0 } + { AF_BLUE_STRING_MAX, 0 } + AF_BLUE_STRINGSET_CHER { AF_BLUE_STRING_CHEROKEE_CAPITAL, AF_BLUE_PROPERTY_LATIN_TOP } { AF_BLUE_STRING_CHEROKEE_CAPITAL, 0 } diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h index fe94b1387..1af0b8fd9 100644 --- a/src/autofit/afblue.h +++ b/src/autofit/afblue.h @@ -101,134 +101,136 @@ FT_BEGIN_HEADER AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_BOTTOM = 500, AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_TOP = 532, AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM = 560, - AF_BLUE_STRING_CHEROKEE_CAPITAL = 592, - AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER = 624, - AF_BLUE_STRING_CHEROKEE_SMALL = 656, - AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER = 688, - AF_BLUE_STRING_CYPRIOT_TOP = 704, - AF_BLUE_STRING_CYPRIOT_BOTTOM = 744, - AF_BLUE_STRING_CYPRIOT_SMALL = 779, - AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 794, - AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 818, - AF_BLUE_STRING_CYRILLIC_SMALL = 842, - AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 866, - AF_BLUE_STRING_DESERET_CAPITAL_TOP = 875, - AF_BLUE_STRING_DESERET_CAPITAL_BOTTOM = 900, - AF_BLUE_STRING_DESERET_SMALL_TOP = 925, - AF_BLUE_STRING_DESERET_SMALL_BOTTOM = 950, - AF_BLUE_STRING_DEVANAGARI_BASE = 975, - AF_BLUE_STRING_DEVANAGARI_TOP = 1007, - AF_BLUE_STRING_DEVANAGARI_HEAD = 1039, - AF_BLUE_STRING_DEVANAGARI_BOTTOM = 1071, - AF_BLUE_STRING_ETHIOPIC_TOP = 1079, - AF_BLUE_STRING_ETHIOPIC_BOTTOM = 1111, - AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP = 1143, - AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM = 1175, - AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER = 1207, - AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER = 1239, - AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP = 1271, - AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM = 1303, - AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP = 1335, - AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 1367, - AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 1399, - AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 1431, - AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1463, - AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 1495, - AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 1527, - AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 1559, - AF_BLUE_STRING_GOTHIC_TOP = 1591, - AF_BLUE_STRING_GOTHIC_BOTTOM = 1631, - AF_BLUE_STRING_GREEK_CAPITAL_TOP = 1651, - AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 1672, - AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 1690, - AF_BLUE_STRING_GREEK_SMALL = 1708, - AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 1732, - AF_BLUE_STRING_GUJARATI_TOP = 1756, - AF_BLUE_STRING_GUJARATI_BOTTOM = 1788, - AF_BLUE_STRING_GUJARATI_ASCENDER = 1820, - AF_BLUE_STRING_GUJARATI_DESCENDER = 1870, - AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 1903, - AF_BLUE_STRING_GURMUKHI_BASE = 1923, - AF_BLUE_STRING_GURMUKHI_HEAD = 1955, - AF_BLUE_STRING_GURMUKHI_TOP = 1987, - AF_BLUE_STRING_GURMUKHI_BOTTOM = 2019, - AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 2051, - AF_BLUE_STRING_HEBREW_TOP = 2071, - AF_BLUE_STRING_HEBREW_BOTTOM = 2095, - AF_BLUE_STRING_HEBREW_DESCENDER = 2113, - AF_BLUE_STRING_KANNADA_TOP = 2128, - AF_BLUE_STRING_KANNADA_BOTTOM = 2172, - AF_BLUE_STRING_KHMER_TOP = 2204, - AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 2228, - AF_BLUE_STRING_KHMER_BOTTOM = 2268, - AF_BLUE_STRING_KHMER_DESCENDER = 2300, - AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 2334, - AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 2421, - AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 2429, - AF_BLUE_STRING_LAO_TOP = 2437, - AF_BLUE_STRING_LAO_BOTTOM = 2469, - AF_BLUE_STRING_LAO_ASCENDER = 2501, - AF_BLUE_STRING_LAO_LARGE_ASCENDER = 2517, - AF_BLUE_STRING_LAO_DESCENDER = 2529, - AF_BLUE_STRING_LATIN_CAPITAL_TOP = 2553, - AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 2569, - AF_BLUE_STRING_LATIN_SMALL_F_TOP = 2585, - AF_BLUE_STRING_LATIN_SMALL_TOP = 2599, - AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 2615, - AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 2631, - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 2641, - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 2661, - AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 2681, - AF_BLUE_STRING_LATIN_SUBS_SMALL = 2701, - AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 2737, - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 2757, - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 2788, - AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 2817, - AF_BLUE_STRING_LATIN_SUPS_SMALL = 2843, - AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 2868, - AF_BLUE_STRING_LISU_TOP = 2879, - AF_BLUE_STRING_LISU_BOTTOM = 2911, - AF_BLUE_STRING_MALAYALAM_TOP = 2943, - AF_BLUE_STRING_MALAYALAM_BOTTOM = 2987, - AF_BLUE_STRING_MYANMAR_TOP = 3019, - AF_BLUE_STRING_MYANMAR_BOTTOM = 3051, - AF_BLUE_STRING_MYANMAR_ASCENDER = 3083, - AF_BLUE_STRING_MYANMAR_DESCENDER = 3111, - AF_BLUE_STRING_NKO_TOP = 3143, - AF_BLUE_STRING_NKO_BOTTOM = 3167, - AF_BLUE_STRING_NKO_SMALL_TOP = 3182, - AF_BLUE_STRING_NKO_SMALL_BOTTOM = 3191, - AF_BLUE_STRING_OL_CHIKI = 3203, - AF_BLUE_STRING_OLD_TURKIC_TOP = 3227, - AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 3242, - AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 3262, - AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 3302, - AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3332, - AF_BLUE_STRING_OSAGE_SMALL_TOP = 3347, - AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3387, - AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 3427, - AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 3452, - AF_BLUE_STRING_SINHALA_TOP = 3467, - AF_BLUE_STRING_SINHALA_BOTTOM = 3499, - AF_BLUE_STRING_SINHALA_DESCENDER = 3531, - AF_BLUE_STRING_SUNDANESE_TOP = 3575, - AF_BLUE_STRING_SUNDANESE_BOTTOM = 3599, - AF_BLUE_STRING_SUNDANESE_DESCENDER = 3631, - AF_BLUE_STRING_TAI_VIET_TOP = 3639, - AF_BLUE_STRING_TAI_VIET_BOTTOM = 3659, - AF_BLUE_STRING_TAMIL_TOP = 3671, - AF_BLUE_STRING_TAMIL_BOTTOM = 3703, - AF_BLUE_STRING_TELUGU_TOP = 3735, - AF_BLUE_STRING_TELUGU_BOTTOM = 3763, - AF_BLUE_STRING_THAI_TOP = 3791, - AF_BLUE_STRING_THAI_BOTTOM = 3815, - AF_BLUE_STRING_THAI_ASCENDER = 3843, - AF_BLUE_STRING_THAI_LARGE_ASCENDER = 3855, - AF_BLUE_STRING_THAI_DESCENDER = 3867, - AF_BLUE_STRING_THAI_LARGE_DESCENDER = 3883, - AF_BLUE_STRING_THAI_DIGIT_TOP = 3891, - AF_BLUE_STRING_TIFINAGH = 3903, - af_blue_1_1 = 3934, + AF_BLUE_STRING_CARIAN_TOP = 592, + AF_BLUE_STRING_CARIAN_BOTTOM = 632, + AF_BLUE_STRING_CHEROKEE_CAPITAL = 667, + AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER = 699, + AF_BLUE_STRING_CHEROKEE_SMALL = 731, + AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER = 763, + AF_BLUE_STRING_CYPRIOT_TOP = 779, + AF_BLUE_STRING_CYPRIOT_BOTTOM = 819, + AF_BLUE_STRING_CYPRIOT_SMALL = 854, + AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 869, + AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 893, + AF_BLUE_STRING_CYRILLIC_SMALL = 917, + AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 941, + AF_BLUE_STRING_DESERET_CAPITAL_TOP = 950, + AF_BLUE_STRING_DESERET_CAPITAL_BOTTOM = 975, + AF_BLUE_STRING_DESERET_SMALL_TOP = 1000, + AF_BLUE_STRING_DESERET_SMALL_BOTTOM = 1025, + AF_BLUE_STRING_DEVANAGARI_BASE = 1050, + AF_BLUE_STRING_DEVANAGARI_TOP = 1082, + AF_BLUE_STRING_DEVANAGARI_HEAD = 1114, + AF_BLUE_STRING_DEVANAGARI_BOTTOM = 1146, + AF_BLUE_STRING_ETHIOPIC_TOP = 1154, + AF_BLUE_STRING_ETHIOPIC_BOTTOM = 1186, + AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP = 1218, + AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM = 1250, + AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER = 1282, + AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER = 1314, + AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP = 1346, + AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM = 1378, + AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP = 1410, + AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 1442, + AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 1474, + AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 1506, + AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1538, + AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 1570, + AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 1602, + AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 1634, + AF_BLUE_STRING_GOTHIC_TOP = 1666, + AF_BLUE_STRING_GOTHIC_BOTTOM = 1706, + AF_BLUE_STRING_GREEK_CAPITAL_TOP = 1726, + AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 1747, + AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 1765, + AF_BLUE_STRING_GREEK_SMALL = 1783, + AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 1807, + AF_BLUE_STRING_GUJARATI_TOP = 1831, + AF_BLUE_STRING_GUJARATI_BOTTOM = 1863, + AF_BLUE_STRING_GUJARATI_ASCENDER = 1895, + AF_BLUE_STRING_GUJARATI_DESCENDER = 1945, + AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 1978, + AF_BLUE_STRING_GURMUKHI_BASE = 1998, + AF_BLUE_STRING_GURMUKHI_HEAD = 2030, + AF_BLUE_STRING_GURMUKHI_TOP = 2062, + AF_BLUE_STRING_GURMUKHI_BOTTOM = 2094, + AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 2126, + AF_BLUE_STRING_HEBREW_TOP = 2146, + AF_BLUE_STRING_HEBREW_BOTTOM = 2170, + AF_BLUE_STRING_HEBREW_DESCENDER = 2188, + AF_BLUE_STRING_KANNADA_TOP = 2203, + AF_BLUE_STRING_KANNADA_BOTTOM = 2247, + AF_BLUE_STRING_KHMER_TOP = 2279, + AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 2303, + AF_BLUE_STRING_KHMER_BOTTOM = 2343, + AF_BLUE_STRING_KHMER_DESCENDER = 2375, + AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 2409, + AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 2496, + AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 2504, + AF_BLUE_STRING_LAO_TOP = 2512, + AF_BLUE_STRING_LAO_BOTTOM = 2544, + AF_BLUE_STRING_LAO_ASCENDER = 2576, + AF_BLUE_STRING_LAO_LARGE_ASCENDER = 2592, + AF_BLUE_STRING_LAO_DESCENDER = 2604, + AF_BLUE_STRING_LATIN_CAPITAL_TOP = 2628, + AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 2644, + AF_BLUE_STRING_LATIN_SMALL_F_TOP = 2660, + AF_BLUE_STRING_LATIN_SMALL_TOP = 2674, + AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 2690, + AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 2706, + AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 2716, + AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 2736, + AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 2756, + AF_BLUE_STRING_LATIN_SUBS_SMALL = 2776, + AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 2812, + AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 2832, + AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 2863, + AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 2892, + AF_BLUE_STRING_LATIN_SUPS_SMALL = 2918, + AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 2943, + AF_BLUE_STRING_LISU_TOP = 2954, + AF_BLUE_STRING_LISU_BOTTOM = 2986, + AF_BLUE_STRING_MALAYALAM_TOP = 3018, + AF_BLUE_STRING_MALAYALAM_BOTTOM = 3062, + AF_BLUE_STRING_MYANMAR_TOP = 3094, + AF_BLUE_STRING_MYANMAR_BOTTOM = 3126, + AF_BLUE_STRING_MYANMAR_ASCENDER = 3158, + AF_BLUE_STRING_MYANMAR_DESCENDER = 3186, + AF_BLUE_STRING_NKO_TOP = 3218, + AF_BLUE_STRING_NKO_BOTTOM = 3242, + AF_BLUE_STRING_NKO_SMALL_TOP = 3257, + AF_BLUE_STRING_NKO_SMALL_BOTTOM = 3266, + AF_BLUE_STRING_OL_CHIKI = 3278, + AF_BLUE_STRING_OLD_TURKIC_TOP = 3302, + AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 3317, + AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 3337, + AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 3377, + AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3407, + AF_BLUE_STRING_OSAGE_SMALL_TOP = 3422, + AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3462, + AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 3502, + AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 3527, + AF_BLUE_STRING_SINHALA_TOP = 3542, + AF_BLUE_STRING_SINHALA_BOTTOM = 3574, + AF_BLUE_STRING_SINHALA_DESCENDER = 3606, + AF_BLUE_STRING_SUNDANESE_TOP = 3650, + AF_BLUE_STRING_SUNDANESE_BOTTOM = 3674, + AF_BLUE_STRING_SUNDANESE_DESCENDER = 3706, + AF_BLUE_STRING_TAI_VIET_TOP = 3714, + AF_BLUE_STRING_TAI_VIET_BOTTOM = 3734, + AF_BLUE_STRING_TAMIL_TOP = 3746, + AF_BLUE_STRING_TAMIL_BOTTOM = 3778, + AF_BLUE_STRING_TELUGU_TOP = 3810, + AF_BLUE_STRING_TELUGU_BOTTOM = 3838, + AF_BLUE_STRING_THAI_TOP = 3866, + AF_BLUE_STRING_THAI_BOTTOM = 3890, + AF_BLUE_STRING_THAI_ASCENDER = 3918, + AF_BLUE_STRING_THAI_LARGE_ASCENDER = 3930, + AF_BLUE_STRING_THAI_DESCENDER = 3942, + AF_BLUE_STRING_THAI_LARGE_DESCENDER = 3958, + AF_BLUE_STRING_THAI_DIGIT_TOP = 3966, + AF_BLUE_STRING_TIFINAGH = 3978, + af_blue_1_1 = 4009, #ifdef AF_CONFIG_OPTION_CJK AF_BLUE_STRING_CJK_TOP = af_blue_1_1 + 1, AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 203, @@ -293,43 +295,44 @@ FT_BEGIN_HEADER AF_BLUE_STRINGSET_AVST = 16, AF_BLUE_STRINGSET_BENG = 19, AF_BLUE_STRINGSET_CANADIAN_SYLLABICS = 24, - AF_BLUE_STRINGSET_CHER = 31, - AF_BLUE_STRINGSET_CPRT = 38, - AF_BLUE_STRINGSET_CYRL = 43, - AF_BLUE_STRINGSET_DEVA = 49, - AF_BLUE_STRINGSET_DSRT = 55, - AF_BLUE_STRINGSET_ETHI = 60, - AF_BLUE_STRINGSET_GEOR = 63, - AF_BLUE_STRINGSET_GEOK = 68, - AF_BLUE_STRINGSET_GLAG = 75, - AF_BLUE_STRINGSET_GOTH = 80, - AF_BLUE_STRINGSET_GREK = 83, - AF_BLUE_STRINGSET_GUJR = 90, - AF_BLUE_STRINGSET_GURU = 96, - AF_BLUE_STRINGSET_HEBR = 102, - AF_BLUE_STRINGSET_KNDA = 106, - AF_BLUE_STRINGSET_KHMR = 109, - AF_BLUE_STRINGSET_KHMS = 115, - AF_BLUE_STRINGSET_LAO = 118, - AF_BLUE_STRINGSET_LATN = 124, - AF_BLUE_STRINGSET_LATB = 131, - AF_BLUE_STRINGSET_LATP = 138, - AF_BLUE_STRINGSET_LISU = 145, - AF_BLUE_STRINGSET_MLYM = 148, - AF_BLUE_STRINGSET_MYMR = 151, - AF_BLUE_STRINGSET_NKOO = 156, - AF_BLUE_STRINGSET_NONE = 161, - AF_BLUE_STRINGSET_OLCK = 162, - AF_BLUE_STRINGSET_ORKH = 165, - AF_BLUE_STRINGSET_OSGE = 168, - AF_BLUE_STRINGSET_SINH = 176, - AF_BLUE_STRINGSET_SUND = 180, - AF_BLUE_STRINGSET_TAML = 184, - AF_BLUE_STRINGSET_TAVT = 187, - AF_BLUE_STRINGSET_TELU = 190, - AF_BLUE_STRINGSET_THAI = 193, - AF_BLUE_STRINGSET_TFNG = 201, - af_blue_2_1 = 204, + AF_BLUE_STRINGSET_CARI = 31, + AF_BLUE_STRINGSET_CHER = 34, + AF_BLUE_STRINGSET_CPRT = 41, + AF_BLUE_STRINGSET_CYRL = 46, + AF_BLUE_STRINGSET_DEVA = 52, + AF_BLUE_STRINGSET_DSRT = 58, + AF_BLUE_STRINGSET_ETHI = 63, + AF_BLUE_STRINGSET_GEOR = 66, + AF_BLUE_STRINGSET_GEOK = 71, + AF_BLUE_STRINGSET_GLAG = 78, + AF_BLUE_STRINGSET_GOTH = 83, + AF_BLUE_STRINGSET_GREK = 86, + AF_BLUE_STRINGSET_GUJR = 93, + AF_BLUE_STRINGSET_GURU = 99, + AF_BLUE_STRINGSET_HEBR = 105, + AF_BLUE_STRINGSET_KNDA = 109, + AF_BLUE_STRINGSET_KHMR = 112, + AF_BLUE_STRINGSET_KHMS = 118, + AF_BLUE_STRINGSET_LAO = 121, + AF_BLUE_STRINGSET_LATN = 127, + AF_BLUE_STRINGSET_LATB = 134, + AF_BLUE_STRINGSET_LATP = 141, + AF_BLUE_STRINGSET_LISU = 148, + AF_BLUE_STRINGSET_MLYM = 151, + AF_BLUE_STRINGSET_MYMR = 154, + AF_BLUE_STRINGSET_NKOO = 159, + AF_BLUE_STRINGSET_NONE = 164, + AF_BLUE_STRINGSET_OLCK = 165, + AF_BLUE_STRINGSET_ORKH = 168, + AF_BLUE_STRINGSET_OSGE = 171, + AF_BLUE_STRINGSET_SINH = 179, + AF_BLUE_STRINGSET_SUND = 183, + AF_BLUE_STRINGSET_TAML = 187, + AF_BLUE_STRINGSET_TAVT = 190, + AF_BLUE_STRINGSET_TELU = 193, + AF_BLUE_STRINGSET_THAI = 196, + AF_BLUE_STRINGSET_TFNG = 204, + af_blue_2_1 = 207, #ifdef AF_CONFIG_OPTION_CJK AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0, af_blue_2_1_1 = af_blue_2_1 + 2, diff --git a/src/autofit/afranges.c b/src/autofit/afranges.c index 1ab83f5ed..bfa32da14 100644 --- a/src/autofit/afranges.c +++ b/src/autofit/afranges.c @@ -162,6 +162,18 @@ }; + const AF_Script_UniRangeRec af_cari_uniranges[] = + { + AF_UNIRANGE_REC( 0x102A0, 0x102DF ), /* Carian */ + AF_UNIRANGE_REC( 0, 0 ) + }; + + const AF_Script_UniRangeRec af_cari_nonbase_uniranges[] = + { + AF_UNIRANGE_REC( 0, 0 ) + }; + + const AF_Script_UniRangeRec af_cher_uniranges[] = { AF_UNIRANGE_REC( 0x13A0, 0x13FF ), /* Cherokee */ diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h index 120725d9c..8937494bb 100644 --- a/src/autofit/afscript.h +++ b/src/autofit/afscript.h @@ -67,6 +67,12 @@ HINTING_BOTTOM_TO_TOP, "\xE1\x91\x8C \xE1\x93\x9A" ) /* ᑌ ᓚ */ + SCRIPT( cari, CARI, + "Carian", + HB_SCRIPT_CARIAN, + HINTING_BOTTOM_TO_TOP, + "\xF0\x90\x8A\xAB \xF0\x90\x8B\x89" ) /* 𐊫 𐋉 */ + SCRIPT( cher, CHER, "Cherokee", HB_SCRIPT_CHEROKEE, diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h index 8c81db5de..0671b97fe 100644 --- a/src/autofit/afstyles.h +++ b/src/autofit/afstyles.h @@ -125,6 +125,13 @@ AF_BLUE_STRINGSET_CANADIAN_SYLLABICS, AF_COVERAGE_DEFAULT ) + STYLE( cari_dflt, CARI_DFLT, + "Carian default style", + AF_WRITING_SYSTEM_LATIN, + AF_SCRIPT_CARI, + AF_BLUE_STRINGSET_CARI, + AF_COVERAGE_DEFAULT ) + STYLE( cher_dflt, CHER_DFLT, "Cherokee default style", AF_WRITING_SYSTEM_LATIN,