pango 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c75aaa3b2c84becd0e4c4513adcf0e81d9cc9be
-  data.tar.gz: 298d5d938d320058fbac424e53ff52e9bd2409ce
+  metadata.gz: 81dda8d141ed08f5b87af59503e32fb3d25d4f34
+  data.tar.gz: f43b49f350c5cb009ddcfd29b8525089c72a3220
 SHA512:
-  metadata.gz: 6fdd25d2b63cffa6473b6fdb14ae1c8ac0293a98a6112207ef0d58b961132455b8ec1fd5a0cdeca885be2336e5f6d47d83356c811e34b2a320452e519957c62b
-  data.tar.gz: '0296e017cfb9465beef60c6474a155581d19785373d29172781f79396529dc184a4a26e4bea662c0e33830a198e2658418f1c3412e3f7650a0d3c6d4161cef4c'
+  metadata.gz: 04f1130e8d4283cbe97d4368ef50776115edd5963c76c05b6da4f9ebe0be9d5c9b9660c02feb35b4cc5fd63bea47f92730a9f746799bcd9d85013df2cd6aab7c
+  data.tar.gz: b92720c3c3260a78f91cd6ecb1eb6158b7d30c17e1ec132377b7e8fcbb0639e7577101ef9eb8045ff7ece17ba133a610adb2c3836fd9f95f96c7e1d93fc60c41

data/Rakefile

@@ -22,10 +22,18 @@ require "gnome2/rake/package-task"
 package_task = GNOME2::Rake::PackageTask.new do |package|
   package.summary = "Ruby/Pango is a Ruby binding of pango-1.x."
   package.description = "Ruby/Pango is a Ruby binding of pango-1.x."
-  package.dependency.gem.runtime = [["cairo", ">= 1.14.0"], "glib2"]
+  package.dependency.gem.runtime = [
+    ["cairo", ">= 1.14.0"],
+    "cairo-gobject",
+    "gobject-introspection",
+  ]
   package.windows.packages = []
   package.windows.dependencies = []
-  package.windows.build_dependencies = ["glib2", "gobject-introspection"]
+  package.windows.build_dependencies = [
+    "glib2",
+    "gobject-introspection",
+    "cairo-gobject",
+  ]
   package.external_packages = [
     {
       :name => "icu",
@@ -55,7 +63,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "harfbuzz",
       :download_site => :freedesktop,
       :label => "HarfBuzz",
-      :version => "1.4.1",
+      :version => "1.4.6",
       :compression_method => "bz2",
       :windows => {
         :configure_args => [
@@ -65,11 +73,25 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
         :built_file => "bin/libharfbuzz-0.dll",
       },
     },
+    {
+      :name => "graphene",
+      :download_site => :gnome,
+      :label => "Graphene",
+      :version => "1.6.0",
+      :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "--enable-introspection",
+          "--disable-benchmarks",
+        ],
+        :built_file => "bin/libgraphene-1.0-0.dll",
+      },
+    },
     {
       :name => "pango",
       :download_site => :gnome,
-      :label => "pango",
-      :version => "1.40.3",
+      :label => "Pango",
+      :version => "1.40.5",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/pango/depend

@@ -1,7 +1,7 @@
 install-so: install-headers
 install-headers:
-	$(INSTALL_DATA) $(srcdir)/rbpango.h $(RUBYARCHDIR)
-	$(INSTALL_DATA) $(srcdir)/rbpangoconversions.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) $(srcdir)/rb-pango.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) $(srcdir)/rb-pango-conversions.h $(RUBYARCHDIR)
 
 install: install-pc
 install-pc:

data/ext/pango/extconf.rb

@@ -1,19 +1,33 @@
-=begin
-extconf.rb for Ruby/Pango extention library
-=end
+#!/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
 
-require 'pathname'
+require "pathname"
 
 base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
 top_dir = base_dir.parent
 top_build_dir = Pathname(".").parent.parent.parent.expand_path
 
-mkmf_gnome2_dir = top_dir + "glib2" + 'lib'
+mkmf_gnome2_dir = top_dir + "glib2" + "lib"
 version_suffix = ""
 unless mkmf_gnome2_dir.exist?
-  if /(-\d+\.\d+\.\d+)(?:\.\d+)?\z/ =~ base_dir.basename.to_s
+  if /(-\d+\.\d+\.\d+)\z/ =~ base_dir.basename.to_s
     version_suffix = $1
-    mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + 'lib'
+    mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + "lib"
   end
 end
 
@@ -22,20 +36,16 @@ $LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
 module_name = "pango"
 package_id = "pango"
 
-begin
-  require 'mkmf-gnome2'
-rescue LoadError
-  require 'rubygems'
-  gem 'glib2'
-  require 'mkmf-gnome2'
-end
-
-ruby_header = "ruby.h"
-have_func("rb_errinfo", ruby_header)
+require "mkmf-gnome2"
 
-["glib2"].each do |package|
+depended_packages = [
+  "glib2",
+]
+depended_packages.each do |package|
   directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+  build_base_path = "#{directory}/tmp/#{RUBY_PLATFORM}"
+  package_library_name = package.gsub(/-/, "_")
+  build_dir = "#{build_base_path}/#{package_library_name}/#{RUBY_VERSION}"
   add_depend_package(package, "#{directory}/ext/#{package}",
                      top_dir.to_s,
                      :top_build_dir => top_build_dir.to_s,
@@ -49,15 +59,15 @@ end
 setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package([package_id, 1, 14, 0],
-                                   :altlinux => "libpango-devel",
+                                   :alt_linux => "libpango-devel",
                                    :debian => "libpango1.0-dev",
                                    :redhat => "pango-devel",
-                                   :arch => "pango",
+                                   :arch_linux => "pango",
                                    :homebrew => "pango",
                                    :macports => "pango")
   exit(false)
 end
-PKGConfig.have_package('pangocairo')
+PKGConfig.have_package("pangocairo")
 
 if PKGConfig.have_package("pangowin32")
   $defs << " -DHAVE_PANGO_WIN32"
@@ -67,15 +77,9 @@ if PKGConfig.have_package("pangoft2")
 end
 
 pango_header = "pango/pango.h"
-have_func("pango_layout_iter_get_type", pango_header)
-have_func("pango_render_part_get_type", pango_header)
 have_func("pango_attr_strikethrough_color_new", pango_header)
 have_func("pango_attr_underline_color_new", pango_header)
-have_func("pango_glyph_item_free", pango_header)
-have_func("pango_glyph_item_get_type", pango_header)
 have_func("pango_attr_iterator_get_attrs", pango_header)
-have_func("pango_itemize_with_base_dir", pango_header)
-have_func("pango_font_family_is_monospace", pango_header)
 
 create_pkg_config_file("Ruby/Pango", package_id)
 $defs << " -DRUBY_PANGO_COMPILATION"

data/ext/pango/pango.def

@@ -1,18 +1,2 @@
 EXPORTS
     Init_pango
-    mPango     DATA
-    attrstring DATA
-    pattr      DATA
-    pattrbool  DATA
-    pattrcolor DATA
-    pattrfloat DATA
-    pattrint   DATA
-    pango_add_attribute
-    pango_attr_iter_get_type
-    pango_get_attribute
-    pango_get_attribute_klass
-    pango_item_get_type
-    pango_layout_iter_get_type
-    pango_layout_line_get_type
-    pango_make_attribute
-    pango_rectangle_get_type

data/ext/pango/rb-pango-attr-list.c

@@ -0,0 +1,64 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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
+ */
+
+#include "rb-pango-private.h"
+
+#define RG_TARGET_NAMESPACE cAttrList
+
+static VALUE
+rg_insert(VALUE self, VALUE rb_attribute)
+{
+    PangoAttribute *attribute;
+
+    if (NIL_P(rb_attribute))
+        return self;
+
+    attribute = DATA_PTR(rb_attribute);
+    pango_attr_list_insert(RVAL2PANGOATTRLIST(self),
+                           pango_attribute_copy(attribute));
+
+    return self;
+}
+
+static VALUE
+rg_insert_before(VALUE self, VALUE rb_attribute)
+{
+    PangoAttribute *attribute;
+
+    if (NIL_P(rb_attribute))
+        return self;
+
+    attribute = DATA_PTR(rb_attribute);
+    pango_attr_list_insert_before(RVAL2PANGOATTRLIST(self),
+                                  pango_attribute_copy(attribute));
+
+    return self;
+}
+
+void
+rbpango_attr_list_init(VALUE mPango)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_ATTR_LIST, "AttrList", mPango);
+
+    RG_DEF_METHOD(insert, 1);
+    RG_DEF_METHOD(insert_before, 1);
+}

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

@@ -0,0 +1,147 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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
+ */
+
+#include "rb-pango-private.h"
+
+static VALUE
+rbpango_attribute_allocate(VALUE klass)
+{
+    return Data_Wrap_Struct(klass, NULL, pango_attribute_destroy, 0);
+}
+
+static VALUE
+rbpango_attr_font_desc_initialize(VALUE self, VALUE rb_font_desc)
+{
+    PangoFontDescription *font_desc;
+
+    if (RB_TYPE_P(rb_font_desc, RUBY_T_STRING)) {
+        VALUE mPango;
+        VALUE cPangoFontDescription;
+
+        mPango = rb_const_get(rb_cObject, rb_intern("Pango"));
+        cPangoFontDescription = rb_const_get(mPango,
+                                             rb_intern("FontDescription"));
+        rb_font_desc = rb_funcall(cPangoFontDescription,
+                                  rb_intern("new"), 1, rb_font_desc);
+    }
+    font_desc = RVAL2PANGOFONTDESCRIPTION(rb_font_desc);
+    DATA_PTR(self) = pango_attr_font_desc_new(font_desc);
+
+    return Qnil;
+}
+
+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));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_language_initialize(VALUE self, VALUE rb_language)
+{
+    PangoLanguage *language;
+
+    language = RVAL2PANGOLANGUAGE(rb_language);
+    DATA_PTR(self) = pango_attr_language_new(language);
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_shape_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE rb_ink_rect;
+    VALUE rb_logical_rect;
+    VALUE rb_data;
+    PangoRectangle *ink_rect;
+    PangoRectangle *logical_rect;
+
+    rb_scan_args(argc, argv, "21", &rb_ink_rect, &rb_logical_rect, &rb_data);
+
+    ink_rect = RVAL2PANGORECTANGLE(rb_ink_rect);
+    logical_rect = RVAL2PANGORECTANGLE(rb_logical_rect);
+
+    if (NIL_P(rb_data)) {
+        DATA_PTR(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);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_size_initialize(VALUE self, VALUE rb_size)
+{
+    gint size;
+
+    size = NUM2INT(rb_size);
+    DATA_PTR(self) = pango_attr_size_new(size);
+
+    return Qnil;
+}
+
+void
+rbpango_attribute_init(VALUE mPango)
+{
+    VALUE cAttribute;
+
+    cAttribute = rb_define_class_under(mPango, "Attribute", rb_cData);
+    rb_define_alloc_func(cAttribute, rbpango_attribute_allocate);
+
+#define DEFINE_ABSTRACT_ATTRIBUTE(ClassName)                            \
+    do {                                                                \
+        rb_define_class_under(mPango,                                   \
+                              #ClassName,                               \
+                              cAttribute);                              \
+    } while (FALSE)
+
+#define DEFINE_ATTRIBUTE(ClassName, method_name, n_initialize_args)     \
+    do {                                                                \
+        VALUE c ## ClassName;                                           \
+        c ## ClassName = rb_define_class_under(mPango,                  \
+                                               #ClassName,              \
+            cAttribute);                                                \
+        rb_define_method(c ## ClassName, "initialize",                  \
+                         rbpango_ ## method_name ## _initialize,        \
+                         n_initialize_args);                            \
+    } while (FALSE)
+
+    DEFINE_ABSTRACT_ATTRIBUTE(AttrBool);
+    DEFINE_ABSTRACT_ATTRIBUTE(AttrColor);
+    DEFINE_ABSTRACT_ATTRIBUTE(AttrFloat);
+    DEFINE_ATTRIBUTE(AttrFontDesc, attr_font_desc, 1);
+    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(AttrSize, attr_size, 1);
+    DEFINE_ABSTRACT_ATTRIBUTE(AttrString);
+
+#undef DEFINE_ABSTRACT_ATTRIBUTE
+#undef DEFINE_ATTRIBUTE
+}

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

@@ -0,0 +1,79 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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
+ */
+
+#include "rb-pango-private.h"
+
+#if PANGO_VERSION_CHECK(1, 18, 0)
+#  include <pango/pangocairo.h>
+#  include <rb_cairo.h>
+#endif
+
+#define RG_TARGET_NAMESPACE cContext
+
+#if PANGO_VERSION_CHECK(1, 18, 0)
+static void
+shape_renderer_callback(cairo_t *cr,
+                        PangoAttrShape *attr,
+                        gboolean do_path,
+                        gpointer data)
+{
+    VALUE rb_cr;
+    VALUE rb_mPango;
+    VALUE rb_cPangoAttrShape;
+    VALUE rb_attr;
+    VALUE rb_do_path;
+    VALUE rb_callback;
+    ID id_call;
+
+    rb_cr = CRCONTEXT2RVAL(cr);
+    rb_mPango = rb_const_get(rb_cObject, rb_intern("Pango"));
+    rb_cPangoAttrShape = rb_const_get(rb_mPango, rb_intern("AttrShape"));
+    rb_attr = Data_Wrap_Struct(rb_cPangoAttrShape,
+                               NULL,
+                               pango_attribute_destroy,
+                               pango_attribute_copy((PangoAttribute *)attr));
+    rb_do_path = CBOOL2RVAL(do_path);
+    rb_callback = (VALUE)data;
+    CONST_ID(id_call, "call");
+    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(RVAL2PANGOCONTEXT(self),
+                                           shape_renderer_callback,
+                                           (gpointer)func,
+                                           NULL);
+    return self;
+}
+#endif
+
+void
+rbpango_context_init(VALUE mPango)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = rb_const_get(mPango, rb_intern("Context"));
+
+    RG_DEF_METHOD(set_shape_renderer, 0);
+}