pango 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81dda8d141ed08f5b87af59503e32fb3d25d4f34
-  data.tar.gz: f43b49f350c5cb009ddcfd29b8525089c72a3220
+  metadata.gz: 8c57ea7d52d980ae3b887f1f6abc7f00b9a86841
+  data.tar.gz: 85fe14530b41c09a0a1f30c2c1f0f73fe695cf6c
 SHA512:
-  metadata.gz: 04f1130e8d4283cbe97d4368ef50776115edd5963c76c05b6da4f9ebe0be9d5c9b9660c02feb35b4cc5fd63bea47f92730a9f746799bcd9d85013df2cd6aab7c
-  data.tar.gz: b92720c3c3260a78f91cd6ecb1eb6158b7d30c17e1ec132377b7e8fcbb0639e7577101ef9eb8045ff7ece17ba133a610adb2c3836fd9f95f96c7e1d93fc60c41
+  metadata.gz: 7e171882505f9dcbb917446a2c15f0cd2a6d8bc0ce98775447959e0f0416ab485dc3b82675e6acfe86b28b475c04629557efd38543273d17471b993a778fa9dd
+  data.tar.gz: 461292b4efa83ff59992661e343c7dfd33fc947f1e175540d49fdb01d337c66e3aa3ff0150a57bbd8fb439ab52376000e3b572093de9315db74868907b0e70a8

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

@@ -94,6 +94,18 @@ rbpango_attr_shape_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
+static VALUE
+rbpango_attr_shape_get_data(VALUE self)
+{
+    PangoAttrShape *attr_shape;
+    VALUE rb_data;
+
+    Data_Get_Struct(self, PangoAttrShape, attr_shape);
+    rb_data = (VALUE)(attr_shape->data);
+    rb_p(rb_data);
+    return rb_data;
+}
+
 static VALUE
 rbpango_attr_size_initialize(VALUE self, VALUE rb_size)
 {
@@ -120,8 +132,7 @@ rbpango_attribute_init(VALUE mPango)
                               cAttribute);                              \
     } while (FALSE)
 
-#define DEFINE_ATTRIBUTE(ClassName, method_name, n_initialize_args)     \
-    do {                                                                \
+#define DEFINE_ATTRIBUTE_BEGIN(ClassName, method_name, n_initialize_args)     \
         VALUE c ## ClassName;                                           \
         c ## ClassName = rb_define_class_under(mPango,                  \
                                                #ClassName,              \
@@ -129,7 +140,12 @@ rbpango_attribute_init(VALUE mPango)
         rb_define_method(c ## ClassName, "initialize",                  \
                          rbpango_ ## method_name ## _initialize,        \
                          n_initialize_args);                            \
-    } while (FALSE)
+
+#define DEFINE_ATTRIBUTE_END                    \
+
+#define DEFINE_ATTRIBUTE(ClassName, method_name, n_initialize_args)     \
+    DEFINE_ATTRIBUTE_BEGIN(ClassName, method_name, n_initialize_args) { \
+    } DEFINE_ATTRIBUTE_END;
 
     DEFINE_ABSTRACT_ATTRIBUTE(AttrBool);
     DEFINE_ABSTRACT_ATTRIBUTE(AttrColor);
@@ -138,7 +154,9 @@ rbpango_attribute_init(VALUE mPango)
     DEFINE_ATTRIBUTE(AttrFontFeatures, attr_font_features, 1);
     DEFINE_ABSTRACT_ATTRIBUTE(AttrInt);
     DEFINE_ATTRIBUTE(AttrLanguage, attr_language, 1);
-    DEFINE_ATTRIBUTE(AttrShape, attr_shape, -1);
+    DEFINE_ATTRIBUTE_BEGIN(AttrShape, attr_shape, -1) {
+        rb_define_method(cAttrShape, "data", rbpango_attr_shape_get_data, 0);
+    } DEFINE_ATTRIBUTE_END;
     DEFINE_ATTRIBUTE(AttrSize, attr_size, 1);
     DEFINE_ABSTRACT_ATTRIBUTE(AttrString);
 

data/ext/pango/rb-pango.c

@@ -20,13 +20,24 @@
 
 #include "rb-pango-private.h"
 
+#define RG_TARGET_NAMESPACE mPango
+
+static VALUE
+rg_s_pixels(G_GNUC_UNUSED VALUE self, VALUE pixels)
+{
+    return rb_float_new(PANGO_PIXELS(NUM2DBL(pixels)));
+}
+
 void
 Init_pango(void)
 {
-    VALUE mPango;
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = rb_define_module("Pango");
+
+    RG_DEF_SMETHOD(pixels, 1);
 
-    mPango = rb_define_module("Pango");
-    rbpango_attribute_init(mPango);
-    rbpango_attr_list_init(mPango);
-    rbpango_context_init(mPango);
+    rbpango_attribute_init(RG_TARGET_NAMESPACE);
+    rbpango_attr_list_init(RG_TARGET_NAMESPACE);
+    rbpango_context_init(RG_TARGET_NAMESPACE);
 }

data/lib/pango/deprecated.rb

@@ -15,6 +15,23 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Pango
+  extend GLib::Deprecatable
+
+  define_deprecated_enums :Alignment, "ALIGN"
+  define_deprecated_enums :CoverageLevel, "COVERAGE"
+  define_deprecated_enums :Direction, "DIRECTION"
+  define_deprecated_enums :WrapMode, "WRAP"
+  define_deprecated_enums :FontMask, "FONT_MASK"
+  define_deprecated_enums :Stretch, "STRETCH"
+  define_deprecated_enums :Style, "STYLE"
+  define_deprecated_enums :Variant, "VARIANT"
+  define_deprecated_enums :Weight, "WEIGHT"
+  define_deprecated_enums :TabAlign, "TAB"
+  define_deprecated_enums :Underline, "UNDERLINE"
+  define_deprecated_enums :Script, "SCRIPT"
+  define_deprecated_enums :EllipsizeMode, "ELLIPSIZE"
+  define_deprecated_enums :RenderPart, "PART"
+
   class Context
     extend GLib::Deprecatable
 
@@ -31,7 +48,10 @@ module Pango
     extend GLib::Deprecatable
 
     define_deprecated_enums :Alignment, "ALIGN"
+    define_deprecated_const :Alignment, "Pango::Alignment"
     define_deprecated_enums :WrapMode, "WRAP"
+    define_deprecated_const :WrapMode, "Pango::WrapMode"
     define_deprecated_enums :EllipsizeMode, "ELLIPSIZE"
+    define_deprecated_const :EllipsizeMode, "Pango::EllipsizeMode"
   end
 end

data/lib/pango/layout.rb

@@ -28,13 +28,13 @@ module Pango
 
     alias_method :set_text_raw, :set_text
     def set_text(text)
-      set_text_raw(text, text.length)
+      set_text_raw(text, text.bytesize)
     end
     alias_method :text=, :set_text
 
     alias_method :set_markup_raw, :set_markup
     def set_markup(markup)
-      set_markup_raw(markup, markup.length)
+      set_markup_raw(markup, markup.bytesize)
     end
     alias_method :markup=, :set_markup
   end

data/lib/pango/loader.rb

@@ -49,6 +49,14 @@ module Pango
       end
     end
 
+    def load_field_reader(info, i, field_info, klass, name, method_name)
+      case klass.name
+      when "Pango::AttrShape"
+        return if klass.method_defined?(method_name)
+      end
+      super
+    end
+
     def load_method_info(info, klass, method_name)
       case klass.name
       when "Pango::Matrix"

data/test/test-layout.rb

@@ -39,14 +39,14 @@ class TestLayout < Test::Unit::TestCase
   end
 
   def test_set_text
-    text = "Hello <b>World</b>!"
+    text = "こんにちは <b>World</b>!"
     @layout.text = text
     assert_equal(text, @layout.text)
   end
 
   def test_set_markup
-    markup = "Hello <b>World</b>!"
+    markup = "こんにちは <b>World</b>!"
     @layout.markup = markup
-    assert_equal("Hello World!", @layout.text)
+    assert_equal("こんにちは World!", @layout.text)
   end
 end

data/test/test-pango.rb

@@ -0,0 +1,23 @@
+# Copyright (C) 2017  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 TestPango < Test::Unit::TestCase
+  include PangoTestUtils
+
+  def test_pixels
+    assert_in_delta(29, Pango.pixels(29 * Pango::SCALE), 0.00001)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pango
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
 description: Ruby/Pango is a Ruby binding of pango-1.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -97,6 +97,7 @@ files:
 - test/test-log-attr.rb
 - test/test-markup.rb
 - test/test-matrix.rb
+- test/test-pango.rb
 - test/test-rectangle.rb
 - test/test-version.rb
 homepage: http://ruby-gnome2.sourceforge.jp/