pango 2.0.2 → 2.0.3

data/ext/pango/rbpangolayoutline.c

@@ -24,30 +24,6 @@
 #define RG_TARGET_NAMESPACE cLayoutLine
 #define _SELF(r) (RVAL2PANGOLAYOUTLINE(r))
 
-/**********************************/
-#if !PANGO_CHECK_VERSION(1,9,0)
-static PangoLayoutLine*
-layout_line_copy(PangoLayoutLine *ref)
-{
-  g_return_val_if_fail (ref != NULL, NULL);
-  pango_layout_line_ref(ref);
-  return ref;
-}
-
-GType
-pango_layout_line_get_type(void)
-{
-    static GType our_type = 0;
-
-    if (our_type == 0)
-        our_type = g_boxed_type_register_static ("PangoLayoutLine",
-                    (GBoxedCopyFunc)layout_line_copy,
-                    (GBoxedFreeFunc)pango_layout_line_unref);
-    return our_type;
-}
-#endif
-/**********************************/
-
 static VALUE
 rg_extents(VALUE self)
 {
@@ -148,7 +124,6 @@ rg_set_length(VALUE self, VALUE val)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,2,0)
 static VALUE
 rg_runs(VALUE self)
 {
@@ -166,7 +141,6 @@ rg_runs(VALUE self)
     }
     return ary;
 }
-#endif
 
 struct layout_line_set_runs_args {
     PangoLayoutLine *line;
@@ -214,7 +188,6 @@ rg_set_runs(VALUE self, VALUE attrs)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
 rg_paragraph_start_p(VALUE self)
 {
@@ -240,7 +213,6 @@ rg_set_resolved_dir(VALUE self, VALUE val)
     _SELF(self)->resolved_dir = NUM2UINT(val);
     return self;
 }
-#endif
 
 void
 Init_pango_layout_line(VALUE mPango)
@@ -258,15 +230,10 @@ Init_pango_layout_line(VALUE mPango)
     RG_DEF_METHOD(set_start_index, 1); 
     RG_DEF_METHOD(length, 0); 
     RG_DEF_METHOD(set_length, 1); 
-#if PANGO_CHECK_VERSION(1,2,0)
     RG_DEF_METHOD(runs, 0); 
-#endif
     RG_DEF_METHOD(set_runs, 1); 
-
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_METHOD_P(paragraph_start, 0); 
     RG_DEF_METHOD(set_paragraph_start, 1); 
     RG_DEF_METHOD(resolved_dir, 0); 
     RG_DEF_METHOD(set_resolved_dir, 1); 
-#endif
 }

data/ext/pango/rbpangologattr.c

@@ -84,10 +84,7 @@ ATTR_BOOL(is_word_end);
 ATTR_BOOL(is_sentence_boundary);
 ATTR_BOOL(is_sentence_start);
 ATTR_BOOL(is_sentence_end);
-
-#if PANGO_CHECK_VERSION(1,4,0)
 ATTR_BOOL(backspace_deletes_character);
-#endif
 
 void
 Init_pango_logattr(VALUE mPango)
@@ -107,8 +104,6 @@ Init_pango_logattr(VALUE mPango)
     DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, sentence_start);
     DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, sentence_end);
 
-#if PANGO_CHECK_VERSION(1,4,0)
     rbg_define_method(RG_TARGET_NAMESPACE, "backspace_deletes_character?", log_get_backspace_deletes_character, 0); 
     rbg_define_method(RG_TARGET_NAMESPACE, "set_backspace_deletes_character", log_set_backspace_deletes_character, 1); 
-#endif
 }

data/ext/pango/rbpangomatrix.c

@@ -21,8 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,6,0)
-
 #define RG_TARGET_NAMESPACE cMatrix
 #define _SELF(self) (RVAL2PANGOMATRIX(self))
 
@@ -99,13 +97,11 @@ rg_concat_bang(VALUE self, VALUE new_matrix)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,12,0)
 static VALUE
 rg_font_scale_factor(VALUE self)
 {
     return rb_float_new(pango_matrix_get_font_scale_factor(_SELF(self)));
 }
-#endif
 
 ATTR_FLOAT(xx);
 ATTR_FLOAT(xy);
@@ -122,12 +118,9 @@ rg_to_a(VALUE self)
                        INT2NUM(matrix->yy), INT2NUM(matrix->x0), INT2NUM(matrix->y0));
 }
 
-#endif
-
 void
 Init_pango_matrix(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,6,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_MATRIX, "Matrix", mPango);
 
     RG_DEF_METHOD(initialize, -1);
@@ -135,9 +128,7 @@ Init_pango_matrix(VALUE mPango)
     RG_DEF_METHOD_BANG(scale, 2);
     RG_DEF_METHOD_BANG(rotate, 1);
     RG_DEF_METHOD_BANG(concat, 1);
-#if PANGO_CHECK_VERSION(1,12,0)
     RG_DEF_METHOD(font_scale_factor, 0);
-#endif
 #if PANGO_CHECK_VERSION(1,16,0)
     RG_DEF_METHOD(gravity, 0);
 #endif
@@ -149,5 +140,4 @@ Init_pango_matrix(VALUE mPango)
     DEFINE_ACCESSOR(yy);
     DEFINE_ACCESSOR(x0);
     DEFINE_ACCESSOR(y0);
-#endif
 }

data/ext/pango/rbpangoprivate.h

@@ -7,10 +7,6 @@
 #  define rb_errinfo() (ruby_errinfo)
 #endif
 
-#if PANGO_CHECK_VERSION(1,10,0) && defined(HAVE_RB_CAIRO_H)
-#  define CAIRO_AVAILABLE 1
-#endif
-
 G_BEGIN_DECLS
 
 G_GNUC_INTERNAL void Init_pango_analysis(VALUE mPango);

data/ext/pango/rbpangorenderer.c

@@ -21,7 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,8,0)
 #define RG_TARGET_NAMESPACE cRenderer
 #define _SELF(self) (RVAL2PANGORENDERER(self))
 
@@ -166,12 +165,9 @@ rg_matrix(VALUE self)
     return PANGOMATRIX2RVAL((PangoMatrix*)matrix);
 }
 
-#endif
-
 void
 Init_pangorenderer(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,8,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_RENDERER, "Renderer", mPango);
 
     RG_DEF_METHOD(draw_layout, 3);
@@ -194,6 +190,4 @@ Init_pangorenderer(VALUE mPango)
     G_DEF_CLASS(PANGO_TYPE_RENDER_PART, "Part", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_RENDER_PART, "PANGO_RENDER_");
 #endif
-
-#endif
 }

data/ext/pango/rbpangoscript.c

@@ -21,7 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,4,0)
 #define RG_TARGET_NAMESPACE cScript
 #define _SELF(r) (RVAL2PANGOSCRIPT(r))
 
@@ -71,17 +70,14 @@ rg_get_gravity(int argc, VALUE *argv, VALUE self)
 gboolean    pango_language_includes_script  (PangoLanguage *language,
                                              PangoScript script);
 */
-#endif
 
 void
 Init_pango_script(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_SCRIPT, "Script", mPango);
 
     RG_DEF_SMETHOD(for_unichar, 1);
     RG_DEF_METHOD(sample_language, 0);
-#endif
 #if PANGO_CHECK_VERSION(1,16,0)
     RG_DEF_METHOD(get_gravity, -1);
 #endif

data/ext/pango/rbpangoscriptiter.c

@@ -21,8 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,4,0)
-
 /**********************************/
 static PangoScriptIter*
 rbpango_script_iter_copy(PangoScriptIter *ref)
@@ -82,16 +80,13 @@ rg_next_bang(VALUE self)
 {
     return CBOOL2RVAL(pango_script_iter_next(_SELF(self)));
 }
-#endif
 
 void
 Init_pango_script_iter(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,4,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_SCRIPT_ITER, "ScriptIter", mPango);
 
     RG_DEF_METHOD(initialize, 1);
     RG_DEF_METHOD(range, 0);
     RG_DEF_METHOD_BANG(next, 0);
-#endif
 }

data/test/{test_layout.rb → test-layout.rb}

@@ -17,4 +17,18 @@ class TestLayout < Test::Unit::TestCase
     @layout.font_description = description
     assert_equal("monospace 10", @layout.font_description.to_s)
   end
+
+  def test_height
+    assert_equal(-1, @layout.height)
+  end
+
+  def test_set_height
+    new_height = 29 * Pango::SCALE
+    @layout.height = new_height
+    assert_equal(new_height, @layout.height)
+  end
+
+  def test_ellipsized?
+    assert_false(@layout.ellipsized?)
+  end
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pango
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.0.3
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.12.5
 - !ruby/object:Gem::Dependency
   name: glib2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 description: Ruby/Pango is a Ruby binding of pango-1.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -112,32 +107,31 @@ files:
 - test/test-attribute.rb
 - test/test-color.rb
 - test/test-language.rb
+- test/test-layout.rb
 - test/test-log-attr.rb
 - test/test-matrix.rb
 - test/test-rectangle.rb
-- test/test_layout.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.5
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby/Pango is a Ruby binding of pango-1.x.
 test_files: []