Update harfbuzz-ng to 0.9.24

third_party/harfbuzz-ng/src/hb-common.h

 /*
  * Copyright © 2007,2008,2009  Red Hat, Inc.
  * Copyright © 2011,2012  Google, Inc.
  *
  *  This is part of HarfBuzz, a text shaping library.
  *
  * Permission is hereby granted, without written agreement and without
  * license or royalty fees, to use, copy, modify, and distribute this
  * software and its documentation for any purpose, provided that the
  * above copyright notice and the following two paragraphs appear in
@@ skipping 72 matching lines @@
   int16_t i16[2];
   uint8_t u8[4];
   int8_t i8[4];
 } hb_var_int_t;
 
 
 /* hb_tag_t */
 
 typedef uint32_t hb_tag_t;
 
-#define HB_TAG(a,b,c,d) ((hb_tag_t)((((uint8_t)(a))<<24)|(((uint8_t)(b))<<16)|(((uint8_t)(c))<<8)|((uint8_t)(d))))
+#define HB_TAG(c1,c2,c3,c4) ((hb_tag_t)((((uint8_t)(c1))<<24)|(((uint8_t)(c2))<<16)|(((uint8_t)(c3))<<8)|((uint8_t)(c4))))
 #define HB_UNTAG(tag)   ((uint8_t)((tag)>>24)), ((uint8_t)((tag)>>16)), ((uint8_t)((tag)>>8)), ((uint8_t)(tag))
 
 #define HB_TAG_NONE HB_TAG(0,0,0,0)
 
 /* len=-1 means str is NUL-terminated. */
 hb_tag_t
 hb_tag_from_string (const char *str, int len);
 
 /* buf should have 4 bytes. */
 void
@@ skipping 20 matching lines @@
 #define HB_DIRECTION_IS_HORIZONTAL(dir) ((((unsigned int) (dir)) & ~1U) == 4)
 #define HB_DIRECTION_IS_VERTICAL(dir)   ((((unsigned int) (dir)) & ~1U) == 6)
 #define HB_DIRECTION_IS_FORWARD(dir)    ((((unsigned int) (dir)) & ~2U) == 4)
 #define HB_DIRECTION_IS_BACKWARD(dir)   ((((unsigned int) (dir)) & ~2U) == 5)
 #define HB_DIRECTION_IS_VALID(dir)      ((((unsigned int) (dir)) & ~3U) == 4)
 #define HB_DIRECTION_REVERSE(dir)       ((hb_direction_t) (((unsigned int) (dir)) ^ 1)) /* Direction must be valid */
 
 
 /* hb_language_t */
 
-typedef struct hb_language_impl_t *hb_language_t;
+typedef const struct hb_language_impl_t *hb_language_t;
 
 /* len=-1 means str is NUL-terminated */
 hb_language_t
 hb_language_from_string (const char *str, int len);
 
 const char *
 hb_language_to_string (hb_language_t language);
 
 #define HB_LANGUAGE_INVALID ((hb_language_t) NULL)
 
 hb_language_t
 hb_language_get_default (void);
 
 
 /* hb_script_t */
 
 /* http://unicode.org/iso15924/ */
 /* http://goo.gl/x9ilM */
 /* Unicode Character Database property: Script (sc) */
 typedef enum
 {
-  /* Unicode-1.1 additions */
-  HB_SCRIPT_COMMON                      = HB_TAG ('Z','y','y','y'),
-  HB_SCRIPT_ARABIC                      = HB_TAG ('A','r','a','b'),
-  HB_SCRIPT_ARMENIAN                    = HB_TAG ('A','r','m','n'),
-  HB_SCRIPT_BENGALI                     = HB_TAG ('B','e','n','g'),
-  HB_SCRIPT_BOPOMOFO                    = HB_TAG ('B','o','p','o'),
-  HB_SCRIPT_CANADIAN_ABORIGINAL         = HB_TAG ('C','a','n','s'),
-  HB_SCRIPT_CHEROKEE                    = HB_TAG ('C','h','e','r'),
-  HB_SCRIPT_COPTIC                      = HB_TAG ('C','o','p','t'),
-  HB_SCRIPT_CYRILLIC                    = HB_TAG ('C','y','r','l'),
-  HB_SCRIPT_DEVANAGARI                  = HB_TAG ('D','e','v','a'),
-  HB_SCRIPT_GEORGIAN                    = HB_TAG ('G','e','o','r'),
-  HB_SCRIPT_GREEK                       = HB_TAG ('G','r','e','k'),
-  HB_SCRIPT_GUJARATI                    = HB_TAG ('G','u','j','r'),
-  HB_SCRIPT_GURMUKHI                    = HB_TAG ('G','u','r','u'),
-  HB_SCRIPT_HANGUL                      = HB_TAG ('H','a','n','g'),
-  HB_SCRIPT_HAN                         = HB_TAG ('H','a','n','i'),
-  HB_SCRIPT_HEBREW                      = HB_TAG ('H','e','b','r'),
-  HB_SCRIPT_HIRAGANA                    = HB_TAG ('H','i','r','a'),
-  HB_SCRIPT_INHERITED                   = HB_TAG ('Z','i','n','h'),
-  HB_SCRIPT_KANNADA                     = HB_TAG ('K','n','d','a'),
-  HB_SCRIPT_KATAKANA                    = HB_TAG ('K','a','n','a'),
-  HB_SCRIPT_LAO                         = HB_TAG ('L','a','o','o'),
-  HB_SCRIPT_LATIN                       = HB_TAG ('L','a','t','n'),
-  HB_SCRIPT_MALAYALAM                   = HB_TAG ('M','l','y','m'),
-  HB_SCRIPT_MONGOLIAN                   = HB_TAG ('M','o','n','g'),
-  HB_SCRIPT_OGHAM                       = HB_TAG ('O','g','a','m'),
-  HB_SCRIPT_ORIYA                       = HB_TAG ('O','r','y','a'),
-  HB_SCRIPT_RUNIC                       = HB_TAG ('R','u','n','r'),
-  HB_SCRIPT_SYRIAC                      = HB_TAG ('S','y','r','c'),
-  HB_SCRIPT_TAMIL                       = HB_TAG ('T','a','m','l'),
-  HB_SCRIPT_TELUGU                      = HB_TAG ('T','e','l','u'),
-  HB_SCRIPT_THAI                        = HB_TAG ('T','h','a','i'),
-  HB_SCRIPT_YI                          = HB_TAG ('Y','i','i','i'),
+  /*1.1*/ HB_SCRIPT_COMMON                      = HB_TAG ('Z','y','y','y'),
+  /*1.1*/ HB_SCRIPT_INHERITED                   = HB_TAG ('Z','i','n','h'),
+  /*5.0*/ HB_SCRIPT_UNKNOWN                     = HB_TAG ('Z','z','z','z'),
 
-  /* Unicode-2.0 additions */
-  HB_SCRIPT_TIBETAN                     = HB_TAG ('T','i','b','t'),
+  /*1.1*/ HB_SCRIPT_ARABIC                      = HB_TAG ('A','r','a','b'),
+  /*1.1*/ HB_SCRIPT_ARMENIAN                    = HB_TAG ('A','r','m','n'),
+  /*1.1*/ HB_SCRIPT_BENGALI                     = HB_TAG ('B','e','n','g'),
+  /*1.1*/ HB_SCRIPT_CYRILLIC                    = HB_TAG ('C','y','r','l'),
+  /*1.1*/ HB_SCRIPT_DEVANAGARI                  = HB_TAG ('D','e','v','a'),
+  /*1.1*/ HB_SCRIPT_GEORGIAN                    = HB_TAG ('G','e','o','r'),
+  /*1.1*/ HB_SCRIPT_GREEK                       = HB_TAG ('G','r','e','k'),
+  /*1.1*/ HB_SCRIPT_GUJARATI                    = HB_TAG ('G','u','j','r'),
+  /*1.1*/ HB_SCRIPT_GURMUKHI                    = HB_TAG ('G','u','r','u'),
+  /*1.1*/ HB_SCRIPT_HANGUL                      = HB_TAG ('H','a','n','g'),
+  /*1.1*/ HB_SCRIPT_HAN                         = HB_TAG ('H','a','n','i'),
+  /*1.1*/ HB_SCRIPT_HEBREW                      = HB_TAG ('H','e','b','r'),
+  /*1.1*/ HB_SCRIPT_HIRAGANA                    = HB_TAG ('H','i','r','a'),
+  /*1.1*/ HB_SCRIPT_KANNADA                     = HB_TAG ('K','n','d','a'),
+  /*1.1*/ HB_SCRIPT_KATAKANA                    = HB_TAG ('K','a','n','a'),
+  /*1.1*/ HB_SCRIPT_LAO                         = HB_TAG ('L','a','o','o'),
+  /*1.1*/ HB_SCRIPT_LATIN                       = HB_TAG ('L','a','t','n'),
+  /*1.1*/ HB_SCRIPT_MALAYALAM                   = HB_TAG ('M','l','y','m'),
+  /*1.1*/ HB_SCRIPT_ORIYA                       = HB_TAG ('O','r','y','a'),
+  /*1.1*/ HB_SCRIPT_TAMIL                       = HB_TAG ('T','a','m','l'),
+  /*1.1*/ HB_SCRIPT_TELUGU                      = HB_TAG ('T','e','l','u'),
+  /*1.1*/ HB_SCRIPT_THAI                        = HB_TAG ('T','h','a','i'),
 
-  /* Unicode-3.0 additions */
-  HB_SCRIPT_ETHIOPIC                    = HB_TAG ('E','t','h','i'),
-  HB_SCRIPT_KHMER                       = HB_TAG ('K','h','m','r'),
-  HB_SCRIPT_MYANMAR                     = HB_TAG ('M','y','m','r'),
-  HB_SCRIPT_SINHALA                     = HB_TAG ('S','i','n','h'),
-  HB_SCRIPT_THAANA                      = HB_TAG ('T','h','a','a'),
+  /*2.0*/ HB_SCRIPT_TIBETAN                     = HB_TAG ('T','i','b','t'),
 
-  /* Unicode-3.1 additions */
-  HB_SCRIPT_DESERET                     = HB_TAG ('D','s','r','t'),
-  HB_SCRIPT_GOTHIC                      = HB_TAG ('G','o','t','h'),
-  HB_SCRIPT_OLD_ITALIC                  = HB_TAG ('I','t','a','l'),
+  /*3.0*/ HB_SCRIPT_BOPOMOFO                    = HB_TAG ('B','o','p','o'),
+  /*3.0*/ HB_SCRIPT_BRAILLE                     = HB_TAG ('B','r','a','i'),
+  /*3.0*/ HB_SCRIPT_CANADIAN_SYLLABICS          = HB_TAG ('C','a','n','s'),
+  /*3.0*/ HB_SCRIPT_CHEROKEE                    = HB_TAG ('C','h','e','r'),
+  /*3.0*/ HB_SCRIPT_ETHIOPIC                    = HB_TAG ('E','t','h','i'),
+  /*3.0*/ HB_SCRIPT_KHMER                       = HB_TAG ('K','h','m','r'),
+  /*3.0*/ HB_SCRIPT_MONGOLIAN                   = HB_TAG ('M','o','n','g'),
+  /*3.0*/ HB_SCRIPT_MYANMAR                     = HB_TAG ('M','y','m','r'),
+  /*3.0*/ HB_SCRIPT_OGHAM                       = HB_TAG ('O','g','a','m'),
+  /*3.0*/ HB_SCRIPT_RUNIC                       = HB_TAG ('R','u','n','r'),
+  /*3.0*/ HB_SCRIPT_SINHALA                     = HB_TAG ('S','i','n','h'),
+  /*3.0*/ HB_SCRIPT_SYRIAC                      = HB_TAG ('S','y','r','c'),
+  /*3.0*/ HB_SCRIPT_THAANA                      = HB_TAG ('T','h','a','a'),
+  /*3.0*/ HB_SCRIPT_YI                          = HB_TAG ('Y','i','i','i'),
 
-  /* Unicode-3.2 additions */
-  HB_SCRIPT_BUHID                       = HB_TAG ('B','u','h','d'),
-  HB_SCRIPT_HANUNOO                     = HB_TAG ('H','a','n','o'),
-  HB_SCRIPT_TAGALOG                     = HB_TAG ('T','g','l','g'),
-  HB_SCRIPT_TAGBANWA                    = HB_TAG ('T','a','g','b'),
+  /*3.1*/ HB_SCRIPT_DESERET                     = HB_TAG ('D','s','r','t'),
+  /*3.1*/ HB_SCRIPT_GOTHIC                      = HB_TAG ('G','o','t','h'),
+  /*3.1*/ HB_SCRIPT_OLD_ITALIC                  = HB_TAG ('I','t','a','l'),
 
-  /* Unicode-4.0 additions */
-  HB_SCRIPT_BRAILLE                     = HB_TAG ('B','r','a','i'),
-  HB_SCRIPT_CYPRIOT                     = HB_TAG ('C','p','r','t'),
-  HB_SCRIPT_LIMBU                       = HB_TAG ('L','i','m','b'),
-  HB_SCRIPT_LINEAR_B                    = HB_TAG ('L','i','n','b'),
-  HB_SCRIPT_OSMANYA                     = HB_TAG ('O','s','m','a'),
-  HB_SCRIPT_SHAVIAN                     = HB_TAG ('S','h','a','w'),
-  HB_SCRIPT_TAI_LE                      = HB_TAG ('T','a','l','e'),
-  HB_SCRIPT_UGARITIC                    = HB_TAG ('U','g','a','r'),
+  /*3.2*/ HB_SCRIPT_BUHID                       = HB_TAG ('B','u','h','d'),
+  /*3.2*/ HB_SCRIPT_HANUNOO                     = HB_TAG ('H','a','n','o'),
+  /*3.2*/ HB_SCRIPT_TAGALOG                     = HB_TAG ('T','g','l','g'),
+  /*3.2*/ HB_SCRIPT_TAGBANWA                    = HB_TAG ('T','a','g','b'),
 
-  /* Unicode-4.1 additions */
-  HB_SCRIPT_BUGINESE                    = HB_TAG ('B','u','g','i'),
-  HB_SCRIPT_GLAGOLITIC                  = HB_TAG ('G','l','a','g'),
-  HB_SCRIPT_KHAROSHTHI                  = HB_TAG ('K','h','a','r'),
-  HB_SCRIPT_NEW_TAI_LUE                 = HB_TAG ('T','a','l','u'),
-  HB_SCRIPT_OLD_PERSIAN                 = HB_TAG ('X','p','e','o'),
-  HB_SCRIPT_SYLOTI_NAGRI                = HB_TAG ('S','y','l','o'),
-  HB_SCRIPT_TIFINAGH                    = HB_TAG ('T','f','n','g'),
+  /*4.0*/ HB_SCRIPT_CYPRIOT                     = HB_TAG ('C','p','r','t'),
+  /*4.0*/ HB_SCRIPT_LIMBU                       = HB_TAG ('L','i','m','b'),
+  /*4.0*/ HB_SCRIPT_LINEAR_B                    = HB_TAG ('L','i','n','b'),
+  /*4.0*/ HB_SCRIPT_OSMANYA                     = HB_TAG ('O','s','m','a'),
+  /*4.0*/ HB_SCRIPT_SHAVIAN                     = HB_TAG ('S','h','a','w'),
+  /*4.0*/ HB_SCRIPT_TAI_LE                      = HB_TAG ('T','a','l','e'),
+  /*4.0*/ HB_SCRIPT_UGARITIC                    = HB_TAG ('U','g','a','r'),
 
-  /* Unicode-5.0 additions */
-  HB_SCRIPT_BALINESE                    = HB_TAG ('B','a','l','i'),
-  HB_SCRIPT_CUNEIFORM                   = HB_TAG ('X','s','u','x'),
-  HB_SCRIPT_NKO                         = HB_TAG ('N','k','o','o'),
-  HB_SCRIPT_PHAGS_PA                    = HB_TAG ('P','h','a','g'),
-  HB_SCRIPT_PHOENICIAN                  = HB_TAG ('P','h','n','x'),
-  HB_SCRIPT_UNKNOWN                     = HB_TAG ('Z','z','z','z'),
+  /*4.1*/ HB_SCRIPT_BUGINESE                    = HB_TAG ('B','u','g','i'),
+  /*4.1*/ HB_SCRIPT_COPTIC                      = HB_TAG ('C','o','p','t'),
+  /*4.1*/ HB_SCRIPT_GLAGOLITIC                  = HB_TAG ('G','l','a','g'),
+  /*4.1*/ HB_SCRIPT_KHAROSHTHI                  = HB_TAG ('K','h','a','r'),
+  /*4.1*/ HB_SCRIPT_NEW_TAI_LUE                 = HB_TAG ('T','a','l','u'),
+  /*4.1*/ HB_SCRIPT_OLD_PERSIAN                 = HB_TAG ('X','p','e','o'),
+  /*4.1*/ HB_SCRIPT_SYLOTI_NAGRI                = HB_TAG ('S','y','l','o'),
+  /*4.1*/ HB_SCRIPT_TIFINAGH                    = HB_TAG ('T','f','n','g'),
 
-  /* Unicode-5.1 additions */
-  HB_SCRIPT_CARIAN                      = HB_TAG ('C','a','r','i'),
-  HB_SCRIPT_CHAM                        = HB_TAG ('C','h','a','m'),
-  HB_SCRIPT_KAYAH_LI                    = HB_TAG ('K','a','l','i'),
-  HB_SCRIPT_LEPCHA                      = HB_TAG ('L','e','p','c'),
-  HB_SCRIPT_LYCIAN                      = HB_TAG ('L','y','c','i'),
-  HB_SCRIPT_LYDIAN                      = HB_TAG ('L','y','d','i'),
-  HB_SCRIPT_OL_CHIKI                    = HB_TAG ('O','l','c','k'),
-  HB_SCRIPT_REJANG                      = HB_TAG ('R','j','n','g'),
-  HB_SCRIPT_SAURASHTRA                  = HB_TAG ('S','a','u','r'),
-  HB_SCRIPT_SUNDANESE                   = HB_TAG ('S','u','n','d'),
-  HB_SCRIPT_VAI                         = HB_TAG ('V','a','i','i'),
+  /*5.0*/ HB_SCRIPT_BALINESE                    = HB_TAG ('B','a','l','i'),
+  /*5.0*/ HB_SCRIPT_CUNEIFORM                   = HB_TAG ('X','s','u','x'),
+  /*5.0*/ HB_SCRIPT_NKO                         = HB_TAG ('N','k','o','o'),
+  /*5.0*/ HB_SCRIPT_PHAGS_PA                    = HB_TAG ('P','h','a','g'),
+  /*5.0*/ HB_SCRIPT_PHOENICIAN                  = HB_TAG ('P','h','n','x'),
 
-  /* Unicode-5.2 additions */
-  HB_SCRIPT_AVESTAN                     = HB_TAG ('A','v','s','t'),
-  HB_SCRIPT_BAMUM                       = HB_TAG ('B','a','m','u'),
-  HB_SCRIPT_EGYPTIAN_HIEROGLYPHS        = HB_TAG ('E','g','y','p'),
-  HB_SCRIPT_IMPERIAL_ARAMAIC            = HB_TAG ('A','r','m','i'),
-  HB_SCRIPT_INSCRIPTIONAL_PAHLAVI       = HB_TAG ('P','h','l','i'),
-  HB_SCRIPT_INSCRIPTIONAL_PARTHIAN      = HB_TAG ('P','r','t','i'),
-  HB_SCRIPT_JAVANESE                    = HB_TAG ('J','a','v','a'),
-  HB_SCRIPT_KAITHI                      = HB_TAG ('K','t','h','i'),
-  HB_SCRIPT_LISU                        = HB_TAG ('L','i','s','u'),
-  HB_SCRIPT_MEETEI_MAYEK                = HB_TAG ('M','t','e','i'),
-  HB_SCRIPT_OLD_SOUTH_ARABIAN           = HB_TAG ('S','a','r','b'),
-  HB_SCRIPT_OLD_TURKIC                  = HB_TAG ('O','r','k','h'),
-  HB_SCRIPT_SAMARITAN                   = HB_TAG ('S','a','m','r'),
-  HB_SCRIPT_TAI_THAM                    = HB_TAG ('L','a','n','a'),
-  HB_SCRIPT_TAI_VIET                    = HB_TAG ('T','a','v','t'),
+  /*5.1*/ HB_SCRIPT_CARIAN                      = HB_TAG ('C','a','r','i'),
+  /*5.1*/ HB_SCRIPT_CHAM                        = HB_TAG ('C','h','a','m'),
+  /*5.1*/ HB_SCRIPT_KAYAH_LI                    = HB_TAG ('K','a','l','i'),
+  /*5.1*/ HB_SCRIPT_LEPCHA                      = HB_TAG ('L','e','p','c'),
+  /*5.1*/ HB_SCRIPT_LYCIAN                      = HB_TAG ('L','y','c','i'),
+  /*5.1*/ HB_SCRIPT_LYDIAN                      = HB_TAG ('L','y','d','i'),
+  /*5.1*/ HB_SCRIPT_OL_CHIKI                    = HB_TAG ('O','l','c','k'),
+  /*5.1*/ HB_SCRIPT_REJANG                      = HB_TAG ('R','j','n','g'),
+  /*5.1*/ HB_SCRIPT_SAURASHTRA                  = HB_TAG ('S','a','u','r'),
+  /*5.1*/ HB_SCRIPT_SUNDANESE                   = HB_TAG ('S','u','n','d'),
+  /*5.1*/ HB_SCRIPT_VAI                         = HB_TAG ('V','a','i','i'),
 
-  /* Unicode-6.0 additions */
-  HB_SCRIPT_BATAK                       = HB_TAG ('B','a','t','k'),
-  HB_SCRIPT_BRAHMI                      = HB_TAG ('B','r','a','h'),
-  HB_SCRIPT_MANDAIC                     = HB_TAG ('M','a','n','d'),
+  /*5.2*/ HB_SCRIPT_AVESTAN                     = HB_TAG ('A','v','s','t'),
+  /*5.2*/ HB_SCRIPT_BAMUM                       = HB_TAG ('B','a','m','u'),
+  /*5.2*/ HB_SCRIPT_EGYPTIAN_HIEROGLYPHS        = HB_TAG ('E','g','y','p'),
+  /*5.2*/ HB_SCRIPT_IMPERIAL_ARAMAIC            = HB_TAG ('A','r','m','i'),
+  /*5.2*/ HB_SCRIPT_INSCRIPTIONAL_PAHLAVI       = HB_TAG ('P','h','l','i'),
+  /*5.2*/ HB_SCRIPT_INSCRIPTIONAL_PARTHIAN      = HB_TAG ('P','r','t','i'),
+  /*5.2*/ HB_SCRIPT_JAVANESE                    = HB_TAG ('J','a','v','a'),
+  /*5.2*/ HB_SCRIPT_KAITHI                      = HB_TAG ('K','t','h','i'),
+  /*5.2*/ HB_SCRIPT_LISU                        = HB_TAG ('L','i','s','u'),
+  /*5.2*/ HB_SCRIPT_MEETEI_MAYEK                = HB_TAG ('M','t','e','i'),
+  /*5.2*/ HB_SCRIPT_OLD_SOUTH_ARABIAN           = HB_TAG ('S','a','r','b'),
+  /*5.2*/ HB_SCRIPT_OLD_TURKIC                  = HB_TAG ('O','r','k','h'),
+  /*5.2*/ HB_SCRIPT_SAMARITAN                   = HB_TAG ('S','a','m','r'),
+  /*5.2*/ HB_SCRIPT_TAI_THAM                    = HB_TAG ('L','a','n','a'),
+  /*5.2*/ HB_SCRIPT_TAI_VIET                    = HB_TAG ('T','a','v','t'),
 
-  /* Unicode-6.1 additions */
-  HB_SCRIPT_CHAKMA                      = HB_TAG ('C','a','k','m'),
-  HB_SCRIPT_MEROITIC_CURSIVE            = HB_TAG ('M','e','r','c'),
-  HB_SCRIPT_MEROITIC_HIEROGLYPHS        = HB_TAG ('M','e','r','o'),
-  HB_SCRIPT_MIAO                        = HB_TAG ('P','l','r','d'),
-  HB_SCRIPT_SHARADA                     = HB_TAG ('S','h','r','d'),
-  HB_SCRIPT_SORA_SOMPENG                = HB_TAG ('S','o','r','a'),
-  HB_SCRIPT_TAKRI                       = HB_TAG ('T','a','k','r'),
+  /*6.0*/ HB_SCRIPT_BATAK                       = HB_TAG ('B','a','t','k'),
+  /*6.0*/ HB_SCRIPT_BRAHMI                      = HB_TAG ('B','r','a','h'),
+  /*6.0*/ HB_SCRIPT_MANDAIC                     = HB_TAG ('M','a','n','d'),
 
-  /* No script set */
-  HB_SCRIPT_INVALID                     = HB_TAG_NONE
+  /*6.1*/ HB_SCRIPT_CHAKMA                      = HB_TAG ('C','a','k','m'),
+  /*6.1*/ HB_SCRIPT_MEROITIC_CURSIVE            = HB_TAG ('M','e','r','c'),
+  /*6.1*/ HB_SCRIPT_MEROITIC_HIEROGLYPHS        = HB_TAG ('M','e','r','o'),
+  /*6.1*/ HB_SCRIPT_MIAO                        = HB_TAG ('P','l','r','d'),
+  /*6.1*/ HB_SCRIPT_SHARADA                     = HB_TAG ('S','h','r','d'),
+  /*6.1*/ HB_SCRIPT_SORA_SOMPENG                = HB_TAG ('S','o','r','a'),
+  /*6.1*/ HB_SCRIPT_TAKRI                       = HB_TAG ('T','a','k','r'),
+
+  /* No script set. */
+  /*---*/ HB_SCRIPT_INVALID                     = HB_TAG_NONE
 } hb_script_t;
 
+/* These are moved out of hb_script_t because glib-mkenums chokes otherwise. */
+#if 0
+  /*7.0*/ HB_SCRIPT_BASSA_VAH                   = HB_TAG ('B','a','s','s'),
+  /*7.0*/ HB_SCRIPT_CAUCASIAN_ALBANIAN          = HB_TAG ('A','g','h','b'),
+  /*7.0*/ HB_SCRIPT_DUPLOYAN                    = HB_TAG ('D','u','p','l'),
+  /*7.0*/ HB_SCRIPT_ELBASAN                     = HB_TAG ('E','l','b','a'),
+  /*7.0*/ HB_SCRIPT_GRANTHA                     = HB_TAG ('G','r','a','n'),
+  /*7.0*/ HB_SCRIPT_KHOJKI                      = HB_TAG ('K','h','o','j'),
+  /*7.0*/ HB_SCRIPT_KHUDAWADI                   = HB_TAG ('S','i','n','d'),
+  /*7.0*/ HB_SCRIPT_LINEAR_A                    = HB_TAG ('L','i','n','a'),
+  /*7.0*/ HB_SCRIPT_MAHAJANI                    = HB_TAG ('M','a','h','j'),
+  /*7.0*/ HB_SCRIPT_MANICHAEAN                  = HB_TAG ('M','a','n','i'),
+  /*7.0*/ HB_SCRIPT_MENDE_KIKAKUI               = HB_TAG ('M','e','n','d'),
+  /*7.0*/ HB_SCRIPT_MODI                        = ???
+  /*7.0*/ HB_SCRIPT_MRO                         = HB_TAG ('M','r','o','o'),
+  /*7.0*/ HB_SCRIPT_NABATAEAN                   = HB_TAG ('N','b','a','t'),
+  /*7.0*/ HB_SCRIPT_OLD_NORTH_ARABIAN           = HB_TAG ('N','a','r','b'),
+  /*7.0*/ HB_SCRIPT_OLD_PERMIC                  = HB_TAG ('P','e','r','m'),
+  /*7.0*/ HB_SCRIPT_PAHAWH_HMONG                = HB_TAG ('H','m','n','g'),
+  /*7.0*/ HB_SCRIPT_PALMYRENE                   = HB_TAG ('P','a','l','m'),
+  /*7.0*/ HB_SCRIPT_PAU_CIN_HAU                 = ???
+  /*7.0*/ HB_SCRIPT_PSALTER_PAHLAVI             = HB_TAG ('P','h','l','p'),
+  /*7.0*/ HB_SCRIPT_SIDDHAM                     = ???
+  /*7.0*/ HB_SCRIPT_TIRHUTA                     = HB_TAG ('T','i','r','h'),
+  /*7.0*/ HB_SCRIPT_WARANG_CITI                 = HB_TAG ('W','a','r','a'),
+#endif
+
 
 /* Script functions */
 
 hb_script_t
 hb_script_from_iso15924_tag (hb_tag_t tag);
 
 /* suger for tag_from_string() then script_from_iso15924_tag */
 /* len=-1 means s is NUL-terminated */
 hb_script_t
 hb_script_from_string (const char *s, int len);
@@ skipping 11 matching lines @@
   /*< private >*/
   char unused;
 } hb_user_data_key_t;
 
 typedef void (*hb_destroy_func_t) (void *user_data);
 
 
 HB_END_DECLS
 
 #endif /* HB_COMMON_H */