pango 3.1.1-x64-mingw32 → 3.1.2-x64-mingw32

data/ext/pango/{rbpangoconversions.h → rb-pango-conversions.h}

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  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
@@ -18,8 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#ifndef __PANGOCONVERSIONS_H__
-#define __PANGOCONVERSIONS_H__
+#pragma once
 
 #define RVAL2PANGOCAIROFONTMAP(o)          (PANGO_CAIRO_FONT_MAP(RVAL2GOBJ(o)))
 #define RVAL2PANGOCONTEXT(o)               (PANGO_CONTEXT(RVAL2GOBJ(o)))
@@ -67,8 +66,7 @@
 #define PANGOLOGATTR2RVAL(o)               (BOXED2RVAL(o, PANGO_TYPE_LOG_ATTR))
 #define RVAL2PANGOMATRIX(o)                ((PangoMatrix*)RVAL2BOXED(o, PANGO_TYPE_MATRIX))
 #define PANGOMATRIX2RVAL(o)                (BOXED2RVAL(o, PANGO_TYPE_MATRIX))
-#define RVAL2PANGORECTANGLE(o)             ((PangoRectangle*)RVAL2BOXED(o, PANGO_TYPE_RECTANGLE))
-#define PANGORECTANGLE2RVAL(o)             (BOXED2RVAL(o, PANGO_TYPE_RECTANGLE))
+#define RVAL2PANGORECTANGLE(o)             ((PangoRectangle *)DATA_PTR(o))
 #define RVAL2PANGOSCRIPTITER(o)            ((PangoScriptIter*)RVAL2BOXED(o, PANGO_TYPE_SCRIPT_ITER))
 #define PANGOSCRIPTITER2RVAL(o)            (BOXED2RVAL(o, PANGO_TYPE_SCRIPT_ITER))
 #define RVAL2PANGOTABARRAY(o)              ((PangoTabArray*)RVAL2BOXED(o, PANGO_TYPE_TAB_ARRAY))
@@ -108,4 +106,4 @@
 #define RVAL2PANGOFONTMASK(o)              (RVAL2GFLAGS(o, PANGO_TYPE_FONT_MASK))
 #define PANGOFONTMASK2RVAL(o)              (GFLAGS2RVAL(o, PANGO_TYPE_FONT_MASK))
 
-#endif /* __PANGOCONVERSIONS_H__ */
+#define RVAL2PANGOATTR(o)                  (DATA_PTR(o))

data/ext/pango/rb-pango-private.h

@@ -0,0 +1,27 @@
+/* -*- 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
+ */
+
+#pragma once
+
+#include "rb-pango.h"
+
+G_GNUC_INTERNAL void rbpango_attribute_init(VALUE mPango);
+G_GNUC_INTERNAL void rbpango_attr_list_init(VALUE mPango);
+G_GNUC_INTERNAL void rbpango_context_init(VALUE mPango);

data/ext/pango/rb-pango.c

@@ -0,0 +1,32 @@
+/* -*- 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"
+
+void
+Init_pango(void)
+{
+    VALUE mPango;
+
+    mPango = rb_define_module("Pango");
+    rbpango_attribute_init(mPango);
+    rbpango_attr_list_init(mPango);
+    rbpango_context_init(mPango);
+}

data/ext/pango/rb-pango.h

@@ -0,0 +1,29 @@
+/* -*- 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
+ */
+
+#pragma once
+
+#include <pango/pango.h>
+
+#include <rbgobject.h>
+
+#include "rb-pango-conversions.h"
+
+extern void Init_pango(void);

data/extconf.rb

@@ -1,18 +1,34 @@
 #!/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 'mkmf'
-require 'rbconfig'
-require 'fileutils'
+require "pathname"
+require "mkmf"
+require "rbconfig"
+require "fileutils"
 
 package = "pango"
 
 base_dir = Pathname(__FILE__).dirname.expand_path
 ext_dir = base_dir + "ext" + package
-mkmf_gnome2_dir = base_dir + 'lib'
+mkmf_gnome2_dir = base_dir + "lib"
 
-ruby = File.join(RbConfig::CONFIG['bindir'],
-                 RbConfig::CONFIG['ruby_install_name'] +
+ruby = File.join(RbConfig::CONFIG["bindir"],
+                 RbConfig::CONFIG["ruby_install_name"] +
                  RbConfig::CONFIG["EXEEXT"])
 
 build_dir = Pathname("ext") + package
@@ -24,7 +40,7 @@ create_makefile(package)
 FileUtils.mv("Makefile", "Makefile.lib")
 
 File.open("Makefile", "w") do |makefile|
-  makefile.puts(<<-EOM)
+  makefile.puts(<<-MAKEFILE)
 all:
 	(cd ext/#{package} && $(MAKE))
 	$(MAKE) -f Makefile.lib
@@ -45,5 +61,5 @@ distclean:
 	(cd ext/#{package} && $(MAKE) distclean)
 	$(MAKE) -f Makefile.lib distclean
 	@rm -f Makefile.lib
-EOM
+  MAKEFILE
 end

data/lib/pango.rb

@@ -1,84 +1,40 @@
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
 #
-# pango.rb
-# Copyright(C) 2005-2015 Ruby-GNOME2 Project.
+# 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 program is licenced under the same
-# license of Ruby-GNOME2.
+# 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 'glib2'
-require 'cairo'
+require "gobject-introspection"
+require "cairo"
+require "cairo-gobject"
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_dll_path(vendor_bin_dir)
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/pango.so"
-rescue LoadError
-  require "pango.so"
-end
+vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
+GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
 
-if vendor_dir.exist?
-  begin
-    require "gobject-introspection"
-    vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
-    GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
-  rescue LoadError
-  end
-end
+require "pango/loader"
+require "pango/cairo-loader"
 
 module Pango
   LOG_DOMAIN = "Pango"
+  GLib::Log.set_log_domain(LOG_DOMAIN)
 
-  class AttrList
-    def each(text = nil)
-      iter = iterator
-      begin
-        if text
-          s, e = iter.range
-          yield(iter, text[s, e - s], s, e)
-        else
-          yield(iter)
-        end
-      end while iter.next!
-    end
-  end
-
-  # [[klass, prefix], ....]]
-  targets = [[Layout::Alignment, "ALIGN_"], [AttrScale, "SCALE_"], 
-    [Coverage::Level, "COVERAGE_"], [Context::Direction, "DIRECTION_"],
-    [Layout::WrapMode, "WRAP_"], [FontDescription::FontMask, "FONT_MASK_"], 
-    [FontDescription::Stretch, "STRETCH_"], [FontDescription::Style, "STYLE_"],
-    [FontDescription::Variant, "VARIANT_"], [FontDescription::Weight, "WEIGHT_"], 
-    [TabArray::TabAlign, "TAB_"],
-    [AttrUnderline::Underline, "UNDERLINE_"]]
+  loader = Loader.new(self)
+  loader.load("Pango")
 
-  targets << [Script, "SCRIPT_"] if defined? Script
-  targets << [Layout::EllipsizeMode, "ELLIPSIZE_"] if defined? Layout::EllipsizeMode
-  targets << [Renderer::Part, "PART_"] if defined? Renderer::Part
-
-  targets.each do |klass, prefix|
-    (klass.constants - klass.superclass.constants).each do |name|
-      unless klass.const_get(name).is_a? Class
-	const_set("#{prefix}#{name}", klass.const_get(name))
-      end
-    end
-  end
-  
-  module Version
-    MAJOR, MINOR, MICRO = BUILD_VERSION
-    STRING = Pango.version_string
-
-    class << self
-      def or_later?(major, minor, micro = nil)
-        micro || 0
-        error_message = Pango.check_version(major, minor, micro)
-        error_message.nil?
-      end
-    end
-  end
+  cairo_loader = CairoLoader.new(self)
+  cairo_loader.load("PangoCairo")
 end
-
-GLib::Log.set_log_domain(Pango::LOG_DOMAIN)

data/lib/pango/cairo-loader.rb

@@ -0,0 +1,63 @@
+# 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 CairoLoader < GObjectIntrospection::Loader
+    private
+    def pre_load(repository, namespace)
+      @context_class = @base_module.const_get(:Context)
+    end
+
+    def rubyish_class_name(info)
+      "Cairo#{super}"
+    end
+
+    def load_function_info(info)
+      case info.name
+      when /\Acontext_get_(.+)\z/
+        method_name = $1
+        define_method(info, @context_class, method_name)
+      when /\Acontext_set_(.+)\z/
+        method_base_name = $1
+        setter_method_name = "set_#{method_base_name}"
+        if @context_class.method_defined?(setter_method_name)
+          # ignore
+          return
+        end
+        define_method(info, @context_class, setter_method_name)
+        if info.n_args == 2
+          equal_method_name = "#{method_base_name}="
+          remove_existing_method(@context_class, equal_method_name)
+          @context_class.__send__(:alias_method,
+                                  equal_method_name,
+                                  setter_method_name)
+        end
+      when /\Afont_map_/
+        # ignore
+      when /\Acreate_(.+)\z/
+        define_method(info, Cairo::Context, "create_pango_#{$1}")
+      when /\A(.+_path)\z/
+        define_method(info, Cairo::Context, "pango_#{$1}")
+      when /\Ashow_(.+)\z/
+        define_method(info, Cairo::Context, "show_pango_#{$1}")
+      when /\Aupdate_(.+)\z/
+        define_method(info, Cairo::Context, "update_pango_#{$1}")
+      else
+        warn("Unsupported PangoCairo function: #{info.name}")
+      end
+    end
+  end
+end

data/lib/pango/color.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 Color
+    alias_method :initialize_raw, :initialize
+    def initialize(red, green, blue)
+      initialize_raw
+      self.red = red
+      self.green = green
+      self.blue = blue
+    end
+
+    def to_a
+      [red, green, blue]
+    end
+  end
+end

data/lib/pango/deprecated.rb

@@ -0,0 +1,37 @@
+# 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 Context
+    extend GLib::Deprecatable
+
+    define_deprecated_enums :Direction, "DIRECTION"
+  end
+
+  class Gravity
+    extend GLib::Deprecatable
+
+    define_deprecated_enums :GravityHint, "HINT"
+  end
+
+  class Layout
+    extend GLib::Deprecatable
+
+    define_deprecated_enums :Alignment, "ALIGN"
+    define_deprecated_enums :WrapMode, "WRAP"
+    define_deprecated_enums :EllipsizeMode, "ELLIPSIZE"
+  end
+end

data/lib/pango/font-description.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 FontDescription
+    class << self
+      def new(description=nil)
+        if description
+          from_string(description)
+        else
+          super()
+        end
+      end
+    end
+  end
+end