pango 3.0.8-x64-mingw32 → 3.0.9-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00ca31d83efcca6cdeee6872cf524a825761f3ad
-  data.tar.gz: 81f85d4c85c7eae08bd37af88fb2d1cb553e47a9
+  metadata.gz: 4779d9649978816b973d7e43fedaaa4fd14dcfc9
+  data.tar.gz: 9bd503a684880a5897f0cd55d56ab35eaea46319
 SHA512:
-  metadata.gz: 00ae7b3c5ec523f6c24e3237f5f1cc910eecbcea6792322e013673b0197c77e324f45f74fcbf8817e907d862c6589251b31e38e06f3f43aaec496e61ad0d10c6
-  data.tar.gz: cc26937be57062a890e11db225868cad9c3d82825ba848aa75bc7cd16bbe7d326de55205f0b15f5d7f2ab4e2a8a66b9e90d05f36b7066623af4f8c7915b7508a
+  metadata.gz: 6b60e33c83893383a759f5e17fc508c1e1cdf64fa3c704d8b8121eeb12726b1db7b218eef2c91a554c040e61626ab86d3688d88d13cafd03a9db9bd9795528e5
+  data.tar.gz: e66c6562de448bb51556f3aa8d86b6f34f0a03306f8afc821ab786a09e1d1f7ffac8ecd40ae45162bbad0b087bb6c2d88de2872b29a12367a3445e277ebdf41e

data/Rakefile

@@ -48,9 +48,9 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
     },
     {
       :name => "harfbuzz",
-      :download_base_url => "https://www.freedesktop.org/software/harfbuzz/release",
+      :download_site => :freedesktop,
       :label => "HarfBuzz",
-      :version => "1.2.4",
+      :version => "1.3.0",
       :compression_method => "bz2",
       :windows => {
         :configure_args => [
@@ -64,7 +64,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "pango",
       :download_site => :gnome,
       :label => "pango",
-      :version => "1.40.0",
+      :version => "1.40.1",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/pango/rbpangoattribute.c

@@ -229,6 +229,12 @@ attr_shape_value(VALUE self)
     return rb_ary_new3(2, attr_shape_ink_rect(self), attr_shape_logical_rect(self));
 }
 
+static VALUE
+attr_shape_data(VALUE self)
+{
+    return (VALUE)(((PangoAttrShape *)RVAL2ATTR(self))->data);
+}
+
 /*
  * Initialize methods
  */
@@ -464,6 +470,7 @@ Init_pango_attribute(VALUE mPango)
     rbg_define_method(tmpklass, "ink_rect", attr_shape_ink_rect, 0);
     rbg_define_method(tmpklass, "logical_rect", attr_shape_logical_rect, 0);
     rbg_define_method(tmpklass, "value", attr_shape_value, 0);
+    rbg_define_method(tmpklass, "data", attr_shape_data, 0);
     MAKE_ATTR(PANGO_ATTR_SCALE, AttrScale, pattrfloat, 1);
     /* PangoScale */
     rb_define_const(tmpklass, "XX_SMALL", rb_float_new(PANGO_SCALE_XX_SMALL));

data/ext/pango/rbpangoattrlist.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2016 Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2005 Masao Mutoh 
  *
  *  This library is free software; you can redistribute it and/or
@@ -64,7 +64,7 @@ rg_splice(VALUE self, VALUE other, VALUE pos, VALUE len)
 static gboolean
 filter_func(PangoAttribute *attr, gpointer data)
 {
-    return CBOOL2RVAL(rb_funcall((VALUE)data, id_call, 1, ATTR2RVAL(attr)));
+    return RVAL2CBOOL(rb_funcall((VALUE)data, id_call, 1, ATTR2RVAL(attr)));
 }
 
 static VALUE

data/ext/pango/rbpangocontext.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2016 Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2005 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -21,6 +21,8 @@
 
 #include "rbpangoprivate.h"
 
+static ID id_call;
+
 #define RG_TARGET_NAMESPACE cContext
 #define _SELF(self) (RVAL2PANGOCONTEXT(self))
 
@@ -33,26 +35,26 @@ rg_itemize(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "42", &arg1, &arg2, &arg3, &arg4, &arg5, &arg6);
 
     if (TYPE(arg1) == T_STRING) {
-        list = pango_itemize(_SELF(self), 
-                             RVAL2CSTR(arg1),      /* text */ 
-                             NUM2INT(arg2),        /* start_index */ 
+        list = pango_itemize(_SELF(self),
+                             RVAL2CSTR(arg1),      /* text */
+                             NUM2INT(arg2),        /* start_index */
                              NUM2INT(arg3),        /* length */
                              RVAL2PANGOATTRLIST(arg4), /* attrs */
                              NIL_P(arg5) ? NULL : RVAL2PANGOATTRITERATOR(arg5)); /* cached_iter */
     } else {
 #ifdef HAVE_PANGO_ITEMIZE_WITH_BASE_DIR
-        list = pango_itemize_with_base_dir(_SELF(self), 
+        list = pango_itemize_with_base_dir(_SELF(self),
                                            RVAL2PANGODIRECTION(arg1), /* base_dir */
-                                           RVAL2CSTR(arg2),      /* text */ 
-                                           NUM2INT(arg3),        /* start_index */ 
+                                           RVAL2CSTR(arg2),      /* text */
+                                           NUM2INT(arg3),        /* start_index */
                                            NUM2INT(arg4),        /* length */
                                            RVAL2PANGOATTRLIST(arg5), /* attrs */
                                            NIL_P(arg6) ? NULL : RVAL2PANGOATTRITERATOR(arg6)); /* cached_iter */
 #else
         rb_warn("Pango::Context#itemize(base_dir, text, start_index, length, attrs, cached_iter) isn't supported on this environment.");
-        list = pango_itemize(_SELF(self), 
-                             RVAL2CSTR(arg1),      /* text */ 
-                             NUM2INT(arg2),        /* start_index */ 
+        list = pango_itemize(_SELF(self),
+                             RVAL2CSTR(arg1),      /* text */
+                             NUM2INT(arg2),        /* start_index */
                              NUM2INT(arg3),        /* length */
                              RVAL2PANGOATTRLIST(arg4), /* attrs */
                              NIL_P(arg5) ? NULL : RVAL2PANGOATTRITERATOR(arg5)); /* cached_iter */
@@ -111,7 +113,7 @@ rg_language(VALUE self)
 static VALUE
 rg_set_language(VALUE self, VALUE lang)
 {
-    pango_context_set_language(_SELF(self), 
+    pango_context_set_language(_SELF(self),
                                RVAL2PANGOLANGUAGE(lang));
     return self;
 }
@@ -167,7 +169,7 @@ rg_matrix(VALUE self)
 static VALUE
 rg_set_matrix(VALUE self, VALUE matrix)
 {
-    pango_context_set_matrix(_SELF(self), 
+    pango_context_set_matrix(_SELF(self),
                              RVAL2PANGOMATRIX(matrix));
     return self;
 }
@@ -192,8 +194,8 @@ rg_get_metrics(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &desc, &lang);
 
-    return PANGOFONTMETRICS2RVAL(pango_context_get_metrics(_SELF(self), 
-                                                           RVAL2PANGOFONTDESCRIPTION(desc), 
+    return PANGOFONTMETRICS2RVAL(pango_context_get_metrics(_SELF(self),
+                                                           RVAL2PANGOFONTDESCRIPTION(desc),
                                                            NIL_P(lang) ? NULL : RVAL2PANGOLANGUAGE(lang)));
 }
 
@@ -253,6 +255,36 @@ rg_resolution(VALUE self)
 {
     return rb_float_new(pango_cairo_context_get_resolution(_SELF(self)));
 }
+
+static void
+shape_renderer_callback(cairo_t *cr,
+                        PangoAttrShape *attr,
+                        gboolean do_path,
+                        gpointer data)
+{
+    VALUE rb_cr;
+    VALUE rb_attr;
+    VALUE rb_do_path;
+    VALUE rb_callback;
+
+    rb_cr = CRCONTEXT2RVAL(cr);
+    rb_attr = ATTR2RVAL((PangoAttribute *)attr);
+    rb_do_path = CBOOL2RVAL(do_path);
+    rb_callback = (VALUE)data;
+    rb_funcall(rb_callback, id_call, 3, rb_cr, rb_attr, rb_do_path);
+}
+
+static VALUE
+rg_set_shape_renderer(VALUE self)
+{
+    VALUE func = rb_block_proc();
+    rb_iv_set(self, "@shape_renderer", func);
+    pango_cairo_context_set_shape_renderer(_SELF(self),
+                                           shape_renderer_callback,
+                                           (gpointer)func,
+                                           NULL);
+    return self;
+}
 #endif
 
 static VALUE
@@ -267,6 +299,8 @@ Init_pango_context(VALUE mPango)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_CONTEXT, "Context", mPango);
 
+    id_call = rb_intern("call");
+
     RG_DEF_METHOD(itemize, -1);
 
 #ifdef PANGO_ENABLE_BACKEND
@@ -298,6 +332,7 @@ Init_pango_context(VALUE mPango)
     RG_DEF_METHOD(font_options, 0);
     RG_DEF_METHOD(set_resolution, 1);
     RG_DEF_METHOD(resolution, 0);
+    RG_DEF_METHOD(set_shape_renderer, 0);
 #endif
 
     /* This will remove 2 or 3 releases later since 0.14.0. */

data/ext/pango/rbpangoglyphinfo.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2016  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -83,11 +83,11 @@ rg_geometry(VALUE self)
 static VALUE
 rg_set_geometry(VALUE self, VALUE width, VALUE x_offset, VALUE y_offset)
 {
-    PangoGlyphGeometry geo = _SELF(self)->geometry;
+    PangoGlyphGeometry *geo = &(_SELF(self)->geometry);
 
-    geo.width = NUM2INT(width);
-    geo.x_offset = NUM2INT(x_offset);
-    geo.y_offset = NUM2INT(y_offset);
+    geo->width = NUM2INT(width);
+    geo->x_offset = NUM2INT(x_offset);
+    geo->y_offset = NUM2INT(y_offset);
 
     return self;
 }

data/test/test-context.rb

@@ -0,0 +1,113 @@
+# Copyright (C) 2016  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
+
+class TestContext < Test::Unit::TestCase
+  include PangoTestUtils
+
+  def setup
+    font_map = Pango::CairoFontMap.default
+    @context = font_map.create_context
+  end
+
+  def test_set_font_map
+    font_map = Pango::CairoFontMap.default
+    @context.font_map = font_map
+    assert_equal(font_map, @context.font_map)
+  end
+
+  def test_set_font_description
+    description = Pango::FontDescription.new("monospace")
+    description.size = 10 * Pango::SCALE
+    @context.font_description = description
+    assert_equal("monospace 10", @context.font_description.to_s)
+  end
+
+  def test_set_language
+    @context.language = Pango::Language.new("fr")
+    assert_equal("fr", @context.language.to_s)
+  end
+
+  def test_set_base_dir
+    @context.base_dir = Pango::Context::DIRECTION_LTR
+    assert_equal(Pango::Context::DIRECTION_LTR, @context.base_dir)
+  end
+
+  def test_set_gravity
+    @context.gravity_hint = Pango::Gravity::HINT_STRONG
+    assert_equal(Pango::Gravity::HINT_STRONG, @context.gravity_hint)
+  end
+
+  def test_set_matrix
+    matrix = Pango::Matrix.new(0.1, 0.2, 0.3, 0.4, 0.5, 0.6)
+    @context.matrix = matrix
+    assert_equal(0.1, @context.matrix.xx)
+    assert_equal(0.2, @context.matrix.xy)
+    assert_equal(0.3, @context.matrix.yx)
+    assert_equal(0.4, @context.matrix.yy)
+    assert_equal(0.5, @context.matrix.x0)
+    assert_equal(0.6, @context.matrix.y0)
+  end
+
+  def test_load_font
+    description = Pango::FontDescription.new("monospace")
+    description.size = 10 * Pango::SCALE
+    font = @context.load_font(description)
+    assert_equal(10,
+                 (font.describe.size.to_f / Pango::SCALE).round)
+  end
+
+  def test_load_fontset
+    description = Pango::FontDescription.new("monospace")
+    description.size = 10 * Pango::SCALE
+    language = Pango::Language.new("fr")
+    fontset = @context.load_fontset(description, language)
+    a_unicode = GLib::UTF8.get_char("a")
+    font = fontset.get_font(a_unicode)
+    assert_equal(10,
+                 (font.describe.size.to_f / Pango::SCALE).round)
+  end
+
+  def test_get_metrics
+    description = Pango::FontDescription.new("monospace")
+    description.size = 10 * Pango::SCALE
+    language = Pango::Language.new("fr")
+    metrics = @context.get_metrics(description, language)
+    assert do
+      metrics.ascent > metrics.descent
+    end
+  end
+
+  def test_families
+    family_names = @context.families.collect(&:name)
+    assert do
+      family_names.include?("Monospace")
+    end
+  end
+
+  def test_font_options
+    options = Cairo::FontOptions.new
+    options.antialias = Cairo::Antialias::BEST
+    @context.font_options = options
+    assert_equal(Cairo::Antialias::BEST,
+                 @context.font_options.antialias)
+  end
+
+  def test_resolution
+    dpi = 72
+    @context.resolution = dpi
+    assert_equal(dpi, @context.resolution)
+  end
+end

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

@@ -304,12 +304,22 @@ typedef enum
   /*7.0*/ HB_SCRIPT_TIRHUTA			= HB_TAG ('T','i','r','h'),
   /*7.0*/ HB_SCRIPT_WARANG_CITI			= HB_TAG ('W','a','r','a'),
 
-  /*8.0*/ HB_SCRIPT_AHOM                        = HB_TAG ('A','h','o','m'),
-  /*8.0*/ HB_SCRIPT_ANATOLIAN_HIEROGLYPHS       = HB_TAG ('H','l','u','w'),
-  /*8.0*/ HB_SCRIPT_HATRAN                      = HB_TAG ('H','a','t','r'),
-  /*8.0*/ HB_SCRIPT_MULTANI                     = HB_TAG ('M','u','l','t'),
-  /*8.0*/ HB_SCRIPT_OLD_HUNGARIAN               = HB_TAG ('H','u','n','g'),
-  /*8.0*/ HB_SCRIPT_SIGNWRITING                 = HB_TAG ('S','g','n','w'),
+  /*8.0*/ HB_SCRIPT_AHOM			= HB_TAG ('A','h','o','m'),
+  /*8.0*/ HB_SCRIPT_ANATOLIAN_HIEROGLYPHS	= HB_TAG ('H','l','u','w'),
+  /*8.0*/ HB_SCRIPT_HATRAN			= HB_TAG ('H','a','t','r'),
+  /*8.0*/ HB_SCRIPT_MULTANI			= HB_TAG ('M','u','l','t'),
+  /*8.0*/ HB_SCRIPT_OLD_HUNGARIAN		= HB_TAG ('H','u','n','g'),
+  /*8.0*/ HB_SCRIPT_SIGNWRITING			= HB_TAG ('S','g','n','w'),
+
+  /*
+   * Since 1.3.0
+   */
+  /*9.0*/ HB_SCRIPT_ADLAM			= HB_TAG ('A','d','l','m'),
+  /*9.0*/ HB_SCRIPT_BHAIKSUKI			= HB_TAG ('B','h','k','s'),
+  /*9.0*/ HB_SCRIPT_MARCHEN			= HB_TAG ('M','a','r','c'),
+  /*9.0*/ HB_SCRIPT_OSAGE			= HB_TAG ('O','s','g','e'),
+  /*9.0*/ HB_SCRIPT_TANGUT			= HB_TAG ('T','a','n','g'),
+  /*9.0*/ HB_SCRIPT_NEWA			= HB_TAG ('N','e','w','a'),
 
   /* No script set. */
   HB_SCRIPT_INVALID				= HB_TAG_NONE,

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

@@ -449,33 +449,18 @@ HB_EXTERN hb_script_t
 hb_unicode_script (hb_unicode_funcs_t *ufuncs,
 		   hb_codepoint_t unicode);
 
-/**
- * hb_unicode_compose:
- *
- * Since: 0.9.2
- **/
 HB_EXTERN hb_bool_t
 hb_unicode_compose (hb_unicode_funcs_t *ufuncs,
 		    hb_codepoint_t      a,
 		    hb_codepoint_t      b,
 		    hb_codepoint_t     *ab);
 
-/**
- * hb_unicode_decompose:
- *
- * Since: 0.9.2
- **/
 HB_EXTERN hb_bool_t
 hb_unicode_decompose (hb_unicode_funcs_t *ufuncs,
 		      hb_codepoint_t      ab,
 		      hb_codepoint_t     *a,
 		      hb_codepoint_t     *b);
 
-/**
- * hb_unicode_decompose_compatibility:
- *
- * Since: 0.9.2
- **/
 HB_EXTERN unsigned int
 hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
 				    hb_codepoint_t      u,

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

@@ -37,10 +37,10 @@ HB_BEGIN_DECLS
 
 
 #define HB_VERSION_MAJOR 1
-#define HB_VERSION_MINOR 2
-#define HB_VERSION_MICRO 4
+#define HB_VERSION_MINOR 3
+#define HB_VERSION_MICRO 0
 
-#define HB_VERSION_STRING "1.2.4"
+#define HB_VERSION_STRING "1.3.0"
 
 #define HB_VERSION_ATLEAST(major,minor,micro) \
 	((major)*10000+(minor)*100+(micro) <= \

data/vendor/local/include/pango-1.0/pango/pango-features.h

@@ -4,9 +4,9 @@
 
 #define PANGO_VERSION_MAJOR 1
 #define PANGO_VERSION_MINOR 40
-#define PANGO_VERSION_MICRO 0
+#define PANGO_VERSION_MICRO 1
 
-#define PANGO_VERSION_STRING "1.40.0"
+#define PANGO_VERSION_STRING "1.40.1"
 
 
 #endif

data/vendor/local/lib/libharfbuzz-icu.la

@@ -23,9 +23,9 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib -L/ho
 weak_library_names=''
 
 # Version information for libharfbuzz-icu.
-current=10200
-age=10200
-revision=4
+current=10300
+age=10300
+revision=0
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libharfbuzz.la

@@ -23,9 +23,9 @@ dependency_libs=' -R/home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib -L/ho
 weak_library_names=''
 
 # Version information for libharfbuzz.
-current=10200
-age=10200
-revision=4
+current=10300
+age=10300
+revision=0
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libpango-1.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpango-1.0.
 current=4000
 age=4000
-revision=0
+revision=1
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libpangocairo-1.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpangocairo-1.0.
 current=4000
 age=4000
-revision=0
+revision=1
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libpangoft2-1.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpangoft2-1.0.
 current=4000
 age=4000
-revision=0
+revision=1
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libpangowin32-1.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpangowin32-1.0.
 current=4000
 age=4000
-revision=0
+revision=1
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/pkgconfig/harfbuzz-icu.pc

@@ -5,7 +5,7 @@ includedir=/home/vagrant/ruby-gnome2.win64/pango/vendor/local/include
 
 Name: harfbuzz
 Description: HarfBuzz text shaping library ICU integration
-Version: 1.2.4
+Version: 1.3.0
 
 Requires: harfbuzz
 Requires.private: icu-uc

data/vendor/local/lib/pkgconfig/harfbuzz.pc

@@ -5,7 +5,7 @@ includedir=/home/vagrant/ruby-gnome2.win64/pango/vendor/local/include
 
 Name: harfbuzz
 Description: HarfBuzz text shaping library
-Version: 1.2.4
+Version: 1.3.0
 
 Libs: -L${libdir} -lharfbuzz
 Libs.private:    

data/vendor/local/lib/pkgconfig/pango.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango
 Description: Internationalized text handling
-Version: 1.40.0
+Version: 1.40.1
 Requires: glib-2.0 gobject-2.0
 Libs: -L${libdir} -lpango-1.0
 Libs.private: -lm

data/vendor/local/lib/pkgconfig/pangocairo.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango Cairo
 Description: Cairo rendering support for Pango
-Version: 1.40.0
+Version: 1.40.1
 Requires: pango cairo
 Requires.private:  pangoft2 pangowin32
 Libs: -L${libdir} -lpangocairo-1.0

data/vendor/local/lib/pkgconfig/pangoft2.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango FT2 and Pango Fc
 Description: Freetype 2.0 and fontconfig font support for Pango
-Version: 1.40.0
+Version: 1.40.1
 Requires: pango freetype2 fontconfig
 Requires.private: harfbuzz
 Libs: -L${libdir} -lpangoft2-1.0

data/vendor/local/lib/pkgconfig/pangowin32.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango Win32
 Description: Win32 GDI font support for Pango
-Version: 1.40.0
+Version: 1.40.1
 Requires: pango
 Libs: -L${libdir} -lpangowin32-1.0
 Libs.private: -lgdi32 -lusp10