pango 3.1.1 → 3.1.2

data/lib/pango/language.rb

@@ -0,0 +1,29 @@
+# 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
+
+module Pango
+  class Language
+    class << self
+      def new(name=nil)
+        if name
+          from_string(name)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/pango/layout.rb

@@ -0,0 +1,41 @@
+# 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
+
+module Pango
+  class Layout
+    alias_method :set_font_description_raw, :set_font_description
+    def set_font_description(description)
+      unless description.is_a?(FontDescription)
+        description = FontDescription.new(description)
+      end
+      set_font_description_raw(description)
+    end
+    remove_method :font_description=
+    alias_method :font_description=, :set_font_description
+
+    alias_method :set_text_raw, :set_text
+    def set_text(text)
+      set_text_raw(text, text.length)
+    end
+    alias_method :text=, :set_text
+
+    alias_method :set_markup_raw, :set_markup
+    def set_markup(markup)
+      set_markup_raw(markup, markup.length)
+    end
+    alias_method :markup=, :set_markup
+  end
+end

data/lib/pango/loader.rb

@@ -0,0 +1,87 @@
+# 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
+
+module Pango
+  class Loader < GObjectIntrospection::Loader
+    private
+    def pre_load(repository, namespace)
+      @pending_attribute_infos = []
+    end
+
+    def post_load(repository, namespace)
+      require_extension
+      @pending_attribute_infos.each do |info|
+        name = rubyish_class_name(info)
+        klass = @base_module.const_get(name)
+        load_fields(info, klass)
+        load_methods(info, klass)
+      end
+      require_libraries
+    end
+
+    def load_struct_info(info)
+      case info.name
+      when /Class\z/
+        super
+      when "Attribute"
+        @pending_attribute_infos << info
+      when /\AAttr[A-Z]/
+        if info.name == "AttrIterator"
+          super
+        else
+          @pending_attribute_infos << info
+        end
+      else
+        super
+      end
+    end
+
+    def load_method_info(info, klass, method_name)
+      case klass.name
+      when "Pango::Matrix"
+        case method_name
+        when "translate", "scale", "rotate", "concat"
+          method_name += "!"
+        end
+      when "Pango::AttrList"
+        return if klass.method_defined?(method_name)
+      end
+      super(info, klass, method_name)
+    end
+
+    def require_extension
+      begin
+        major, minor, _ = RUBY_VERSION.split(/\./)
+        require "#{major}.#{minor}/pango.so"
+      rescue LoadError
+        require "pango.so"
+      end
+    end
+
+    def require_libraries
+      require "pango/color"
+      require "pango/font-description"
+      require "pango/language"
+      require "pango/layout"
+      require "pango/rectangle"
+      require "pango/markup"
+      require "pango/matrix"
+      require "pango/version"
+
+      require "pango/deprecated"
+    end
+  end
+end

data/lib/pango/markup.rb

@@ -0,0 +1,31 @@
+# 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
+
+module Pango
+  class << self
+    alias_method :parse_markup_raw, :parse_markup
+    def parse_markup(markup_text, accel_marker=nil)
+      success, attr_list, text, accel_char =
+        parse_markup_raw(markup_text,
+                         markup_text.bytesize,
+                         accel_marker)
+      return nil unless success
+
+      accel_char = nil if accel_char.empty?
+      [attr_list, text, accel_char]
+    end
+  end
+end

data/lib/pango/matrix.rb

@@ -0,0 +1,64 @@
+# 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
+
+module Pango
+  class Matrix
+    alias_method :initialize_raw, :initialize
+    def initialize(xx=nil, xy=nil, yx=nil, yy=nil, x0=nil, y0=nil)
+      initialize_raw
+      self.xx = xx || 1.0
+      self.xy = xy || 0.0
+      self.yx = yx || 0.0
+      self.yy = yy || 1.0
+      self.x0 = x0 || 0.0
+      self.y0 = y0 || 0.0
+    end
+
+    def to_a
+      [
+        xx, xy,
+        yx, yy,
+        x0,
+        y0,
+      ]
+    end
+
+    def translate(tx, ty)
+      copied_matrix = dup
+      copied_matrix.translate!(tx, ty)
+      copied_matrix
+    end
+
+    def scale(scale_x, scale_y)
+      copied_matrix = dup
+      copied_matrix.scale!(scale_x, scale_y)
+      copied_matrix
+    end
+
+    def rotate(degree)
+      copied_matrix = dup
+      copied_matrix.rotate!(degree)
+      copied_matrix
+    end
+
+    def concat(matrix)
+      copied_matrix = dup
+      copied_matrix.concat!(matrix)
+      copied_matrix
+    end
+    alias_method :+, :concat
+  end
+end

data/lib/pango/rectangle.rb

@@ -0,0 +1,28 @@
+# 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
+
+module Pango
+  class Rectangle
+    alias_method :initialize_raw, :initialize
+    def initialize(x, y, width, height)
+      initialize_raw
+      self.x = x
+      self.y = y
+      self.width = width
+      self.height = height
+    end
+  end
+end

data/lib/pango/version.rb

@@ -0,0 +1,30 @@
+# 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
+
+module Pango
+  module Version
+    STRING = Pango.version_string
+    MAJOR, MINOR, MICRO = STRING.split(".").collect(&:to_i)
+
+    class << self
+      def or_later?(major, minor, micro=nil)
+        micro ||= 0
+        message = Pango.version_check(major, minor, micro)
+        message.nil?
+      end
+    end
+  end
+end

data/test/pango-test-utils.rb

@@ -1,9 +1,9 @@
 module PangoTestUtils
-  private
-  def only_pango_version(major, minor, micro=nil)
-    micro ||= 0
-    unless Pango.check_version?(major, minor, micro)
-      omit("Require Pango >= #{major}.#{minor}.#{micro}")
-    end
-  end
+ private
+ def only_pango_version(major, minor, micro=nil)
+   micro ||= 0
+   unless Pango::Version.or_later?(major, minor, micro)
+     omit("Require Pango >= #{major}.#{minor}.#{micro}")
+   end
+ end
 end

data/test/run-test.rb

@@ -1,4 +1,20 @@
 #!/usr/bin/env ruby
+#
+# 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
 
 $VERBOSE = true
 
@@ -6,23 +22,33 @@ ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
 ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
 
 glib_base = File.join(ruby_gnome2_base, "glib2")
+gobject_introspection_base = File.join(ruby_gnome2_base, "gobject-introspection")
+cairo_gobject_base = File.join(ruby_gnome2_base, "cairo-gobject")
 pango_base = File.join(ruby_gnome2_base, "pango")
 
 $LOAD_PATH.unshift(File.join(glib_base, "test"))
-require 'glib-test-init'
 
-[[glib_base, "glib2"],
- [pango_base, "pango"]].each do |target, module_name|
-  if system("which make > /dev/null")
-    `make -C #{target.dump} > /dev/null` or exit(1)
+modules = [
+  [glib_base, "glib2"],
+  [gobject_introspection_base, "gobject-introspection"],
+  [cairo_gobject_base, "cairo-gobject"],
+  [pango_base, "pango"],
+]
+modules.each do |target, module_name|
+  makefile = File.join(target, "Makefile")
+  if File.exist?(makefile) and system("which make > /dev/null")
+    `make -C #{target.dump} > /dev/null` or exit(false)
+     $LOAD_PATH.unshift(File.join(target, "ext", module_name))
   end
-  $LOAD_PATH.unshift(File.join(target, "ext", module_name))
   $LOAD_PATH.unshift(File.join(target, "lib"))
 end
 
+$LOAD_PATH.unshift(File.join(glib_base, "test"))
+require "glib-test-init"
+
 $LOAD_PATH.unshift(File.join(pango_base, "test"))
-require 'pango-test-utils'
+require "pango-test-utils"
 
-require 'pango'
+require "pango"
 
 exit Test::Unit::AutoRunner.run(true, File.join(pango_base, "test"))

data/test/test-attr-list.rb

@@ -0,0 +1,28 @@
+# 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 TestAttrList < Test::Unit::TestCase
+  include PangoTestUtils
+
+  def setup
+    @attrs = Pango::AttrList.new
+  end
+
+  def test_insert
+    attribute = Pango::AttrLanguage.new(Pango::Language.default)
+    @attrs.insert(attribute)
+  end
+end

data/test/test-color.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-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

data/test/test-context.rb

@@ -41,13 +41,13 @@ class TestContext < Test::Unit::TestCase
   end
 
   def test_set_base_dir
-    @context.base_dir = Pango::Context::DIRECTION_LTR
-    assert_equal(Pango::Context::DIRECTION_LTR, @context.base_dir)
+    @context.base_dir = :ltr
+    assert_equal(Pango::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)
+    @context.gravity_hint = :strong
+    assert_equal(Pango::GravityHint::STRONG, @context.gravity_hint)
   end
 
   def test_set_matrix