diff --git a/ChangeLog b/ChangeLog
index 7d0fb6d..3c51943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,18 @@
 2017-04-08  Sascha Brawer  <sascha@google.com>
 	    Werner Lemberg  <wl@gnu.org
 
+	[autofit] Add support for Cypriot script.
+
+	* src/autofit/afblue.dat: Add blue zone data for Cypriot.
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/afscript.h: Add Cypriot standard characters.
+
+	* src/autofit/afranges.c, src/autofit/afstyles.h: Add Cypriot data.
+
+2017-04-08  Sascha Brawer  <sascha@google.com>
+	    Werner Lemberg  <wl@gnu.org
+
 	[autofit] Add support for Deseret script.
 
 	* src/autofit/afblue.dat: Add blue zone data for Deseret.
diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c
index 91ea741..d6c54d5 100644
--- a/src/autofit/afblue.c
+++ b/src/autofit/afblue.c
@@ -66,6 +66,12 @@
     '\0',
     '\xE1', '\x8F', '\xB8', ' ', '\xEA', '\xAE', '\x90', ' ', '\xEA', '\xAD', '\xB9', ' ', '\xEA', '\xAD', '\xBB',  /* ᏸ ꮐ ꭹ ꭻ */
     '\0',
+    '\xF0', '\x90', '\xA0', '\x8D', ' ', '\xF0', '\x90', '\xA0', '\x99', ' ', '\xF0', '\x90', '\xA0', '\xB3', ' ', '\xF0', '\x90', '\xA0', '\xB1', ' ', '\xF0', '\x90', '\xA0', '\x85', ' ', '\xF0', '\x90', '\xA0', '\x93', ' ', '\xF0', '\x90', '\xA0', '\xA3', ' ', '\xF0', '\x90', '\xA0', '\xA6',  /* 𐠍 𐠙 𐠳 𐠱 𐠅 𐠓 𐠣 𐠦 */
+    '\0',
+    '\xF0', '\x90', '\xA0', '\x83', ' ', '\xF0', '\x90', '\xA0', '\x8A', ' ', '\xF0', '\x90', '\xA0', '\x9B', ' ', '\xF0', '\x90', '\xA0', '\xA3', ' ', '\xF0', '\x90', '\xA0', '\xB3', ' ', '\xF0', '\x90', '\xA0', '\xB5', ' ', '\xF0', '\x90', '\xA0', '\x90',  /* 𐠃 𐠊 𐠛 𐠣 𐠳 𐠵 𐠐 */
+    '\0',
+    '\xF0', '\x90', '\xA0', '\x88', ' ', '\xF0', '\x90', '\xA0', '\x8F', ' ', '\xF0', '\x90', '\xA0', '\x96',  /* 𐠈 𐠏 𐠖 */
+    '\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',  /* Б В Е Ш З О С Э */
@@ -374,6 +380,11 @@
     { AF_BLUE_STRING_CHEROKEE_SMALL,           0                                 },
     { AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER, 0                                 },
     { AF_BLUE_STRING_MAX,                      0                                 },
+    { AF_BLUE_STRING_CYPRIOT_TOP,    AF_BLUE_PROPERTY_LATIN_TOP },
+    { AF_BLUE_STRING_CYPRIOT_BOTTOM, 0                          },
+    { AF_BLUE_STRING_CYPRIOT_SMALL,  AF_BLUE_PROPERTY_LATIN_TOP },
+    { AF_BLUE_STRING_CYPRIOT_SMALL,  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 58eaa26..649a602 100644
--- a/src/autofit/afblue.dat
+++ b/src/autofit/afblue.dat
@@ -124,6 +124,13 @@
   AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER
     "ᏸ ꮐ ꭹ ꭻ"
 
+  AF_BLUE_STRING_CYPRIOT_TOP
+    "𐠍 𐠙 𐠳 𐠱 𐠅 𐠓 𐠣 𐠦"
+  AF_BLUE_STRING_CYPRIOT_BOTTOM
+    "𐠃 𐠊 𐠛 𐠣 𐠳 𐠵 𐠐"
+  AF_BLUE_STRING_CYPRIOT_SMALL
+    "𐠈 𐠏 𐠖"
+
   AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP
     "Б В Е П З О С Э"
   AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM
@@ -595,6 +602,13 @@
     { AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER, 0                                 }
     { AF_BLUE_STRING_MAX,                      0                                 }
 
+  AF_BLUE_STRINGSET_CPRT
+    { AF_BLUE_STRING_CYPRIOT_TOP,    AF_BLUE_PROPERTY_LATIN_TOP }
+    { AF_BLUE_STRING_CYPRIOT_BOTTOM, 0                          }
+    { AF_BLUE_STRING_CYPRIOT_SMALL,  AF_BLUE_PROPERTY_LATIN_TOP }
+    { AF_BLUE_STRING_CYPRIOT_SMALL,  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 3847137..d7501a5 100644
--- a/src/autofit/afblue.h
+++ b/src/autofit/afblue.h
@@ -97,120 +97,123 @@
     AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER = 406,
     AF_BLUE_STRING_CHEROKEE_SMALL = 438,
     AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER = 470,
-    AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 486,
-    AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 510,
-    AF_BLUE_STRING_CYRILLIC_SMALL = 534,
-    AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 558,
-    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,
+    AF_BLUE_STRING_CYPRIOT_TOP = 486,
+    AF_BLUE_STRING_CYPRIOT_BOTTOM = 526,
+    AF_BLUE_STRING_CYPRIOT_SMALL = 561,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 576,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 600,
+    AF_BLUE_STRING_CYRILLIC_SMALL = 624,
+    AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 648,
+    AF_BLUE_STRING_DESERET_CAPITAL_TOP = 657,
+    AF_BLUE_STRING_DESERET_CAPITAL_BOTTOM = 682,
+    AF_BLUE_STRING_DESERET_SMALL_TOP = 707,
+    AF_BLUE_STRING_DESERET_SMALL_BOTTOM = 732,
+    AF_BLUE_STRING_DEVANAGARI_BASE = 757,
+    AF_BLUE_STRING_DEVANAGARI_TOP = 789,
+    AF_BLUE_STRING_DEVANAGARI_HEAD = 821,
+    AF_BLUE_STRING_DEVANAGARI_BOTTOM = 853,
+    AF_BLUE_STRING_ETHIOPIC_TOP = 861,
+    AF_BLUE_STRING_ETHIOPIC_BOTTOM = 893,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP = 925,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM = 957,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER = 989,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER = 1021,
+    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP = 1053,
+    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM = 1085,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP = 1117,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 1149,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 1181,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 1213,
+    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1245,
+    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 1277,
+    AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 1309,
+    AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 1341,
+    AF_BLUE_STRING_GREEK_CAPITAL_TOP = 1373,
+    AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 1394,
+    AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 1412,
+    AF_BLUE_STRING_GREEK_SMALL = 1430,
+    AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 1454,
+    AF_BLUE_STRING_GUJARATI_TOP = 1478,
+    AF_BLUE_STRING_GUJARATI_BOTTOM = 1510,
+    AF_BLUE_STRING_GUJARATI_ASCENDER = 1542,
+    AF_BLUE_STRING_GUJARATI_DESCENDER = 1592,
+    AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 1625,
+    AF_BLUE_STRING_GURMUKHI_BASE = 1645,
+    AF_BLUE_STRING_GURMUKHI_HEAD = 1677,
+    AF_BLUE_STRING_GURMUKHI_TOP = 1709,
+    AF_BLUE_STRING_GURMUKHI_BOTTOM = 1741,
+    AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 1773,
+    AF_BLUE_STRING_HEBREW_TOP = 1793,
+    AF_BLUE_STRING_HEBREW_BOTTOM = 1817,
+    AF_BLUE_STRING_HEBREW_DESCENDER = 1835,
+    AF_BLUE_STRING_KANNADA_TOP = 1850,
+    AF_BLUE_STRING_KANNADA_BOTTOM = 1894,
+    AF_BLUE_STRING_KHMER_TOP = 1926,
+    AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 1950,
+    AF_BLUE_STRING_KHMER_BOTTOM = 1990,
+    AF_BLUE_STRING_KHMER_DESCENDER = 2022,
+    AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 2056,
+    AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 2143,
+    AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 2151,
+    AF_BLUE_STRING_LAO_TOP = 2159,
+    AF_BLUE_STRING_LAO_BOTTOM = 2191,
+    AF_BLUE_STRING_LAO_ASCENDER = 2223,
+    AF_BLUE_STRING_LAO_LARGE_ASCENDER = 2239,
+    AF_BLUE_STRING_LAO_DESCENDER = 2251,
+    AF_BLUE_STRING_LATIN_CAPITAL_TOP = 2275,
+    AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 2291,
+    AF_BLUE_STRING_LATIN_SMALL_F_TOP = 2307,
+    AF_BLUE_STRING_LATIN_SMALL_TOP = 2321,
+    AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 2337,
+    AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 2353,
+    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 2363,
+    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 2383,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 2403,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL = 2423,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 2459,
+    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 2479,
+    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 2510,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 2539,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL = 2565,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 2590,
+    AF_BLUE_STRING_LISU_TOP = 2601,
+    AF_BLUE_STRING_LISU_BOTTOM = 2633,
+    AF_BLUE_STRING_MALAYALAM_TOP = 2665,
+    AF_BLUE_STRING_MALAYALAM_BOTTOM = 2709,
+    AF_BLUE_STRING_MYANMAR_TOP = 2741,
+    AF_BLUE_STRING_MYANMAR_BOTTOM = 2773,
+    AF_BLUE_STRING_MYANMAR_ASCENDER = 2805,
+    AF_BLUE_STRING_MYANMAR_DESCENDER = 2833,
+    AF_BLUE_STRING_NKO_TOP = 2865,
+    AF_BLUE_STRING_NKO_BOTTOM = 2889,
+    AF_BLUE_STRING_NKO_SMALL_TOP = 2904,
+    AF_BLUE_STRING_NKO_SMALL_BOTTOM = 2913,
+    AF_BLUE_STRING_OL_CHIKI = 2925,
+    AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 2949,
+    AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 2989,
+    AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3019,
+    AF_BLUE_STRING_OSAGE_SMALL_TOP = 3034,
+    AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3074,
+    AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 3114,
+    AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 3139,
+    AF_BLUE_STRING_SINHALA_TOP = 3154,
+    AF_BLUE_STRING_SINHALA_BOTTOM = 3186,
+    AF_BLUE_STRING_SINHALA_DESCENDER = 3218,
+    AF_BLUE_STRING_TAI_VIET_TOP = 3262,
+    AF_BLUE_STRING_TAI_VIET_BOTTOM = 3282,
+    AF_BLUE_STRING_TAMIL_TOP = 3294,
+    AF_BLUE_STRING_TAMIL_BOTTOM = 3326,
+    AF_BLUE_STRING_TELUGU_TOP = 3358,
+    AF_BLUE_STRING_TELUGU_BOTTOM = 3386,
+    AF_BLUE_STRING_THAI_TOP = 3414,
+    AF_BLUE_STRING_THAI_BOTTOM = 3438,
+    AF_BLUE_STRING_THAI_ASCENDER = 3466,
+    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 3478,
+    AF_BLUE_STRING_THAI_DESCENDER = 3490,
+    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 3506,
+    AF_BLUE_STRING_THAI_DIGIT_TOP = 3514,
+    AF_BLUE_STRING_TIFINAGH = 3526,
+    af_blue_1_1 = 3557,
 #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,
@@ -274,38 +277,39 @@
     AF_BLUE_STRINGSET_ARMN = 9,
     AF_BLUE_STRINGSET_BENG = 16,
     AF_BLUE_STRINGSET_CHER = 21,
-    AF_BLUE_STRINGSET_CYRL = 28,
-    AF_BLUE_STRINGSET_DEVA = 34,
-    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,
+    AF_BLUE_STRINGSET_CPRT = 28,
+    AF_BLUE_STRINGSET_CYRL = 33,
+    AF_BLUE_STRINGSET_DEVA = 39,
+    AF_BLUE_STRINGSET_DSRT = 45,
+    AF_BLUE_STRINGSET_ETHI = 50,
+    AF_BLUE_STRINGSET_GEOR = 53,
+    AF_BLUE_STRINGSET_GEOK = 58,
+    AF_BLUE_STRINGSET_GLAG = 65,
+    AF_BLUE_STRINGSET_GREK = 70,
+    AF_BLUE_STRINGSET_GUJR = 77,
+    AF_BLUE_STRINGSET_GURU = 83,
+    AF_BLUE_STRINGSET_HEBR = 89,
+    AF_BLUE_STRINGSET_KNDA = 93,
+    AF_BLUE_STRINGSET_KHMR = 96,
+    AF_BLUE_STRINGSET_KHMS = 102,
+    AF_BLUE_STRINGSET_LAO = 105,
+    AF_BLUE_STRINGSET_LATN = 111,
+    AF_BLUE_STRINGSET_LATB = 118,
+    AF_BLUE_STRINGSET_LATP = 125,
+    AF_BLUE_STRINGSET_LISU = 132,
+    AF_BLUE_STRINGSET_MLYM = 135,
+    AF_BLUE_STRINGSET_MYMR = 138,
+    AF_BLUE_STRINGSET_NKOO = 143,
+    AF_BLUE_STRINGSET_NONE = 148,
+    AF_BLUE_STRINGSET_OLCK = 149,
+    AF_BLUE_STRINGSET_OSGE = 152,
+    AF_BLUE_STRINGSET_SINH = 160,
+    AF_BLUE_STRINGSET_TAML = 164,
+    AF_BLUE_STRINGSET_TAVT = 167,
+    AF_BLUE_STRINGSET_TELU = 170,
+    AF_BLUE_STRINGSET_THAI = 173,
+    AF_BLUE_STRINGSET_TFNG = 181,
+    af_blue_2_1 = 184,
 #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 1431bc6..c79c8e0 100644
--- a/src/autofit/afranges.c
+++ b/src/autofit/afranges.c
@@ -149,6 +149,18 @@
   };
 
 
+  const AF_Script_UniRangeRec  af_cprt_uniranges[] =
+  {
+    AF_UNIRANGE_REC( 0x10800, 0x1083F ),   /* Cypriot */
+    AF_UNIRANGE_REC(       0,       0 )
+  };
+
+  const AF_Script_UniRangeRec  af_cprt_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 7de4050..6013694 100644
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -61,6 +61,12 @@
           HINTING_BOTTOM_TO_TOP,
           "\xE1\x8E\xA4 \xE1\x8F\x85 \xEA\xAE\x95" ) /* Ꭴ Ꮕ ꮕ */
 
+  SCRIPT( cprt, CPRT,
+          "Cypriot",
+          HB_SCRIPT_CYPRIOT,
+          HINTING_BOTTOM_TO_TOP,
+          "\xF0\x90\xA0\x85 \xF0\x90\xA0\xA3" ) /* 𐠅 𐠣 */
+
   SCRIPT( cyrl, CYRL,
           "Cyrillic",
           HB_SCRIPT_CYRILLIC,
diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h
index dc79283..f163b7a 100644
--- a/src/autofit/afstyles.h
+++ b/src/autofit/afstyles.h
@@ -118,6 +118,13 @@
          AF_BLUE_STRINGSET_CHER,
          AF_COVERAGE_DEFAULT )
 
+  STYLE( cprt_dflt, CPRT_DFLT,
+         "Cypriot default style",
+         AF_WRITING_SYSTEM_LATIN,
+         AF_SCRIPT_CPRT,
+         AF_BLUE_STRINGSET_CPRT,
+         AF_COVERAGE_DEFAULT )
+
   META_STYLE_LATIN( cyrl, CYRL, "Cyrillic" )
 
   STYLE( deva_dflt, DEVA_DFLT,