pango 3.2.5-x86-mingw32 → 3.2.6-x86-mingw32

data/ext/pango/rb-pango-attribute.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2017-2018  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,17 @@
 
 #include "rb-pango-private.h"
 
+static GType
+pango_attribute_get_type(void)
+{
+    static GType our_type = 0;
+    if (our_type == 0)
+        our_type = g_boxed_type_register_static("PangoAttribute",
+                                                (GBoxedCopyFunc)pango_attribute_copy,
+                                                (GBoxedFreeFunc)pango_attribute_destroy);
+    return our_type;
+}
+
 VALUE
 rbpango_attribute_to_ruby(PangoAttribute *attribute)
 {
@@ -30,26 +41,16 @@ rbpango_attribute_to_ruby(PangoAttribute *attribute)
     rb_attr_type = GENUM2RVAL(attribute->klass->type, PANGO_TYPE_ATTR_TYPE);
     CONST_ID(id_to_class, "to_class");
     klass = rb_funcall(rb_attr_type, id_to_class, 0);
-    return Data_Wrap_Struct(klass,
-                            NULL,
-                            pango_attribute_destroy,
-                            pango_attribute_copy(attribute));
+    return rbgobj_make_boxed_raw(pango_attribute_copy(attribute),
+                                 pango_attribute_get_type(),
+                                 klass,
+                                 0);
 }
 
 PangoAttribute *
 rbpango_attribute_from_ruby(VALUE rb_attribute)
 {
-    PangoAttribute *attribute;
-
-    Data_Get_Struct(rb_attribute, PangoAttribute, attribute);
-
-    return attribute;
-}
-
-static VALUE
-rbpango_attribute_allocate(VALUE klass)
-{
-    return Data_Wrap_Struct(klass, NULL, pango_attribute_destroy, 0);
+    return rbgobj_boxed_get(rb_attribute, pango_attribute_get_type());
 }
 
 static VALUE
@@ -68,7 +69,7 @@ rbpango_attr_language_initialize(VALUE self, VALUE rb_language)
     PangoLanguage *language;
 
     language = RVAL2PANGOLANGUAGE(rb_language);
-    DATA_PTR(self) = pango_attr_language_new(language);
+    G_INITIALIZE(self, pango_attr_language_new(language));
 
     return Qnil;
 }
@@ -76,7 +77,7 @@ rbpango_attr_language_initialize(VALUE self, VALUE rb_language)
 static VALUE
 rbpango_attr_family_initialize(VALUE self, VALUE rb_family)
 {
-    DATA_PTR(self) = pango_attr_family_new(RVAL2CSTR(rb_family));
+    G_INITIALIZE(self, pango_attr_family_new(RVAL2CSTR(rb_family)));
 
     return Qnil;
 }
@@ -84,7 +85,7 @@ rbpango_attr_family_initialize(VALUE self, VALUE rb_family)
 static VALUE
 rbpango_attr_style_initialize(VALUE self, VALUE rb_style)
 {
-    DATA_PTR(self) = pango_attr_style_new(RVAL2PANGOSTYLE(rb_style));
+    G_INITIALIZE(self, pango_attr_style_new(RVAL2PANGOSTYLE(rb_style)));
 
     return Qnil;
 }
@@ -102,7 +103,7 @@ rbpango_attr_style_get_value(VALUE self)
 static VALUE
 rbpango_attr_weight_initialize(VALUE self, VALUE rb_weight)
 {
-    DATA_PTR(self) = pango_attr_weight_new(RVAL2PANGOWEIGHT(rb_weight));
+    G_INITIALIZE(self, pango_attr_weight_new(RVAL2PANGOWEIGHT(rb_weight)));
 
     return Qnil;
 }
@@ -120,7 +121,7 @@ rbpango_attr_weight_get_value(VALUE self)
 static VALUE
 rbpango_attr_variant_initialize(VALUE self, VALUE rb_variant)
 {
-    DATA_PTR(self) = pango_attr_variant_new(RVAL2PANGOVARIANT(rb_variant));
+    G_INITIALIZE(self, pango_attr_variant_new(RVAL2PANGOVARIANT(rb_variant)));
 
     return Qnil;
 }
@@ -138,7 +139,7 @@ rbpango_attr_variant_get_value(VALUE self)
 static VALUE
 rbpango_attr_stretch_initialize(VALUE self, VALUE rb_stretch)
 {
-    DATA_PTR(self) = pango_attr_stretch_new(RVAL2PANGOSTRETCH(rb_stretch));
+    G_INITIALIZE(self, pango_attr_stretch_new(RVAL2PANGOSTRETCH(rb_stretch)));
 
     return Qnil;
 }
@@ -159,7 +160,7 @@ rbpango_attr_size_initialize(VALUE self, VALUE rb_size)
     gint size;
 
     size = NUM2INT(rb_size);
-    DATA_PTR(self) = pango_attr_size_new(size);
+    G_INITIALIZE(self, pango_attr_size_new(size));
 
     return Qnil;
 }
@@ -180,7 +181,7 @@ rbpango_attr_font_desc_initialize(VALUE self, VALUE rb_font_desc)
                                   rb_intern("new"), 1, rb_font_desc);
     }
     font_desc = RVAL2PANGOFONTDESCRIPTION(rb_font_desc);
-    DATA_PTR(self) = pango_attr_font_desc_new(font_desc);
+    G_INITIALIZE(self, pango_attr_font_desc_new(font_desc));
 
     return Qnil;
 }
@@ -191,9 +192,10 @@ rbpango_attr_foregound_initialize(VALUE self,
                                   VALUE rb_green,
                                   VALUE rb_blue)
 {
-    DATA_PTR(self) = pango_attr_foreground_new(NUM2UINT(rb_red),
-                                               NUM2UINT(rb_green),
-                                               NUM2UINT(rb_blue));
+    G_INITIALIZE(self,
+                 pango_attr_foreground_new(NUM2UINT(rb_red),
+                                           NUM2UINT(rb_green),
+                                           NUM2UINT(rb_blue)));
 
     return Qnil;
 }
@@ -204,9 +206,10 @@ rbpango_attr_background_initialize(VALUE self,
                                    VALUE rb_green,
                                    VALUE rb_blue)
 {
-    DATA_PTR(self) = pango_attr_background_new(NUM2UINT(rb_red),
-                                               NUM2UINT(rb_green),
-                                               NUM2UINT(rb_blue));
+    G_INITIALIZE(self,
+                 pango_attr_background_new(NUM2UINT(rb_red),
+                                           NUM2UINT(rb_green),
+                                           NUM2UINT(rb_blue)));
 
     return Qnil;
 }
@@ -214,7 +217,8 @@ rbpango_attr_background_initialize(VALUE self,
 static VALUE
 rbpango_attr_underline_initialize(VALUE self, VALUE rb_underline)
 {
-    DATA_PTR(self) = pango_attr_underline_new(RVAL2PANGOUNDERLINE(rb_underline));
+    G_INITIALIZE(self,
+                 pango_attr_underline_new(RVAL2PANGOUNDERLINE(rb_underline)));
 
     return Qnil;
 }
@@ -232,7 +236,8 @@ rbpango_attr_underline_get_value(VALUE self)
 static VALUE
 rbpango_attr_strikethrough_initialize(VALUE self, VALUE rb_strikethrough)
 {
-    DATA_PTR(self) = pango_attr_strikethrough_new(RVAL2CBOOL(rb_strikethrough));
+    G_INITIALIZE(self,
+                 pango_attr_strikethrough_new(RVAL2CBOOL(rb_strikethrough)));
 
     return Qnil;
 }
@@ -240,7 +245,7 @@ rbpango_attr_strikethrough_initialize(VALUE self, VALUE rb_strikethrough)
 static VALUE
 rbpango_attr_rise_initialize(VALUE self, VALUE rb_rise)
 {
-    DATA_PTR(self) = pango_attr_rise_new(NUM2INT(rb_rise));
+    G_INITIALIZE(self, pango_attr_rise_new(NUM2INT(rb_rise)));
 
     return Qnil;
 }
@@ -260,14 +265,15 @@ rbpango_attr_shape_initialize(int argc, VALUE *argv, VALUE self)
     logical_rect = RVAL2PANGORECTANGLE(rb_logical_rect);
 
     if (NIL_P(rb_data)) {
-        DATA_PTR(self) = pango_attr_shape_new(ink_rect, logical_rect);
+        G_INITIALIZE(self, pango_attr_shape_new(ink_rect, logical_rect));
     } else {
         G_RELATIVE(self, rb_data);
-        DATA_PTR(self) = pango_attr_shape_new_with_data(ink_rect,
-                                                        logical_rect,
-                                                        (gpointer)rb_data,
-                                                        NULL,
-                                                        NULL);
+        G_INITIALIZE(self,
+                     pango_attr_shape_new_with_data(ink_rect,
+                                                    logical_rect,
+                                                    (gpointer)rb_data,
+                                                    NULL,
+                                                    NULL));
     }
 
     return Qnil;
@@ -279,7 +285,7 @@ rbpango_attr_shape_get_data(VALUE self)
     PangoAttrShape *attr_shape;
     VALUE rb_data;
 
-    Data_Get_Struct(self, PangoAttrShape, attr_shape);
+    attr_shape = (PangoAttrShape *)rbpango_attribute_from_ruby(self);
     rb_data = (VALUE)(attr_shape->data);
     return rb_data;
 }
@@ -287,7 +293,7 @@ rbpango_attr_shape_get_data(VALUE self)
 static VALUE
 rbpango_attr_scale_initialize(VALUE self, VALUE rb_scale)
 {
-    DATA_PTR(self) = pango_attr_scale_new(NUM2DBL(rb_scale));
+    G_INITIALIZE(self, pango_attr_scale_new(NUM2DBL(rb_scale)));
 
     return Qnil;
 }
@@ -295,7 +301,7 @@ rbpango_attr_scale_initialize(VALUE self, VALUE rb_scale)
 static VALUE
 rbpango_attr_fallback_initialize(VALUE self, VALUE rb_enable_fallback)
 {
-    DATA_PTR(self) = pango_attr_fallback_new(RVAL2CBOOL(rb_enable_fallback));
+    G_INITIALIZE(self, pango_attr_fallback_new(RVAL2CBOOL(rb_enable_fallback)));
 
     return Qnil;
 }
@@ -303,7 +309,8 @@ rbpango_attr_fallback_initialize(VALUE self, VALUE rb_enable_fallback)
 static VALUE
 rbpango_attr_letter_spacing_initialize(VALUE self, VALUE rb_letter_spacing)
 {
-    DATA_PTR(self) = pango_attr_letter_spacing_new(NUM2INT(rb_letter_spacing));
+    G_INITIALIZE(self,
+                 pango_attr_letter_spacing_new(NUM2INT(rb_letter_spacing)));
 
     return Qnil;
 }
@@ -314,9 +321,10 @@ rbpango_attr_underline_color_initialize(VALUE self,
                                         VALUE rb_green,
                                         VALUE rb_blue)
 {
-    DATA_PTR(self) = pango_attr_underline_color_new(NUM2UINT(rb_red),
-                                                    NUM2UINT(rb_green),
-                                                    NUM2UINT(rb_blue));
+    G_INITIALIZE(self,
+                 pango_attr_underline_color_new(NUM2UINT(rb_red),
+                                                NUM2UINT(rb_green),
+                                                NUM2UINT(rb_blue)));
 
     return Qnil;
 }
@@ -327,9 +335,10 @@ rbpango_attr_strikethrough_color_initialize(VALUE self,
                                             VALUE rb_green,
                                             VALUE rb_blue)
 {
-    DATA_PTR(self) = pango_attr_strikethrough_color_new(NUM2UINT(rb_red),
-                                                        NUM2UINT(rb_green),
-                                                        NUM2UINT(rb_blue));
+    G_INITIALIZE(self,
+                 pango_attr_strikethrough_color_new(NUM2UINT(rb_red),
+                                                    NUM2UINT(rb_green),
+                                                    NUM2UINT(rb_blue)));
 
     return Qnil;
 }
@@ -337,7 +346,8 @@ rbpango_attr_strikethrough_color_initialize(VALUE self,
 static VALUE
 rbpango_attr_absolute_size_initialize(VALUE self, VALUE rb_absolute_size)
 {
-    DATA_PTR(self) = pango_attr_size_new_absolute(NUM2INT(rb_absolute_size));
+    G_INITIALIZE(self,
+                 pango_attr_size_new_absolute(NUM2INT(rb_absolute_size)));
 
     return Qnil;
 }
@@ -345,7 +355,7 @@ rbpango_attr_absolute_size_initialize(VALUE self, VALUE rb_absolute_size)
 static VALUE
 rbpango_attr_gravity_initialize(VALUE self, VALUE rb_gravity)
 {
-    DATA_PTR(self) = pango_attr_gravity_new(RVAL2PANGOGRAVITY(rb_gravity));
+    G_INITIALIZE(self, pango_attr_gravity_new(RVAL2PANGOGRAVITY(rb_gravity)));
 
     return Qnil;
 }
@@ -366,7 +376,7 @@ rbpango_attr_gravity_hint_initialize(VALUE self, VALUE rb_gravity_hint)
     PangoGravityHint hint;
 
     hint = RVAL2PANGOGRAVITYHINT(rb_gravity_hint);
-    DATA_PTR(self) = pango_attr_gravity_hint_new(hint);
+    G_INITIALIZE(self, pango_attr_gravity_hint_new(hint));
 
     return Qnil;
 }
@@ -384,7 +394,8 @@ rbpango_attr_gravity_hint_get_value(VALUE self)
 static VALUE
 rbpango_attr_font_features_initialize(VALUE self, VALUE rb_font_features)
 {
-    DATA_PTR(self) = pango_attr_font_features_new(RVAL2CSTR(rb_font_features));
+    G_INITIALIZE(self,
+                 pango_attr_font_features_new(RVAL2CSTR(rb_font_features)));
 
     return Qnil;
 }
@@ -392,7 +403,7 @@ rbpango_attr_font_features_initialize(VALUE self, VALUE rb_font_features)
 static VALUE
 rbpango_attr_foreground_alpha_initialize(VALUE self, VALUE rb_alpha)
 {
-    DATA_PTR(self) = pango_attr_foreground_alpha_new(NUM2UINT(rb_alpha));
+    G_INITIALIZE(self, pango_attr_foreground_alpha_new(NUM2UINT(rb_alpha)));
 
     return Qnil;
 }
@@ -400,7 +411,7 @@ rbpango_attr_foreground_alpha_initialize(VALUE self, VALUE rb_alpha)
 static VALUE
 rbpango_attr_background_alpha_initialize(VALUE self, VALUE rb_alpha)
 {
-    DATA_PTR(self) = pango_attr_background_alpha_new(NUM2UINT(rb_alpha));
+    G_INITIALIZE(self, pango_attr_background_alpha_new(NUM2UINT(rb_alpha)));
 
     return Qnil;
 }
@@ -440,8 +451,7 @@ rbpango_attribute_init(VALUE mPango)
     VALUE cAttrForegroundAlpha;
     VALUE cAttrBackgroundAlpha;
 
-    cAttribute = rb_define_class_under(mPango, "Attribute", rb_cData);
-    rb_define_alloc_func(cAttribute, rbpango_attribute_allocate);
+    cAttribute = G_DEF_CLASS(pango_attribute_get_type(), "Attribute", mPango);
 
 #define DEFINE_ABSTRACT_ATTRIBUTE_BEGIN(ClassName, parent) do { \
         c ## ClassName = rb_define_class_under(mPango,          \

data/ext/pango/rb-pango-conversions.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2017-2018  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -75,7 +75,7 @@ extern PangoAttribute *rbpango_attribute_from_ruby(VALUE rb_attribute);
 #define PANGOLOGATTR2RVAL(o)               (BOXED2RVAL(o, PANGO_TYPE_LOG_ATTR))
 #define RVAL2PANGOMATRIX(o)                ((PangoMatrix*)RVAL2BOXED(o, PANGO_TYPE_MATRIX))
 #define PANGOMATRIX2RVAL(o)                (BOXED2RVAL(o, PANGO_TYPE_MATRIX))
-#define RVAL2PANGORECTANGLE(o)             ((PangoRectangle *)DATA_PTR(o))
+#define RVAL2PANGORECTANGLE(o)             ((PangoRectangle *)rb_gi_struct_get_raw(o, G_TYPE_NONE))
 #define RVAL2PANGOSCRIPTITER(o)            ((PangoScriptIter*)RVAL2BOXED(o, PANGO_TYPE_SCRIPT_ITER))
 #define PANGOSCRIPTITER2RVAL(o)            (BOXED2RVAL(o, PANGO_TYPE_SCRIPT_ITER))
 #define RVAL2PANGOTABARRAY(o)              ((PangoTabArray*)RVAL2BOXED(o, PANGO_TYPE_TAB_ARRAY))
@@ -115,4 +115,4 @@ extern PangoAttribute *rbpango_attribute_from_ruby(VALUE rb_attribute);
 #define RVAL2PANGOFONTMASK(o)              (RVAL2GFLAGS(o, PANGO_TYPE_FONT_MASK))
 #define PANGOFONTMASK2RVAL(o)              (GFLAGS2RVAL(o, PANGO_TYPE_FONT_MASK))
 
-#define RVAL2PANGOATTR(o)                  (DATA_PTR(o))
+#define RVAL2PANGOATTR(o)                  (rbpango_attribute_from_ruby(o))

data/ext/pango/rb-pango-private.h

@@ -25,5 +25,4 @@
 G_GNUC_INTERNAL void rbpango_attribute_init(VALUE mPango);
 G_GNUC_INTERNAL void rbpango_attr_iterator_init(VALUE mPango);
 G_GNUC_INTERNAL void rbpango_attr_list_init(VALUE mPango);
-G_GNUC_INTERNAL void rbpango_context_init(VALUE mPango);
 G_GNUC_INTERNAL void rbpango_scale_init(VALUE mPango);

data/ext/pango/rb-pango.c

@@ -40,6 +40,5 @@ Init_pango(void)
     rbpango_attribute_init(RG_TARGET_NAMESPACE);
     rbpango_attr_iterator_init(RG_TARGET_NAMESPACE);
     rbpango_attr_list_init(RG_TARGET_NAMESPACE);
-    rbpango_context_init(RG_TARGET_NAMESPACE);
     rbpango_scale_init(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rb-pango.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2017-2018  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,7 @@
 #include <pango/pango.h>
 
 #include <rbgobject.h>
+#include <rb-gobject-introspection.h>
 
 #include "rb-pango-conversions.h"
 

data/lib/pango/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2017-2018  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -30,10 +30,22 @@ module Pango
         load_methods(info, klass)
       end
       require_libraries
+      convert_attribute_classes
+    end
+
+    def convert_attribute_classes
+      self.class.register_boxed_class_converter(Attribute.gtype) do |attribute|
+        attribute.klass.type.to_class
+      end
     end
 
     def load_struct_info(info)
       case info.name
+      when "AttrClass"
+        klass = self.class.define_struct(info.size,
+                                         info.name,
+                                         @base_module)
+        load_fields(info, klass)
       when /Class\z/
         super
       when "Attribute", /\AAttr[A-Z]/

data/lib/pango/rectangle.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2017-2018  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -28,5 +28,11 @@ module Pango
     def to_a
       [x, y, width, height]
     end
+
+    def dup
+      duplicated = self.class.new(x, y, width, height)
+      duplicated.taint if tainted?
+      duplicated
+    end
   end
 end

data/pango.gemspec

@@ -0,0 +1,43 @@
+# -*- ruby -*-
+#
+# Copyright (C) 2018  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require_relative "../glib2/version"
+
+Gem::Specification.new do |s|
+  s.name          = "pango"
+  s.summary       = "Ruby/Pango is a Ruby binding of pango-1.x."
+  s.description   = "Ruby/Pango is a Ruby binding of pango-1.x."
+  s.author        = "The Ruby-GNOME2 Project Team"
+  s.email         = "ruby-gnome2-devel-en@lists.sourceforge.net"
+  s.homepage      = "https://ruby-gnome2.osdn.jp/"
+  s.licenses      = ["LGPL-2.1+"]
+  s.version       = ruby_glib2_version
+  s.extensions    = ["ext/#{s.name}/extconf.rb"]
+  s.require_paths = ["lib"]
+  s.files = [
+    "COPYING.LIB",
+    "README.md",
+    "Rakefile",
+    "#{s.name}.gemspec",
+    "extconf.rb",
+    "ext/#{s.name}/depend",
+  ]
+  s.files += Dir.glob("lib/**/*.rb")
+  s.files += Dir.glob("ext/#{s.name}/*.{c,h,def,rb}")
+  s.files += Dir.glob("test/**/*")
+end

data/vendor/local/include/fribidi/fribidi-config.h

@@ -7,10 +7,10 @@
 #define FRIBIDI_NAME "GNU FriBidi"
 #define FRIBIDI_BUGREPORT "https://github.com/fribidi/fribidi/issues/new"
 
-#define FRIBIDI_VERSION "1.0.2"
+#define FRIBIDI_VERSION "1.0.3"
 #define FRIBIDI_MAJOR_VERSION 1
 #define FRIBIDI_MINOR_VERSION 0
-#define FRIBIDI_MICRO_VERSION 2
+#define FRIBIDI_MICRO_VERSION 3
 #define FRIBIDI_INTERFACE_VERSION 4
 #define FRIBIDI_INTERFACE_VERSION_STRING "4"
 

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

@@ -123,6 +123,8 @@ hb_blob_get_data (hb_blob_t *blob, unsigned int *length);
 HB_EXTERN char *
 hb_blob_get_data_writable (hb_blob_t *blob, unsigned int *length);
 
+HB_EXTERN hb_blob_t *
+hb_blob_create_from_file (const char *file_name);
 
 HB_END_DECLS
 

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

@@ -49,6 +49,16 @@
 #  include <inttypes.h>
 #elif defined (_AIX)
 #  include <sys/inttypes.h>
+#elif defined (_MSC_VER) && _MSC_VER < 1600
+/* VS 2010 (_MSC_VER 1600) has stdint.h */
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
 #else
 #  include <stdint.h>
 #endif
@@ -142,8 +152,8 @@ hb_language_get_default (void);
 
 /* hb_script_t */
 
-/* http://unicode.org/iso15924/ */
-/* http://goo.gl/x9ilM */
+/* https://unicode.org/iso15924/ */
+/* https://docs.google.com/spreadsheets/d/1Y90M0Ie3MUJ6UVCRDOypOtijlMDLNNyyLk36T6iMu0o */
 /* Unicode Character Database property: Script (sc) */
 typedef enum
 {
@@ -315,6 +325,17 @@ typedef enum
   /*10.0*/HB_SCRIPT_SOYOMBO			= HB_TAG ('S','o','y','o'),
   /*10.0*/HB_SCRIPT_ZANABAZAR_SQUARE		= HB_TAG ('Z','a','n','b'),
 
+  /*
+   * Since 1.8.0
+   */
+  /*11.0*/HB_SCRIPT_DOGRA			= HB_TAG ('D','o','g','r'),
+  /*11.0*/HB_SCRIPT_GUNJALA_GONDI		= HB_TAG ('G','o','n','g'),
+  /*11.0*/HB_SCRIPT_HANIFI_ROHINGYA		= HB_TAG ('R','o','h','g'),
+  /*11.0*/HB_SCRIPT_MAKASAR			= HB_TAG ('M','a','k','a'),
+  /*11.0*/HB_SCRIPT_MEDEFAIDRIN			= HB_TAG ('M','e','d','f'),
+  /*11.0*/HB_SCRIPT_OLD_SOGDIAN			= HB_TAG ('S','o','g','o'),
+  /*11.0*/HB_SCRIPT_SOGDIAN			= HB_TAG ('S','o','g','d'),
+
   /* No script set. */
   HB_SCRIPT_INVALID				= HB_TAG_NONE,
 
@@ -323,7 +344,7 @@ typedef enum
    * since technically enums are int, and indeed, hb_script_t ends up being signed.
    * See this thread for technicalities:
    *
-   *   http://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html
+   *   https://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html
    */
   _HB_SCRIPT_MAX_VALUE				= HB_TAG_MAX, /*< skip >*/
   _HB_SCRIPT_MAX_VALUE_SIGNED			= HB_TAG_MAX_SIGNED /*< skip >*/

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

@@ -37,6 +37,10 @@
 HB_BEGIN_DECLS
 
 
+HB_EXTERN unsigned int
+hb_face_count (hb_blob_t *blob);
+
+
 /*
  * hb_face_t
  */