pango 2.0.2-x86-mingw32 → 2.0.3-x86-mingw32

data/ext/pango/rbpangolayoutline.c

@@ -24,30 +24,6 @@
 #define RG_TARGET_NAMESPACE cLayoutLine
 #define _SELF(r) (RVAL2PANGOLAYOUTLINE(r))
 
-/**********************************/
-#if !PANGO_CHECK_VERSION(1,9,0)
-static PangoLayoutLine*
-layout_line_copy(PangoLayoutLine *ref)
-{
-  g_return_val_if_fail (ref != NULL, NULL);
-  pango_layout_line_ref(ref);
-  return ref;
-}
-
-GType
-pango_layout_line_get_type(void)
-{
-    static GType our_type = 0;
-
-    if (our_type == 0)
-        our_type = g_boxed_type_register_static ("PangoLayoutLine",
-                    (GBoxedCopyFunc)layout_line_copy,
-                    (GBoxedFreeFunc)pango_layout_line_unref);
-    return our_type;
-}
-#endif
-/**********************************/
-
 static VALUE
 rg_extents(VALUE self)
 {
@@ -148,7 +124,6 @@ rg_set_length(VALUE self, VALUE val)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,2,0)
 static VALUE
 rg_runs(VALUE self)
 {
@@ -166,7 +141,6 @@ rg_runs(VALUE self)
     }
     return ary;
 }
-#endif
 
 struct layout_line_set_runs_args {
     PangoLayoutLine *line;
@@ -214,7 +188,6 @@ rg_set_runs(VALUE self, VALUE attrs)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
 rg_paragraph_start_p(VALUE self)
 {
@@ -240,7 +213,6 @@ rg_set_resolved_dir(VALUE self, VALUE val)
     _SELF(self)->resolved_dir = NUM2UINT(val);
     return self;
 }
-#endif
 
 void
 Init_pango_layout_line(VALUE mPango)
@@ -258,15 +230,10 @@ Init_pango_layout_line(VALUE mPango)
     RG_DEF_METHOD(set_start_index, 1); 
     RG_DEF_METHOD(length, 0); 
     RG_DEF_METHOD(set_length, 1); 
-#if PANGO_CHECK_VERSION(1,2,0)
     RG_DEF_METHOD(runs, 0); 
-#endif
     RG_DEF_METHOD(set_runs, 1); 
-
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_METHOD_P(paragraph_start, 0); 
     RG_DEF_METHOD(set_paragraph_start, 1); 
     RG_DEF_METHOD(resolved_dir, 0); 
     RG_DEF_METHOD(set_resolved_dir, 1); 
-#endif
 }

data/ext/pango/rbpangologattr.c

@@ -84,10 +84,7 @@ ATTR_BOOL(is_word_end);
 ATTR_BOOL(is_sentence_boundary);
 ATTR_BOOL(is_sentence_start);
 ATTR_BOOL(is_sentence_end);
-
-#if PANGO_CHECK_VERSION(1,4,0)
 ATTR_BOOL(backspace_deletes_character);
-#endif
 
 void
 Init_pango_logattr(VALUE mPango)
@@ -107,8 +104,6 @@ Init_pango_logattr(VALUE mPango)
     DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, sentence_start);
     DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, sentence_end);
 
-#if PANGO_CHECK_VERSION(1,4,0)
     rbg_define_method(RG_TARGET_NAMESPACE, "backspace_deletes_character?", log_get_backspace_deletes_character, 0); 
     rbg_define_method(RG_TARGET_NAMESPACE, "set_backspace_deletes_character", log_set_backspace_deletes_character, 1); 
-#endif
 }

data/ext/pango/rbpangomatrix.c

@@ -21,8 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,6,0)
-
 #define RG_TARGET_NAMESPACE cMatrix
 #define _SELF(self) (RVAL2PANGOMATRIX(self))
 
@@ -99,13 +97,11 @@ rg_concat_bang(VALUE self, VALUE new_matrix)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,12,0)
 static VALUE
 rg_font_scale_factor(VALUE self)
 {
     return rb_float_new(pango_matrix_get_font_scale_factor(_SELF(self)));
 }
-#endif
 
 ATTR_FLOAT(xx);
 ATTR_FLOAT(xy);
@@ -122,12 +118,9 @@ rg_to_a(VALUE self)
                        INT2NUM(matrix->yy), INT2NUM(matrix->x0), INT2NUM(matrix->y0));
 }
 
-#endif
-
 void
 Init_pango_matrix(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_MATRIX, "Matrix", mPango);
 
     RG_DEF_METHOD(initialize, -1);
@@ -135,9 +128,7 @@ Init_pango_matrix(VALUE mPango)
     RG_DEF_METHOD_BANG(scale, 2);
     RG_DEF_METHOD_BANG(rotate, 1);
     RG_DEF_METHOD_BANG(concat, 1);
-#if PANGO_CHECK_VERSION(1,12,0)
     RG_DEF_METHOD(font_scale_factor, 0);
-#endif
 #if PANGO_CHECK_VERSION(1,16,0)
     RG_DEF_METHOD(gravity, 0);
 #endif
@@ -149,5 +140,4 @@ Init_pango_matrix(VALUE mPango)
     DEFINE_ACCESSOR(yy);
     DEFINE_ACCESSOR(x0);
     DEFINE_ACCESSOR(y0);
-#endif
 }

data/ext/pango/rbpangoprivate.h

@@ -7,10 +7,6 @@
 #  define rb_errinfo() (ruby_errinfo)
 #endif
 
-#if PANGO_CHECK_VERSION(1,10,0) && defined(HAVE_RB_CAIRO_H)
-#  define CAIRO_AVAILABLE 1
-#endif
-
 G_BEGIN_DECLS
 
 G_GNUC_INTERNAL void Init_pango_analysis(VALUE mPango);

data/ext/pango/rbpangorenderer.c

@@ -21,7 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,8,0)
 #define RG_TARGET_NAMESPACE cRenderer
 #define _SELF(self) (RVAL2PANGORENDERER(self))
 
@@ -166,12 +165,9 @@ rg_matrix(VALUE self)
     return PANGOMATRIX2RVAL((PangoMatrix*)matrix);
 }
 
-#endif
-
 void
 Init_pangorenderer(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,8,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_RENDERER, "Renderer", mPango);
 
     RG_DEF_METHOD(draw_layout, 3);
@@ -194,6 +190,4 @@ Init_pangorenderer(VALUE mPango)
     G_DEF_CLASS(PANGO_TYPE_RENDER_PART, "Part", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_RENDER_PART, "PANGO_RENDER_");
 #endif
-
-#endif
 }

data/ext/pango/rbpangoscript.c

@@ -21,7 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,4,0)
 #define RG_TARGET_NAMESPACE cScript
 #define _SELF(r) (RVAL2PANGOSCRIPT(r))
 
@@ -71,17 +70,14 @@ rg_get_gravity(int argc, VALUE *argv, VALUE self)
 gboolean    pango_language_includes_script  (PangoLanguage *language,
                                              PangoScript script);
 */
-#endif
 
 void
 Init_pango_script(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_SCRIPT, "Script", mPango);
 
     RG_DEF_SMETHOD(for_unichar, 1);
     RG_DEF_METHOD(sample_language, 0);
-#endif
 #if PANGO_CHECK_VERSION(1,16,0)
     RG_DEF_METHOD(get_gravity, -1);
 #endif

data/ext/pango/rbpangoscriptiter.c

@@ -21,8 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,4,0)
-
 /**********************************/
 static PangoScriptIter*
 rbpango_script_iter_copy(PangoScriptIter *ref)
@@ -82,16 +80,13 @@ rg_next_bang(VALUE self)
 {
     return CBOOL2RVAL(pango_script_iter_next(_SELF(self)));
 }
-#endif
 
 void
 Init_pango_script_iter(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_SCRIPT_ITER, "ScriptIter", mPango);
 
     RG_DEF_METHOD(initialize, 1);
     RG_DEF_METHOD(range, 0);
     RG_DEF_METHOD_BANG(next, 0);
-#endif
 }

data/test/{test_layout.rb → test-layout.rb}

@@ -17,4 +17,18 @@ class TestLayout < Test::Unit::TestCase
     @layout.font_description = description
     assert_equal("monospace 10", @layout.font_description.to_s)
   end
+
+  def test_height
+    assert_equal(-1, @layout.height)
+  end
+
+  def test_set_height
+    new_height = 29 * Pango::SCALE
+    @layout.height = new_height
+    assert_equal(new_height, @layout.height)
+  end
+
+  def test_ellipsized?
+    assert_false(@layout.ellipsized?)
+  end
 end

data/vendor/local/include/harfbuzz/hb-buffer.h

@@ -171,11 +171,11 @@ void
 hb_buffer_guess_segment_properties (hb_buffer_t *buffer);
 
 
-typedef enum {
-  HB_BUFFER_FLAGS_DEFAULT			= 0x00000000,
-  HB_BUFFER_FLAG_BOT				= 0x00000001, /* Beginning-of-text */
-  HB_BUFFER_FLAG_EOT				= 0x00000002, /* End-of-text */
-  HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES	= 0x00000004
+typedef enum { /*< flags >*/
+  HB_BUFFER_FLAG_DEFAULT			= 0x00000000u,
+  HB_BUFFER_FLAG_BOT				= 0x00000001u, /* Beginning-of-text */
+  HB_BUFFER_FLAG_EOT				= 0x00000002u, /* End-of-text */
+  HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES	= 0x00000004u
 } hb_buffer_flags_t;
 
 void
@@ -274,11 +274,11 @@ hb_buffer_normalize_glyphs (hb_buffer_t *buffer);
  * Serialize
  */
 
-typedef enum {
-  HB_BUFFER_SERIALIZE_FLAGS_DEFAULT		= 0x00000000,
-  HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS		= 0x00000001,
-  HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS		= 0x00000002,
-  HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES	= 0x00000004
+typedef enum { /*< flags >*/
+  HB_BUFFER_SERIALIZE_FLAG_DEFAULT		= 0x00000000u,
+  HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS		= 0x00000001u,
+  HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS		= 0x00000002u,
+  HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES	= 0x00000004u
 } hb_buffer_serialize_flags_t;
 
 typedef enum {

data/vendor/local/include/harfbuzz/hb-common.h

@@ -90,7 +90,7 @@ typedef union _hb_var_int_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)
@@ -131,7 +131,7 @@ hb_direction_to_string (hb_direction_t direction);
 
 /* 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
@@ -153,137 +153,153 @@ hb_language_get_default (void);
 /* 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'),
-
-  /* Unicode-2.0 additions */
-  HB_SCRIPT_TIBETAN			= HB_TAG ('T','i','b','t'),
-
-  /* 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'),
-
-  /* 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'),
-
-  /* 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'),
-
-  /* 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'),
-
-  /* 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'),
-
-  /* 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'),
-
-  /* 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'),
-
-  /* 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'),
-
-  /* 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'),
-
-  /* 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'),
-
-  /* No script set */
-  HB_SCRIPT_INVALID			= HB_TAG_NONE
+  /*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'),
+
+  /*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'),
+
+  /*2.0*/ HB_SCRIPT_TIBETAN			= HB_TAG ('T','i','b','t'),
+
+  /*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'),
+
+  /*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'),
+
+  /*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'),
+
+  /*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'),
+
+  /*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'),
+
+  /*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'),
+
+  /*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'),
+
+  /*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'),
+
+  /*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'),
+
+  /*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 */