pango 2.0.1 → 2.0.2

data/Rakefile

@@ -17,6 +17,12 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :label => "HarfBuzz",
       :version => "0.9.17",
       :compression_method => "bz2",
+      :windows => {
+        :patches => [
+          "harfbuzz-0.9.17-disable-uniscribe.diff",
+        ],
+        :need_autoreconf => true,
+      },
     },
     {
       :name => "pango",

data/ext/pango/rbpangocairo.c

@@ -28,9 +28,33 @@
 #define _SELF(self) (RVAL2PANGOCAIROFONTMAP(self))
 
 static VALUE
-rg_s_create(G_GNUC_UNUSED VALUE klass)
+rg_s_create(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
 {
-    return GOBJ2RVAL(pango_cairo_font_map_new());
+    VALUE rb_font_type;
+    PangoFontMap *font_map = NULL;
+
+    rb_scan_args(argc, argv, "01", &rb_font_type);
+    if (NIL_P(rb_font_type)) {
+        font_map = pango_cairo_font_map_new();
+    } else {
+        cairo_font_type_t font_type = CAIRO_FONT_TYPE_USER;
+        if (rbgutil_key_equal(rb_font_type, "ft") ||
+            rbgutil_key_equal(rb_font_type, "freetype")) {
+            font_type = CAIRO_FONT_TYPE_FT;
+        } else if (rbgutil_key_equal(rb_font_type, "win32")) {
+            font_type = CAIRO_FONT_TYPE_WIN32;
+        } else if (rbgutil_key_equal(rb_font_type, "quartz")) {
+            font_type = CAIRO_FONT_TYPE_QUARTZ;
+        } else {
+            rb_raise(rb_eArgError,
+                     "font type must be one of "
+                     ":ft, :freetype, :win32 or :quartz: %s",
+                     RBG_INSPECT(rb_font_type));
+        }
+        font_map = pango_cairo_font_map_new_for_font_type(font_type);
+    }
+
+    return GOBJ2RVAL(font_map);
 }
 
 static VALUE
@@ -78,7 +102,7 @@ Init_pango_cairo(VALUE mPango)
     /* Pango::CairoFontMap */
     RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_CAIRO_FONT_MAP, "CairoFontMap", mPango);
 
-    RG_DEF_SMETHOD(create, 0);
+    RG_DEF_SMETHOD(create, -1);
     RG_DEF_SMETHOD(default, 0);
 #  if PANGO_CHECK_VERSION(1, 22, 0)
     RG_DEF_SMETHOD(set_default, 1);

data/ext/pango/rbpangofontmap.c

@@ -24,18 +24,6 @@
 #define RG_TARGET_NAMESPACE cFontMap
 #define _SELF(self) (RVAL2PANGOFONTMAP(self))
 
-#ifdef CAIRO_AVAILABLE
-#  ifdef HAVE_PANGO_FT2
-#    define PANGO_TYPE_CAIRO_FC_FONT_MAP \
-    (pango_cairo_fc_font_map_get_type())
-#  endif
-
-#  ifdef HAVE_PANGO_WIN32
-#    define PANGO_TYPE_CAIRO_WIN32_FONT_MAP \
-      (pango_cairo_win32_font_map_get_type())
-#  endif
-#endif
-
 /*
 static VALUE
 rg_initialize(VALUE self)
@@ -112,15 +100,7 @@ Init_pango_font_map(VALUE mPango)
     G_DEF_CLASS3("PangoXFontMap", "XFontMap", mPango);
     G_DEF_CLASS3("PangoWin32FontMap", "Win32FontMap", mPango);
     G_DEF_CLASS3("PangoCoreTextFontMap", "CoreTextFontMap", mPango);
-#ifdef PANGO_TYPE_CAIRO_FC_FONT_MAP
-    G_DEF_CLASS(PANGO_TYPE_CAIRO_FC_FONT_MAP, "CairoFcFontMap", mPango);
-#else
     G_DEF_CLASS3("PangoCairoFcFontMap", "CairoFcFontMap", mPango);
-#endif
-#ifdef PANGO_TYPE_CAIRO_WIN32_FONT_MAP
-    G_DEF_CLASS(PANGO_TYPE_CAIRO_WIN32_FONT_MAP, "CairoWin32FontMap", mPango);
-#else
     G_DEF_CLASS3("PangoCairoWin32FontMap", "CairoWin32FontMap", mPango);
-#endif
     G_DEF_CLASS3("PangoCairoCoreTextFontMap", "CairoCoreTextFontMap", mPango);
 }

data/ext/pango/rbpangoglyphstring.c

@@ -125,13 +125,13 @@ static VALUE
 rg_glyphs(VALUE self)
 {
     int i;
-    PangoGlyphInfo** glyphs = &_SELF(self)->glyphs;
+    PangoGlyphInfo *glyphs = _SELF(self)->glyphs;
     gint* log_clusters = _SELF(self)->log_clusters;
 
     VALUE ret = rb_ary_new();
     for (i = 0; i < _SELF(self)->num_glyphs; i++) {
         rb_ary_push(ret, 
-                    rb_assoc_new(PANGOGLYPHINFO2RVAL(glyphs[i]),
+                    rb_assoc_new(PANGOGLYPHINFO2RVAL(glyphs + i),
                                  INT2NUM(log_clusters[i])));
     }
     return ret;

data/sample/break.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 =begin
   break.rb - Ruby/Pango sample script.
 

data/sample/gdk_layout.rb

@@ -17,7 +17,7 @@ gdkwin = window.window
 gc = Gdk::GC.new(gdkwin)
 
 layout = window.create_pango_layout
-layout.set_markup(File.readlines("sample.txt").to_s, "$")
+layout.set_markup(File.read("sample.txt"), "$")
 window.signal_connect("expose_event") do
   gdkwin.draw_layout(gc, 10, 10, layout)
 end

data/sample/glyphstring.rb

@@ -42,7 +42,7 @@ p logical_rect.to_a
 
 item = Pango::Item.new
 item.analysis.font = font
-item.analysis.shape_engine = font.find_shaper(lang, str[0])
+item.analysis.shape_engine = font.find_shaper(lang, str.codepoints.first)
 
 gs = Pango.shape(str, item.analysis)
 

data/sample/item.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 =begin
   item.rb - Ruby/Pango sample script.
 
@@ -29,7 +31,7 @@ items.each do |v|
   ana = v.analysis
   puts "shape_engine = #{ana.shape_engine}, lang_engine = #{ana.lang_engine}, font = #{ana.font}, level = #{ana.level}"
   puts "language = #{ana.language}"
-  p ana.font.get_glyph_extents("a"[0])[0].to_a
+  p ana.font.get_glyph_extents("a".codepoints.first)[0].to_a
   ana.set_extra_attrs(attrs)
   p ana.extra_attrs
 end

data/sample/label.rb

@@ -9,7 +9,7 @@
 
 require 'gtk2'
 
-str = File.readlines("sample.txt").to_s
+str = File.read("sample.txt")
 attrs, text, accel_char = Pango.parse_markup(str, '$')
 
 #This is same as Gtk::Label#set_markup()

data/sample/layout.rb

@@ -14,7 +14,7 @@ require 'pp'
 puts
 puts "Start----------"
 puts
-str = File.readlines("sample.txt").to_s
+str = File.read("sample.txt")
 context = Gdk::Pango.context
 context.base_dir = Pango::Context::DIRECTION_LTR
 context.language = Pango::Language.new("ja_JP")

data/sample/parse.rb

@@ -10,7 +10,7 @@
 
 require 'pango'
 
-str = File.readlines("sample.txt").to_s
+str = File.read("sample.txt")
 puts str
 puts "------"
 

data/sample/script.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 =begin
   script.rb - Ruby/Pango sample script.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pango
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 description: Ruby/Pango is a Ruby binding of pango-1.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []