From d79fc79422fbbb74c59f766dc687e2cb30d9d6a9 Mon Sep 17 00:00:00 2001 From: Sascha Brawer Date: Sat, 8 Apr 2017 07:06:24 +0200 Subject: [PATCH] [autofit] Add support for Deseret script. * src/autofit/afblue.dat: Add blue zone data for Deseret. * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. * src/autofit/afscript.h: Add Deseret standard characters. * src/autofit/afranges.c, src/autofit/afstyles.h: Add Deseret data. --- ChangeLog | 12 ++ src/autofit/afblue.c | 14 +++ src/autofit/afblue.dat | 17 +++ src/autofit/afblue.h | 275 +++++++++++++++++++++-------------------- src/autofit/afranges.c | 12 ++ src/autofit/afscript.h | 6 + src/autofit/afstyles.h | 7 ++ 7 files changed, 208 insertions(+), 135 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ac6b31c9..7d0fb6df5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2017-04-08 Sascha Brawer + Werner Lemberg [autofit] Fix invalid character range description (#50745). diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c index 500a61c00..91ea74161 100644 --- a/src/autofit/afblue.c +++ b/src/autofit/afblue.c @@ -74,6 +74,14 @@ '\0', '\xD1', '\x80', ' ', '\xD1', '\x83', ' ', '\xD1', '\x84', /* ั€ ัƒ ั„ */ '\0', + '\xF0', '\x90', '\x90', '\x82', ' ', '\xF0', '\x90', '\x90', '\x84', ' ', '\xF0', '\x90', '\x90', '\x8B', ' ', '\xF0', '\x90', '\x90', '\x97', ' ', '\xF0', '\x90', '\x90', '\x91', /* ๐‚ ๐„ ๐‹ ๐— ๐‘ */ + '\0', + '\xF0', '\x90', '\x90', '\x80', ' ', '\xF0', '\x90', '\x90', '\x82', ' ', '\xF0', '\x90', '\x90', '\x84', ' ', '\xF0', '\x90', '\x90', '\x97', ' ', '\xF0', '\x90', '\x90', '\x9B', /* ๐€ ๐‚ ๐„ ๐— ๐› */ + '\0', + '\xF0', '\x90', '\x90', '\xAA', ' ', '\xF0', '\x90', '\x90', '\xAC', ' ', '\xF0', '\x90', '\x90', '\xB3', ' ', '\xF0', '\x90', '\x90', '\xBF', ' ', '\xF0', '\x90', '\x90', '\xB9', /* ๐ช ๐ฌ ๐ณ ๐ฟ ๐น */ + '\0', + '\xF0', '\x90', '\x90', '\xA8', ' ', '\xF0', '\x90', '\x90', '\xAA', ' ', '\xF0', '\x90', '\x90', '\xAC', ' ', '\xF0', '\x90', '\x90', '\xBF', ' ', '\xF0', '\x90', '\x91', '\x83', /* ๐จ ๐ช ๐ฌ ๐ฟ ๐‘ƒ */ + '\0', '\xE0', '\xA4', '\x95', ' ', '\xE0', '\xA4', '\xAE', ' ', '\xE0', '\xA4', '\x85', ' ', '\xE0', '\xA4', '\x86', ' ', '\xE0', '\xA4', '\xA5', ' ', '\xE0', '\xA4', '\xA7', ' ', '\xE0', '\xA4', '\xAD', ' ', '\xE0', '\xA4', '\xB6', /* เค• เคฎ เค… เค† เคฅ เคง เคญ เคถ */ '\0', '\xE0', '\xA4', '\x88', ' ', '\xE0', '\xA4', '\x90', ' ', '\xE0', '\xA4', '\x93', ' ', '\xE0', '\xA4', '\x94', ' ', '\xE0', '\xA4', '\xBF', ' ', '\xE0', '\xA5', '\x80', ' ', '\xE0', '\xA5', '\x8B', ' ', '\xE0', '\xA5', '\x8C', /* เคˆ เค เค“ เค” เคฟ เฅ€ เฅ‹ เฅŒ */ @@ -381,6 +389,12 @@ { AF_BLUE_STRING_DEVANAGARI_BASE, 0 }, { AF_BLUE_STRING_DEVANAGARI_BOTTOM, 0 }, { AF_BLUE_STRING_MAX, 0 }, + { AF_BLUE_STRING_DESERET_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, + { AF_BLUE_STRING_DESERET_CAPITAL_BOTTOM, 0 }, + { AF_BLUE_STRING_DESERET_SMALL_TOP, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT }, + { AF_BLUE_STRING_DESERET_SMALL_BOTTOM, 0 }, + { AF_BLUE_STRING_MAX, 0 }, { AF_BLUE_STRING_ETHIOPIC_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, { AF_BLUE_STRING_ETHIOPIC_BOTTOM, 0 }, { AF_BLUE_STRING_MAX, 0 }, diff --git a/src/autofit/afblue.dat b/src/autofit/afblue.dat index df4d3efa0..58eaa2664 100644 --- a/src/autofit/afblue.dat +++ b/src/autofit/afblue.dat @@ -133,6 +133,15 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN: AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER "ั€ ัƒ ั„" + AF_BLUE_STRING_DESERET_CAPITAL_TOP + "๐‚ ๐„ ๐‹ ๐— ๐‘" + AF_BLUE_STRING_DESERET_CAPITAL_BOTTOM + "๐€ ๐‚ ๐„ ๐— ๐›" + AF_BLUE_STRING_DESERET_SMALL_TOP + "๐ช ๐ฌ ๐ณ ๐ฟ ๐น" + AF_BLUE_STRING_DESERET_SMALL_BOTTOM + "๐จ ๐ช ๐ฌ ๐ฟ ๐‘ƒ" + AF_BLUE_STRING_DEVANAGARI_BASE "เค• เคฎ เค… เค† เคฅ เคง เคญ เคถ" AF_BLUE_STRING_DEVANAGARI_TOP @@ -605,6 +614,14 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN: { AF_BLUE_STRING_DEVANAGARI_BOTTOM, 0 } { AF_BLUE_STRING_MAX, 0 } + AF_BLUE_STRINGSET_DSRT + { AF_BLUE_STRING_DESERET_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP } + { AF_BLUE_STRING_DESERET_CAPITAL_BOTTOM, 0 } + { AF_BLUE_STRING_DESERET_SMALL_TOP, AF_BLUE_PROPERTY_LATIN_TOP | + AF_BLUE_PROPERTY_LATIN_X_HEIGHT } + { AF_BLUE_STRING_DESERET_SMALL_BOTTOM, 0 } + { AF_BLUE_STRING_MAX, 0 } + AF_BLUE_STRINGSET_ETHI { AF_BLUE_STRING_ETHIOPIC_TOP, AF_BLUE_PROPERTY_LATIN_TOP } { AF_BLUE_STRING_ETHIOPIC_BOTTOM, 0 } diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h index 2be2481c6..3847137cc 100644 --- a/src/autofit/afblue.h +++ b/src/autofit/afblue.h @@ -101,112 +101,116 @@ FT_BEGIN_HEADER AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 510, AF_BLUE_STRING_CYRILLIC_SMALL = 534, AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 558, - AF_BLUE_STRING_DEVANAGARI_BASE = 567, - AF_BLUE_STRING_DEVANAGARI_TOP = 599, - AF_BLUE_STRING_DEVANAGARI_HEAD = 631, - AF_BLUE_STRING_DEVANAGARI_BOTTOM = 663, - AF_BLUE_STRING_ETHIOPIC_TOP = 671, - AF_BLUE_STRING_ETHIOPIC_BOTTOM = 703, - AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP = 735, - AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM = 767, - AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER = 799, - AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER = 831, - AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP = 863, - AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM = 895, - AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP = 927, - AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 959, - AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 991, - AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 1023, - AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1055, - AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 1087, - AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 1119, - AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 1151, - AF_BLUE_STRING_GREEK_CAPITAL_TOP = 1183, - AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 1204, - AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 1222, - AF_BLUE_STRING_GREEK_SMALL = 1240, - AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 1264, - AF_BLUE_STRING_GUJARATI_TOP = 1288, - AF_BLUE_STRING_GUJARATI_BOTTOM = 1320, - AF_BLUE_STRING_GUJARATI_ASCENDER = 1352, - AF_BLUE_STRING_GUJARATI_DESCENDER = 1402, - AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 1435, - AF_BLUE_STRING_GURMUKHI_BASE = 1455, - AF_BLUE_STRING_GURMUKHI_HEAD = 1487, - AF_BLUE_STRING_GURMUKHI_TOP = 1519, - AF_BLUE_STRING_GURMUKHI_BOTTOM = 1551, - AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 1583, - AF_BLUE_STRING_HEBREW_TOP = 1603, - AF_BLUE_STRING_HEBREW_BOTTOM = 1627, - AF_BLUE_STRING_HEBREW_DESCENDER = 1645, - AF_BLUE_STRING_KANNADA_TOP = 1660, - AF_BLUE_STRING_KANNADA_BOTTOM = 1704, - AF_BLUE_STRING_KHMER_TOP = 1736, - AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 1760, - AF_BLUE_STRING_KHMER_BOTTOM = 1800, - AF_BLUE_STRING_KHMER_DESCENDER = 1832, - AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 1866, - AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 1953, - AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 1961, - AF_BLUE_STRING_LAO_TOP = 1969, - AF_BLUE_STRING_LAO_BOTTOM = 2001, - AF_BLUE_STRING_LAO_ASCENDER = 2033, - AF_BLUE_STRING_LAO_LARGE_ASCENDER = 2049, - AF_BLUE_STRING_LAO_DESCENDER = 2061, - AF_BLUE_STRING_LATIN_CAPITAL_TOP = 2085, - AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 2101, - AF_BLUE_STRING_LATIN_SMALL_F_TOP = 2117, - AF_BLUE_STRING_LATIN_SMALL_TOP = 2131, - AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 2147, - AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 2163, - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 2173, - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 2193, - AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 2213, - AF_BLUE_STRING_LATIN_SUBS_SMALL = 2233, - AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 2269, - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 2289, - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 2320, - AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 2349, - AF_BLUE_STRING_LATIN_SUPS_SMALL = 2375, - AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 2400, - AF_BLUE_STRING_LISU_TOP = 2411, - AF_BLUE_STRING_LISU_BOTTOM = 2443, - AF_BLUE_STRING_MALAYALAM_TOP = 2475, - AF_BLUE_STRING_MALAYALAM_BOTTOM = 2519, - AF_BLUE_STRING_MYANMAR_TOP = 2551, - AF_BLUE_STRING_MYANMAR_BOTTOM = 2583, - AF_BLUE_STRING_MYANMAR_ASCENDER = 2615, - AF_BLUE_STRING_MYANMAR_DESCENDER = 2643, - AF_BLUE_STRING_NKO_TOP = 2675, - AF_BLUE_STRING_NKO_BOTTOM = 2699, - AF_BLUE_STRING_NKO_SMALL_TOP = 2714, - AF_BLUE_STRING_NKO_SMALL_BOTTOM = 2723, - AF_BLUE_STRING_OL_CHIKI = 2735, - AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 2759, - AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 2799, - AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 2829, - AF_BLUE_STRING_OSAGE_SMALL_TOP = 2844, - AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 2884, - AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 2924, - AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 2949, - AF_BLUE_STRING_SINHALA_TOP = 2964, - AF_BLUE_STRING_SINHALA_BOTTOM = 2996, - AF_BLUE_STRING_SINHALA_DESCENDER = 3028, - AF_BLUE_STRING_TAI_VIET_TOP = 3072, - AF_BLUE_STRING_TAI_VIET_BOTTOM = 3092, - AF_BLUE_STRING_TAMIL_TOP = 3104, - AF_BLUE_STRING_TAMIL_BOTTOM = 3136, - AF_BLUE_STRING_TELUGU_TOP = 3168, - AF_BLUE_STRING_TELUGU_BOTTOM = 3196, - AF_BLUE_STRING_THAI_TOP = 3224, - AF_BLUE_STRING_THAI_BOTTOM = 3248, - AF_BLUE_STRING_THAI_ASCENDER = 3276, - AF_BLUE_STRING_THAI_LARGE_ASCENDER = 3288, - AF_BLUE_STRING_THAI_DESCENDER = 3300, - AF_BLUE_STRING_THAI_LARGE_DESCENDER = 3316, - AF_BLUE_STRING_THAI_DIGIT_TOP = 3324, - AF_BLUE_STRING_TIFINAGH = 3336, - af_blue_1_1 = 3367, + AF_BLUE_STRING_DESERET_CAPITAL_TOP = 567, + AF_BLUE_STRING_DESERET_CAPITAL_BOTTOM = 592, + AF_BLUE_STRING_DESERET_SMALL_TOP = 617, + AF_BLUE_STRING_DESERET_SMALL_BOTTOM = 642, + AF_BLUE_STRING_DEVANAGARI_BASE = 667, + AF_BLUE_STRING_DEVANAGARI_TOP = 699, + AF_BLUE_STRING_DEVANAGARI_HEAD = 731, + AF_BLUE_STRING_DEVANAGARI_BOTTOM = 763, + AF_BLUE_STRING_ETHIOPIC_TOP = 771, + AF_BLUE_STRING_ETHIOPIC_BOTTOM = 803, + AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP = 835, + AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM = 867, + AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER = 899, + AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER = 931, + AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP = 963, + AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM = 995, + AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP = 1027, + AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 1059, + AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 1091, + AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 1123, + AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1155, + AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 1187, + AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 1219, + AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 1251, + AF_BLUE_STRING_GREEK_CAPITAL_TOP = 1283, + AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 1304, + AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 1322, + AF_BLUE_STRING_GREEK_SMALL = 1340, + AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 1364, + AF_BLUE_STRING_GUJARATI_TOP = 1388, + AF_BLUE_STRING_GUJARATI_BOTTOM = 1420, + AF_BLUE_STRING_GUJARATI_ASCENDER = 1452, + AF_BLUE_STRING_GUJARATI_DESCENDER = 1502, + AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 1535, + AF_BLUE_STRING_GURMUKHI_BASE = 1555, + AF_BLUE_STRING_GURMUKHI_HEAD = 1587, + AF_BLUE_STRING_GURMUKHI_TOP = 1619, + AF_BLUE_STRING_GURMUKHI_BOTTOM = 1651, + AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 1683, + AF_BLUE_STRING_HEBREW_TOP = 1703, + AF_BLUE_STRING_HEBREW_BOTTOM = 1727, + AF_BLUE_STRING_HEBREW_DESCENDER = 1745, + AF_BLUE_STRING_KANNADA_TOP = 1760, + AF_BLUE_STRING_KANNADA_BOTTOM = 1804, + AF_BLUE_STRING_KHMER_TOP = 1836, + AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 1860, + AF_BLUE_STRING_KHMER_BOTTOM = 1900, + AF_BLUE_STRING_KHMER_DESCENDER = 1932, + AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 1966, + AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 2053, + AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 2061, + AF_BLUE_STRING_LAO_TOP = 2069, + AF_BLUE_STRING_LAO_BOTTOM = 2101, + AF_BLUE_STRING_LAO_ASCENDER = 2133, + AF_BLUE_STRING_LAO_LARGE_ASCENDER = 2149, + AF_BLUE_STRING_LAO_DESCENDER = 2161, + AF_BLUE_STRING_LATIN_CAPITAL_TOP = 2185, + AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 2201, + AF_BLUE_STRING_LATIN_SMALL_F_TOP = 2217, + AF_BLUE_STRING_LATIN_SMALL_TOP = 2231, + AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 2247, + AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 2263, + AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 2273, + AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 2293, + AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 2313, + AF_BLUE_STRING_LATIN_SUBS_SMALL = 2333, + AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 2369, + AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 2389, + AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 2420, + AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 2449, + AF_BLUE_STRING_LATIN_SUPS_SMALL = 2475, + AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 2500, + AF_BLUE_STRING_LISU_TOP = 2511, + AF_BLUE_STRING_LISU_BOTTOM = 2543, + AF_BLUE_STRING_MALAYALAM_TOP = 2575, + AF_BLUE_STRING_MALAYALAM_BOTTOM = 2619, + AF_BLUE_STRING_MYANMAR_TOP = 2651, + AF_BLUE_STRING_MYANMAR_BOTTOM = 2683, + AF_BLUE_STRING_MYANMAR_ASCENDER = 2715, + AF_BLUE_STRING_MYANMAR_DESCENDER = 2743, + AF_BLUE_STRING_NKO_TOP = 2775, + AF_BLUE_STRING_NKO_BOTTOM = 2799, + AF_BLUE_STRING_NKO_SMALL_TOP = 2814, + AF_BLUE_STRING_NKO_SMALL_BOTTOM = 2823, + AF_BLUE_STRING_OL_CHIKI = 2835, + AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 2859, + AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 2899, + AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 2929, + AF_BLUE_STRING_OSAGE_SMALL_TOP = 2944, + AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 2984, + AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 3024, + AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 3049, + AF_BLUE_STRING_SINHALA_TOP = 3064, + AF_BLUE_STRING_SINHALA_BOTTOM = 3096, + AF_BLUE_STRING_SINHALA_DESCENDER = 3128, + AF_BLUE_STRING_TAI_VIET_TOP = 3172, + AF_BLUE_STRING_TAI_VIET_BOTTOM = 3192, + AF_BLUE_STRING_TAMIL_TOP = 3204, + AF_BLUE_STRING_TAMIL_BOTTOM = 3236, + AF_BLUE_STRING_TELUGU_TOP = 3268, + AF_BLUE_STRING_TELUGU_BOTTOM = 3296, + AF_BLUE_STRING_THAI_TOP = 3324, + AF_BLUE_STRING_THAI_BOTTOM = 3348, + AF_BLUE_STRING_THAI_ASCENDER = 3376, + AF_BLUE_STRING_THAI_LARGE_ASCENDER = 3388, + AF_BLUE_STRING_THAI_DESCENDER = 3400, + AF_BLUE_STRING_THAI_LARGE_DESCENDER = 3416, + AF_BLUE_STRING_THAI_DIGIT_TOP = 3424, + AF_BLUE_STRING_TIFINAGH = 3436, + af_blue_1_1 = 3467, #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, @@ -272,35 +276,36 @@ FT_BEGIN_HEADER AF_BLUE_STRINGSET_CHER = 21, AF_BLUE_STRINGSET_CYRL = 28, AF_BLUE_STRINGSET_DEVA = 34, - AF_BLUE_STRINGSET_ETHI = 40, - AF_BLUE_STRINGSET_GEOR = 43, - AF_BLUE_STRINGSET_GEOK = 48, - AF_BLUE_STRINGSET_GLAG = 55, - AF_BLUE_STRINGSET_GREK = 60, - AF_BLUE_STRINGSET_GUJR = 67, - AF_BLUE_STRINGSET_GURU = 73, - AF_BLUE_STRINGSET_HEBR = 79, - AF_BLUE_STRINGSET_KNDA = 83, - AF_BLUE_STRINGSET_KHMR = 86, - AF_BLUE_STRINGSET_KHMS = 92, - AF_BLUE_STRINGSET_LAO = 95, - AF_BLUE_STRINGSET_LATN = 101, - AF_BLUE_STRINGSET_LATB = 108, - AF_BLUE_STRINGSET_LATP = 115, - AF_BLUE_STRINGSET_LISU = 122, - AF_BLUE_STRINGSET_MLYM = 125, - AF_BLUE_STRINGSET_MYMR = 128, - AF_BLUE_STRINGSET_NKOO = 133, - AF_BLUE_STRINGSET_NONE = 138, - AF_BLUE_STRINGSET_OLCK = 139, - AF_BLUE_STRINGSET_OSGE = 142, - AF_BLUE_STRINGSET_SINH = 150, - AF_BLUE_STRINGSET_TAML = 154, - AF_BLUE_STRINGSET_TAVT = 157, - AF_BLUE_STRINGSET_TELU = 160, - AF_BLUE_STRINGSET_THAI = 163, - AF_BLUE_STRINGSET_TFNG = 171, - af_blue_2_1 = 174, + AF_BLUE_STRINGSET_DSRT = 40, + AF_BLUE_STRINGSET_ETHI = 45, + AF_BLUE_STRINGSET_GEOR = 48, + AF_BLUE_STRINGSET_GEOK = 53, + AF_BLUE_STRINGSET_GLAG = 60, + AF_BLUE_STRINGSET_GREK = 65, + AF_BLUE_STRINGSET_GUJR = 72, + AF_BLUE_STRINGSET_GURU = 78, + AF_BLUE_STRINGSET_HEBR = 84, + AF_BLUE_STRINGSET_KNDA = 88, + AF_BLUE_STRINGSET_KHMR = 91, + AF_BLUE_STRINGSET_KHMS = 97, + AF_BLUE_STRINGSET_LAO = 100, + AF_BLUE_STRINGSET_LATN = 106, + AF_BLUE_STRINGSET_LATB = 113, + AF_BLUE_STRINGSET_LATP = 120, + AF_BLUE_STRINGSET_LISU = 127, + AF_BLUE_STRINGSET_MLYM = 130, + AF_BLUE_STRINGSET_MYMR = 133, + AF_BLUE_STRINGSET_NKOO = 138, + AF_BLUE_STRINGSET_NONE = 143, + AF_BLUE_STRINGSET_OLCK = 144, + AF_BLUE_STRINGSET_OSGE = 147, + AF_BLUE_STRINGSET_SINH = 155, + AF_BLUE_STRINGSET_TAML = 159, + AF_BLUE_STRINGSET_TAVT = 162, + AF_BLUE_STRINGSET_TELU = 165, + AF_BLUE_STRINGSET_THAI = 168, + AF_BLUE_STRINGSET_TFNG = 176, + af_blue_2_1 = 179, #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 9c94421c5..1431bc6b1 100644 --- a/src/autofit/afranges.c +++ b/src/autofit/afranges.c @@ -200,6 +200,18 @@ }; + const AF_Script_UniRangeRec af_dsrt_uniranges[] = + { + AF_UNIRANGE_REC( 0x10400, 0x1044F ), /* Deseret */ + AF_UNIRANGE_REC( 0, 0 ) + }; + + const AF_Script_UniRangeRec af_dsrt_nonbase_uniranges[] = + { + AF_UNIRANGE_REC( 0, 0 ) + }; + + const AF_Script_UniRangeRec af_ethi_uniranges[] = { AF_UNIRANGE_REC( 0x1200, 0x137F ), /* Ethiopic */ diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h index e67dd574a..7de40502a 100644 --- a/src/autofit/afscript.h +++ b/src/autofit/afscript.h @@ -73,6 +73,12 @@ HINTING_TOP_TO_BOTTOM, "\xE0\xA4\xA0 \xE0\xA4\xB5 \xE0\xA4\x9F" ) /* เค  เคต เคŸ */ + SCRIPT( dsrt, DSRT, + "Deseret", + HB_SCRIPT_DESERET, + HINTING_BOTTOM_TO_TOP, + "\xF0\x90\x90\x84 \xF0\x90\x90\xAC") /* ๐„ ๐ฌ */ + SCRIPT( ethi, ETHI, "Ethiopic", HB_SCRIPT_ETHIOPIC, diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h index 606f18fa2..dc7928374 100644 --- a/src/autofit/afstyles.h +++ b/src/autofit/afstyles.h @@ -127,6 +127,13 @@ AF_BLUE_STRINGSET_DEVA, AF_COVERAGE_DEFAULT ) + STYLE( dsrt_dflt, DSRT_DFLT, + "Deseret default style", + AF_WRITING_SYSTEM_LATIN, + AF_SCRIPT_DSRT, + AF_BLUE_STRINGSET_DSRT, + AF_COVERAGE_DEFAULT ) + STYLE( ethi_dflt, ETHI_DFLT, "Ethiopic default style", AF_WRITING_SYSTEM_LATIN,