[autofit] Add support for Cherokee script.

* src/autofit/afblue.dat: Add blue zone data for Cherokee.

* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.

* src/autofit/afscript.h: Add Cherokee standard characters.

* src/autofit/afranges.c: Add Cherokee data.

* src/autofit/afstyles.h: Add Cherokee data.

7 files changed, 192 insertions, 112 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b2afe8a2..039e370c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2016-06-13  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Add support for Cherokee script.
+
+	* src/autofit/afblue.dat: Add blue zone data for Cherokee.
+
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/afscript.h: Add Cherokee standard characters.
+
+	* src/autofit/afranges.c: Add Cherokee data.
+
+	* src/autofit/afstyles.h: Add Cherokee data.
+
 2016-06-09  David Capello  <davidcapello@gmail.com>
 
 	[cmake] Avoid modifying `ftconfig.h' and `ftoption.h' files.
diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c
index d7d1121db..95786ed6f 100644
--- a/src/autofit/afblue.c
+++ b/src/autofit/afblue.c
@@ -50,6 +50,14 @@
     '\0',
     '\xE0', '\xA6', '\x93', ' ', '\xE0', '\xA6', '\x8F', ' ', '\xE0', '\xA6', '\xA1', ' ', '\xE0', '\xA6', '\xA4', ' ', '\xE0', '\xA6', '\xA8', ' ', '\xE0', '\xA6', '\xAC', ' ', '\xE0', '\xA6', '\xB2', ' ', '\xE0', '\xA6', '\x95',  /* ও এ ড ত ন ব ল ক */
     '\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',  /* ꮒ ꮤ ꮶ ꭴ ꭾ ꮗ ꮝ ꮿ */
+    '\0',
+    '\xEA', '\xAE', '\x96', ' ', '\xEA', '\xAD', '\xBC', ' ', '\xEA', '\xAE', '\x93', ' ', '\xEA', '\xAE', '\xA0', ' ', '\xEA', '\xAE', '\xB3', ' ', '\xEA', '\xAD', '\xB6', ' ', '\xEA', '\xAE', '\xA5', ' ', '\xEA', '\xAE', '\xBB',  /* ꮖ ꭼ ꮓ ꮠ ꮳ ꭶ ꮥ ꮻ */
+    '\0',
+    '\xE1', '\x8F', '\xB8', ' ', '\xEA', '\xAE', '\x90', ' ', '\xEA', '\xAD', '\xB9', ' ', '\xEA', '\xAD', '\xBB',  /* ᏸ ꮐ ꭹ ꭻ */
+    '\0',
     '\xD0', '\x91', ' ', '\xD0', '\x92', ' ', '\xD0', '\x95', ' ', '\xD0', '\x9F', ' ', '\xD0', '\x97', ' ', '\xD0', '\x9E', ' ', '\xD0', '\xA1', ' ', '\xD0', '\xAD',  /* Б В Е П З О С Э */
     '\0',
     '\xD0', '\x91', ' ', '\xD0', '\x92', ' ', '\xD0', '\x95', ' ', '\xD0', '\xA8', ' ', '\xD0', '\x97', ' ', '\xD0', '\x9E', ' ', '\xD0', '\xA1', ' ', '\xD0', '\xAD',  /* Б В Е Ш З О С Э */
@@ -292,6 +300,14 @@
                                    AF_BLUE_PROPERTY_LATIN_X_HEIGHT   },
     { AF_BLUE_STRING_BENGALI_BASE, 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        },
+    { AF_BLUE_STRING_CHEROKEE_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                               AF_BLUE_PROPERTY_LATIN_X_HEIGHT   },
+    { AF_BLUE_STRING_CHEROKEE_SMALL,           0                                 },
+    { AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER, 0                                 },
+    { AF_BLUE_STRING_MAX,                      0                                 },
     { AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        },
     { AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM,  0                                 },
     { AF_BLUE_STRING_CYRILLIC_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
diff --git a/src/autofit/afblue.dat b/src/autofit/afblue.dat
index ff27b464a..0734ec71f 100644
--- a/src/autofit/afblue.dat
+++ b/src/autofit/afblue.dat
@@ -106,6 +106,15 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN:
   AF_BLUE_STRING_BENGALI_HEAD
     "ও এ ড ত ন ব ল ক"
 
+  AF_BLUE_STRING_CHEROKEE_CAPITAL
+    "Ꮖ Ꮋ Ꭼ Ꮓ Ꭴ Ꮳ Ꭶ Ꮥ"
+  AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER
+    "ꮒ ꮤ ꮶ ꭴ ꭾ ꮗ ꮝ ꮿ"
+  AF_BLUE_STRING_CHEROKEE_SMALL
+    "ꮖ ꭼ ꮓ ꮠ ꮳ ꭶ ꮥ ꮻ"
+  AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER
+    "ᏸ ꮐ ꭹ ꭻ"
+
   AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP
     "Б В Е П З О С Э"
   AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM
@@ -499,6 +508,16 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN:
     { AF_BLUE_STRING_BENGALI_BASE, 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                                 }
+    { AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER,  AF_BLUE_PROPERTY_LATIN_TOP        }
+    { AF_BLUE_STRING_CHEROKEE_SMALL,           AF_BLUE_PROPERTY_LATIN_TOP      |
+                                               AF_BLUE_PROPERTY_LATIN_X_HEIGHT   }
+    { AF_BLUE_STRING_CHEROKEE_SMALL,           0                                 }
+    { AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER, 0                                 }
+    { AF_BLUE_STRING_MAX,                      0                                 }
+
   AF_BLUE_STRINGSET_CYRL
     { AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP,     AF_BLUE_PROPERTY_LATIN_TOP        }
     { AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM,  0                                 }
diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h
index 8f5eb73ec..41f838e45 100644
--- a/src/autofit/afblue.h
+++ b/src/autofit/afblue.h
@@ -89,94 +89,98 @@ FT_BEGIN_HEADER
     AF_BLUE_STRING_BENGALI_BASE = 180,
     AF_BLUE_STRING_BENGALI_TOP = 212,
     AF_BLUE_STRING_BENGALI_HEAD = 240,
-    AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 272,
-    AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 296,
-    AF_BLUE_STRING_CYRILLIC_SMALL = 320,
-    AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 344,
-    AF_BLUE_STRING_DEVANAGARI_BASE = 353,
-    AF_BLUE_STRING_DEVANAGARI_TOP = 385,
-    AF_BLUE_STRING_DEVANAGARI_HEAD = 417,
-    AF_BLUE_STRING_DEVANAGARI_BOTTOM = 449,
-    AF_BLUE_STRING_ETHIOPIC_TOP = 457,
-    AF_BLUE_STRING_ETHIOPIC_BOTTOM = 489,
-    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP = 521,
-    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM = 553,
-    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER = 585,
-    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER = 617,
-    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP = 649,
-    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM = 681,
-    AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP = 713,
-    AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 745,
-    AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 777,
-    AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 809,
-    AF_BLUE_STRING_GREEK_CAPITAL_TOP = 841,
-    AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 862,
-    AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 880,
-    AF_BLUE_STRING_GREEK_SMALL = 898,
-    AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 922,
-    AF_BLUE_STRING_GUJARATI_TOP = 946,
-    AF_BLUE_STRING_GUJARATI_BOTTOM = 978,
-    AF_BLUE_STRING_GUJARATI_ASCENDER = 1010,
-    AF_BLUE_STRING_GUJARATI_DESCENDER = 1060,
-    AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 1093,
-    AF_BLUE_STRING_GURMUKHI_BASE = 1113,
-    AF_BLUE_STRING_GURMUKHI_HEAD = 1145,
-    AF_BLUE_STRING_GURMUKHI_TOP = 1177,
-    AF_BLUE_STRING_GURMUKHI_BOTTOM = 1209,
-    AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 1241,
-    AF_BLUE_STRING_HEBREW_TOP = 1261,
-    AF_BLUE_STRING_HEBREW_BOTTOM = 1285,
-    AF_BLUE_STRING_HEBREW_DESCENDER = 1303,
-    AF_BLUE_STRING_KANNADA_TOP = 1318,
-    AF_BLUE_STRING_KANNADA_BOTTOM = 1362,
-    AF_BLUE_STRING_KHMER_TOP = 1394,
-    AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 1418,
-    AF_BLUE_STRING_KHMER_BOTTOM = 1458,
-    AF_BLUE_STRING_KHMER_DESCENDER = 1490,
-    AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 1524,
-    AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 1611,
-    AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 1619,
-    AF_BLUE_STRING_LAO_TOP = 1627,
-    AF_BLUE_STRING_LAO_BOTTOM = 1659,
-    AF_BLUE_STRING_LAO_ASCENDER = 1691,
-    AF_BLUE_STRING_LAO_LARGE_ASCENDER = 1707,
-    AF_BLUE_STRING_LAO_DESCENDER = 1719,
-    AF_BLUE_STRING_LATIN_CAPITAL_TOP = 1743,
-    AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 1759,
-    AF_BLUE_STRING_LATIN_SMALL_F_TOP = 1775,
-    AF_BLUE_STRING_LATIN_SMALL = 1789,
-    AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 1803,
-    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 1813,
-    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 1833,
-    AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 1853,
-    AF_BLUE_STRING_LATIN_SUBS_SMALL = 1873,
-    AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 1909,
-    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 1929,
-    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 1960,
-    AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 1989,
-    AF_BLUE_STRING_LATIN_SUPS_SMALL = 2015,
-    AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 2040,
-    AF_BLUE_STRING_MALAYALAM_TOP = 2051,
-    AF_BLUE_STRING_MALAYALAM_BOTTOM = 2095,
-    AF_BLUE_STRING_MYANMAR_TOP = 2127,
-    AF_BLUE_STRING_MYANMAR_BOTTOM = 2159,
-    AF_BLUE_STRING_MYANMAR_ASCENDER = 2191,
-    AF_BLUE_STRING_MYANMAR_DESCENDER = 2219,
-    AF_BLUE_STRING_SINHALA_TOP = 2251,
-    AF_BLUE_STRING_SINHALA_BOTTOM = 2283,
-    AF_BLUE_STRING_SINHALA_DESCENDER = 2315,
-    AF_BLUE_STRING_TAMIL_TOP = 2359,
-    AF_BLUE_STRING_TAMIL_BOTTOM = 2391,
-    AF_BLUE_STRING_TELUGU_TOP = 2423,
-    AF_BLUE_STRING_TELUGU_BOTTOM = 2451,
-    AF_BLUE_STRING_THAI_TOP = 2479,
-    AF_BLUE_STRING_THAI_BOTTOM = 2503,
-    AF_BLUE_STRING_THAI_ASCENDER = 2531,
-    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 2543,
-    AF_BLUE_STRING_THAI_DESCENDER = 2555,
-    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 2571,
-    AF_BLUE_STRING_THAI_DIGIT_TOP = 2579,
-    af_blue_1_1 = 2590,
+    AF_BLUE_STRING_CHEROKEE_CAPITAL = 272,
+    AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER = 304,
+    AF_BLUE_STRING_CHEROKEE_SMALL = 336,
+    AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER = 368,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 384,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 408,
+    AF_BLUE_STRING_CYRILLIC_SMALL = 432,
+    AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 456,
+    AF_BLUE_STRING_DEVANAGARI_BASE = 465,
+    AF_BLUE_STRING_DEVANAGARI_TOP = 497,
+    AF_BLUE_STRING_DEVANAGARI_HEAD = 529,
+    AF_BLUE_STRING_DEVANAGARI_BOTTOM = 561,
+    AF_BLUE_STRING_ETHIOPIC_TOP = 569,
+    AF_BLUE_STRING_ETHIOPIC_BOTTOM = 601,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP = 633,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM = 665,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER = 697,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER = 729,
+    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP = 761,
+    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM = 793,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP = 825,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 857,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 889,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 921,
+    AF_BLUE_STRING_GREEK_CAPITAL_TOP = 953,
+    AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 974,
+    AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 992,
+    AF_BLUE_STRING_GREEK_SMALL = 1010,
+    AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 1034,
+    AF_BLUE_STRING_GUJARATI_TOP = 1058,
+    AF_BLUE_STRING_GUJARATI_BOTTOM = 1090,
+    AF_BLUE_STRING_GUJARATI_ASCENDER = 1122,
+    AF_BLUE_STRING_GUJARATI_DESCENDER = 1172,
+    AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 1205,
+    AF_BLUE_STRING_GURMUKHI_BASE = 1225,
+    AF_BLUE_STRING_GURMUKHI_HEAD = 1257,
+    AF_BLUE_STRING_GURMUKHI_TOP = 1289,
+    AF_BLUE_STRING_GURMUKHI_BOTTOM = 1321,
+    AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 1353,
+    AF_BLUE_STRING_HEBREW_TOP = 1373,
+    AF_BLUE_STRING_HEBREW_BOTTOM = 1397,
+    AF_BLUE_STRING_HEBREW_DESCENDER = 1415,
+    AF_BLUE_STRING_KANNADA_TOP = 1430,
+    AF_BLUE_STRING_KANNADA_BOTTOM = 1474,
+    AF_BLUE_STRING_KHMER_TOP = 1506,
+    AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 1530,
+    AF_BLUE_STRING_KHMER_BOTTOM = 1570,
+    AF_BLUE_STRING_KHMER_DESCENDER = 1602,
+    AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 1636,
+    AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 1723,
+    AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 1731,
+    AF_BLUE_STRING_LAO_TOP = 1739,
+    AF_BLUE_STRING_LAO_BOTTOM = 1771,
+    AF_BLUE_STRING_LAO_ASCENDER = 1803,
+    AF_BLUE_STRING_LAO_LARGE_ASCENDER = 1819,
+    AF_BLUE_STRING_LAO_DESCENDER = 1831,
+    AF_BLUE_STRING_LATIN_CAPITAL_TOP = 1855,
+    AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 1871,
+    AF_BLUE_STRING_LATIN_SMALL_F_TOP = 1887,
+    AF_BLUE_STRING_LATIN_SMALL = 1901,
+    AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 1915,
+    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 1925,
+    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 1945,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 1965,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL = 1985,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 2021,
+    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 2041,
+    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 2072,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 2101,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL = 2127,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 2152,
+    AF_BLUE_STRING_MALAYALAM_TOP = 2163,
+    AF_BLUE_STRING_MALAYALAM_BOTTOM = 2207,
+    AF_BLUE_STRING_MYANMAR_TOP = 2239,
+    AF_BLUE_STRING_MYANMAR_BOTTOM = 2271,
+    AF_BLUE_STRING_MYANMAR_ASCENDER = 2303,
+    AF_BLUE_STRING_MYANMAR_DESCENDER = 2331,
+    AF_BLUE_STRING_SINHALA_TOP = 2363,
+    AF_BLUE_STRING_SINHALA_BOTTOM = 2395,
+    AF_BLUE_STRING_SINHALA_DESCENDER = 2427,
+    AF_BLUE_STRING_TAMIL_TOP = 2471,
+    AF_BLUE_STRING_TAMIL_BOTTOM = 2503,
+    AF_BLUE_STRING_TELUGU_TOP = 2535,
+    AF_BLUE_STRING_TELUGU_BOTTOM = 2563,
+    AF_BLUE_STRING_THAI_TOP = 2591,
+    AF_BLUE_STRING_THAI_BOTTOM = 2615,
+    AF_BLUE_STRING_THAI_ASCENDER = 2643,
+    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 2655,
+    AF_BLUE_STRING_THAI_DESCENDER = 2667,
+    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 2683,
+    AF_BLUE_STRING_THAI_DIGIT_TOP = 2691,
+    af_blue_1_1 = 2702,
 #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,
@@ -238,30 +242,31 @@ FT_BEGIN_HEADER
     AF_BLUE_STRINGSET_ARAB = 0,
     AF_BLUE_STRINGSET_ARMN = 4,
     AF_BLUE_STRINGSET_BENG = 11,
-    AF_BLUE_STRINGSET_CYRL = 16,
-    AF_BLUE_STRINGSET_DEVA = 22,
-    AF_BLUE_STRINGSET_ETHI = 28,
-    AF_BLUE_STRINGSET_GEOR = 31,
-    AF_BLUE_STRINGSET_GEOK = 36,
-    AF_BLUE_STRINGSET_GREK = 43,
-    AF_BLUE_STRINGSET_GUJR = 50,
-    AF_BLUE_STRINGSET_GURU = 56,
-    AF_BLUE_STRINGSET_HEBR = 62,
-    AF_BLUE_STRINGSET_KNDA = 66,
-    AF_BLUE_STRINGSET_KHMR = 69,
-    AF_BLUE_STRINGSET_KHMS = 75,
-    AF_BLUE_STRINGSET_LAO = 78,
-    AF_BLUE_STRINGSET_LATN = 84,
-    AF_BLUE_STRINGSET_LATB = 91,
-    AF_BLUE_STRINGSET_LATP = 98,
-    AF_BLUE_STRINGSET_MLYM = 105,
-    AF_BLUE_STRINGSET_MYMR = 108,
-    AF_BLUE_STRINGSET_NONE = 113,
-    AF_BLUE_STRINGSET_SINH = 114,
-    AF_BLUE_STRINGSET_TAML = 118,
-    AF_BLUE_STRINGSET_TELU = 121,
-    AF_BLUE_STRINGSET_THAI = 124,
-    af_blue_2_1 = 132,
+    AF_BLUE_STRINGSET_CHER = 16,
+    AF_BLUE_STRINGSET_CYRL = 23,
+    AF_BLUE_STRINGSET_DEVA = 29,
+    AF_BLUE_STRINGSET_ETHI = 35,
+    AF_BLUE_STRINGSET_GEOR = 38,
+    AF_BLUE_STRINGSET_GEOK = 43,
+    AF_BLUE_STRINGSET_GREK = 50,
+    AF_BLUE_STRINGSET_GUJR = 57,
+    AF_BLUE_STRINGSET_GURU = 63,
+    AF_BLUE_STRINGSET_HEBR = 69,
+    AF_BLUE_STRINGSET_KNDA = 73,
+    AF_BLUE_STRINGSET_KHMR = 76,
+    AF_BLUE_STRINGSET_KHMS = 82,
+    AF_BLUE_STRINGSET_LAO = 85,
+    AF_BLUE_STRINGSET_LATN = 91,
+    AF_BLUE_STRINGSET_LATB = 98,
+    AF_BLUE_STRINGSET_LATP = 105,
+    AF_BLUE_STRINGSET_MLYM = 112,
+    AF_BLUE_STRINGSET_MYMR = 115,
+    AF_BLUE_STRINGSET_NONE = 120,
+    AF_BLUE_STRINGSET_SINH = 121,
+    AF_BLUE_STRINGSET_TAML = 125,
+    AF_BLUE_STRINGSET_TELU = 128,
+    AF_BLUE_STRINGSET_THAI = 131,
+    af_blue_2_1 = 139,
 #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 226abecd1..a7aa057de 100644
--- a/src/autofit/afranges.c
+++ b/src/autofit/afranges.c
@@ -122,6 +122,19 @@
   };
 
 
+  const AF_Script_UniRangeRec  af_cher_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0x13A0,  0x13FF ),  /* Cherokee            */
+    AF_UNIRANGE_REC(  0xAB70,  0xABBF ),  /* Cherokee Supplement */
+    AF_UNIRANGE_REC(       0,       0 )
+  };
+
+  const AF_Script_UniRangeRec  af_cher_nonbase_uniranges[] =
+  {
+    AF_UNIRANGE_REC( 0, 0 )
+  };
+
+
   const AF_Script_UniRangeRec  af_cyrl_uniranges[] =
   {
     AF_UNIRANGE_REC(  0x0400,  0x04FF ),  /* Cyrillic            */
diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h
index 255788424..33c301298 100644
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -49,6 +49,12 @@
           HINTING_TOP_TO_BOTTOM,
           "\xE0\xA7\xA6 \xE0\xA7\xAA" ) /* ০ ৪ */
 
+  SCRIPT( cher, CHER,
+          "Cherokee",
+          HB_SCRIPT_CHEROKEE,
+          HINTING_BOTTOM_TO_TOP,
+          "\xE1\x8E\xA4 \xE1\x8F\x85 \xEA\xAE\x95" ) /* Ꭴ Ꮕ ꮕ */
+
   SCRIPT( cyrl, CYRL,
           "Cyrillic",
           HB_SCRIPT_CYRILLIC,
diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h
index 5d0bcd628..e83a95bb5 100644
--- a/src/autofit/afstyles.h
+++ b/src/autofit/afstyles.h
@@ -104,6 +104,13 @@
          AF_BLUE_STRINGSET_BENG,
          AF_COVERAGE_DEFAULT )
 
+  STYLE( cher_dflt, CHER_DFLT,
+         "Cherokee default style",
+         AF_WRITING_SYSTEM_LATIN,
+         AF_SCRIPT_CHER,
+         AF_BLUE_STRINGSET_CHER,
+         AF_COVERAGE_DEFAULT )
+
   META_STYLE_LATIN( cyrl, CYRL, "Cyrillic" )
 
   STYLE( deva_dflt, DEVA_DFLT,