pango 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54f4aa7420dec1d60f1f3bdd7d101827f8c1667e
-  data.tar.gz: 2e7c60821dc91347286182908a1f170df35d8e32
+  metadata.gz: 511180db9799f946c4a9662318093d662e099876
+  data.tar.gz: 7f213c633a383ba61bd139f634adbeb3c74caa0c
 SHA512:
-  metadata.gz: 339c2e74af470ea2150a3f3e2c966854ff4bf97e11c86d0201a8f5de12ea26137500d894fb7fc94e1fa5853ad454d2e9b7460eb09c3dbbaddd404a9c7bb1ea52
-  data.tar.gz: b0e969276075c7b20c443a1d657d4998610e8558da447b0b7c85e9f97b894f0323b4d36ae2a59c8fee38e13e67c5c8beb6b397fc3c73d792c7de6090460503cb
+  metadata.gz: 96e4cdbdd2cf927f4c29882047d0f84cc729d6e15f78163949b41c4b8f6fa2b3ec4c5408cc45f807ebb38aed032283ea9f68d5c9aa394e2352f88bf73b31a1ca
+  data.tar.gz: 0011b70b858328b54735d5905e83f9a47029bfd806c58e5ce7e3b6e0e36bf5498842ab104cd1ee98113f23e7902e71b41d67c9675b488e1c8963ed1da047bf30

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pango
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.0.9
 description: Ruby/Pango is a Ruby binding of pango-1.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -106,6 +106,7 @@ files:
 - test/test-analysis.rb
 - test/test-attribute.rb
 - test/test-color.rb
+- test/test-context.rb
 - test/test-language.rb
 - test/test-layout.rb
 - test/test-log-attr.rb
@@ -124,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="