pango 1.1.2 → 1.1.3

data/ext/pango/rbpango.c

@@ -64,7 +64,7 @@ rpango_reorder_items_ensure(VALUE value)
 }
 
 static VALUE
-rg_m_reorder_items(G_GNUC_UNUSED VALUE self, VALUE attrs)
+rg_s_reorder_items(G_GNUC_UNUSED VALUE self, VALUE attrs)
 {
     struct rpango_reorder_items_args args;
     args.ary = rb_ary_to_ary(attrs);
@@ -77,13 +77,13 @@ rg_m_reorder_items(G_GNUC_UNUSED VALUE self, VALUE attrs)
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
-rg_m_unichar_direction(G_GNUC_UNUSED VALUE self, VALUE ch)
+rg_s_unichar_direction(G_GNUC_UNUSED VALUE self, VALUE ch)
 {
     return PANGODIRECTION2RVAL(pango_unichar_direction(NUM2UINT(ch)));
 }
 
 static VALUE
-rg_m_find_base_dir(G_GNUC_UNUSED VALUE self, VALUE text)
+rg_s_find_base_dir(G_GNUC_UNUSED VALUE self, VALUE text)
 {
     StringValue(text);
     return PANGODIRECTION2RVAL(pango_find_base_dir(RSTRING_PTR(text), RSTRING_LEN(text)));
@@ -128,7 +128,7 @@ rbg_pangologattrs2rval_free(PangoLogAttr *attrs, long n)
 #define PANGOLOGATTRS2RVAL_FREE(attrs, n) rbg_pangologattrs2rval_free(attrs, n)
 
 static VALUE
-rg_m_break(G_GNUC_UNUSED VALUE self, VALUE rbtext, VALUE rbanalysis)
+rg_s_break(G_GNUC_UNUSED VALUE self, VALUE rbtext, VALUE rbanalysis)
 {
     const gchar *text = RVAL2CSTR(rbtext);
     long length = RSTRING_LEN(rbtext);
@@ -142,7 +142,7 @@ rg_m_break(G_GNUC_UNUSED VALUE self, VALUE rbtext, VALUE rbanalysis)
 }
 
 static VALUE
-rg_m_get_log_attrs(G_GNUC_UNUSED VALUE self, VALUE rbtext, VALUE rblevel, VALUE rblanguage)
+rg_s_get_log_attrs(G_GNUC_UNUSED VALUE self, VALUE rbtext, VALUE rblevel, VALUE rblanguage)
 {
     const gchar *text = RVAL2CSTR(rbtext);
     long length = RSTRING_LEN(rbtext);
@@ -157,7 +157,7 @@ rg_m_get_log_attrs(G_GNUC_UNUSED VALUE self, VALUE rbtext, VALUE rblevel, VALUE
 }
 
 static VALUE
-rg_m_find_paragraph_boundary(G_GNUC_UNUSED VALUE self, VALUE text)
+rg_s_find_paragraph_boundary(G_GNUC_UNUSED VALUE self, VALUE text)
 {
     gint paragraph_delimiter_index, next_paragraph_start;
 
@@ -193,7 +193,7 @@ rpango_shape_ensure(VALUE value)
 }
 
 static VALUE
-rg_m_shape(G_GNUC_UNUSED VALUE self, VALUE rbtext, VALUE rbanalysis)
+rg_s_shape(G_GNUC_UNUSED VALUE self, VALUE rbtext, VALUE rbanalysis)
 {
     const gchar *text = RVAL2CSTR(rbtext);
     long length = RSTRING_LEN(rbtext);
@@ -208,7 +208,7 @@ rg_m_shape(G_GNUC_UNUSED VALUE self, VALUE rbtext, VALUE rbanalysis)
 
 /* This method is from rbpangoattribute.c */
 static VALUE
-rg_m_parse_markup(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+rg_s_parse_markup(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE markup_text, accel_marker;
     PangoAttrList *pattr_list;
@@ -247,13 +247,13 @@ rg_m_parse_markup(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 }
 
 static VALUE
-rg_m_pixels(G_GNUC_UNUSED VALUE self, VALUE pixels)
+rg_s_pixels(G_GNUC_UNUSED VALUE self, VALUE pixels)
 {
     return rb_float_new(PANGO_PIXELS(NUM2DBL(pixels)));
 }
 
 static VALUE
-rg_m_cairo_available_p(G_GNUC_UNUSED VALUE self)
+rg_s_cairo_available_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef CAIRO_AVAILABLE
     return Qtrue;
@@ -273,22 +273,22 @@ Init_pango(void)
                                 INT2FIX(PANGO_MINOR_VERSION), 
                                 INT2FIX(PANGO_MICRO_VERSION)));
 
-    RG_DEF_MODFUNC(reorder_items, 1);
+    RG_DEF_SMETHOD(reorder_items, 1);
 
 #if PANGO_CHECK_VERSION(1,4,0)
-    RG_DEF_MODFUNC(unichar_direction, 1);
-    RG_DEF_MODFUNC(find_base_dir, 1);
+    RG_DEF_SMETHOD(unichar_direction, 1);
+    RG_DEF_SMETHOD(find_base_dir, 1);
 #endif
-    RG_DEF_MODFUNC(break, 2);
-    RG_DEF_MODFUNC(get_log_attrs, 3);
-    RG_DEF_MODFUNC(find_paragraph_boundary, 1);
-    RG_DEF_MODFUNC(shape, 2);
-    RG_DEF_MODFUNC(parse_markup, -1);
-    RG_DEF_MODFUNC(pixels, 1);
+    RG_DEF_SMETHOD(break, 2);
+    RG_DEF_SMETHOD(get_log_attrs, 3);
+    RG_DEF_SMETHOD(find_paragraph_boundary, 1);
+    RG_DEF_SMETHOD(shape, 2);
+    RG_DEF_SMETHOD(parse_markup, -1);
+    RG_DEF_SMETHOD(pixels, 1);
 
     rb_define_const(RG_TARGET_NAMESPACE, "SCALE", INT2FIX(PANGO_SCALE));
 
-    RG_DEF_MODFUNC_P(cairo_available, 0);
+    RG_DEF_SMETHOD_P(cairo_available, 0);
 
     Init_pango_analysis(RG_TARGET_NAMESPACE);
     Init_pango_attribute(RG_TARGET_NAMESPACE);

data/ext/pango/rbpangoanalysis.c

@@ -219,6 +219,4 @@ Init_pango_analysis(VALUE mPango)
 
     RG_DEF_METHOD(set_extra_attrs, 1);
     RG_DEF_METHOD(extra_attrs, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangoattribute.c

@@ -399,7 +399,7 @@ MAKE_ATTRINT_INIT(AttrLetterSpacing, letter_spacing);
 #define MAKE_ATTR(gtype, name, parent, num)\
 tmpklass = rb_define_class_under(mPango, #name, parent);\
 rb_hash_aset(type_to_klass, INT2FIX(gtype), tmpklass);\
-rb_define_method(tmpklass, "initialize", attr_## name ## _initialize , num);
+rbg_define_method(tmpklass, "initialize", attr_## name ## _initialize , num);
 
 void
 Init_pango_attribute(VALUE mPango)
@@ -414,8 +414,6 @@ Init_pango_attribute(VALUE mPango)
     RG_DEF_METHOD(end_index, 0);
     RG_DEF_METHOD(set_end_index, 1);
 
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
 #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
     RG_DEF_SMETHOD(allocate, 0);
 #else
@@ -426,25 +424,25 @@ Init_pango_attribute(VALUE mPango)
 #endif
 
     attrstring = rb_define_class_under(mPango, "AttrString", RG_TARGET_NAMESPACE);
-    rb_define_method(attrstring, "value", attr_string_value, 0);
+    rbg_define_method(attrstring, "value", attr_string_value, 0);
 
     pattrint = rb_define_class_under(mPango, "AttrInt", RG_TARGET_NAMESPACE);
-    rb_define_method(pattrint, "value", attr_int_value, 0);
+    rbg_define_method(pattrint, "value", attr_int_value, 0);
 
     pattrfloat = rb_define_class_under(mPango, "AttrFloat", RG_TARGET_NAMESPACE);
-    rb_define_method(pattrfloat, "value", attr_float_value, 0);
+    rbg_define_method(pattrfloat, "value", attr_float_value, 0);
 
     pattrcolor = rb_define_class_under(mPango, "AttrColor", RG_TARGET_NAMESPACE);
-    rb_define_method(pattrcolor, "value", attr_color_value, 0);
+    rbg_define_method(pattrcolor, "value", attr_color_value, 0);
 
     pattrbool = rb_define_class_under(mPango, "AttrBool", RG_TARGET_NAMESPACE);
-    rb_define_method(pattrbool, "value", attr_bool_value, 0);
+    rbg_define_method(pattrbool, "value", attr_bool_value, 0);
 
     rb_global_variable(&type_to_klass);
     type_to_klass = rb_hash_new();
 
     MAKE_ATTR(PANGO_ATTR_LANGUAGE, AttrLanguage, RG_TARGET_NAMESPACE, 1);
-    rb_define_method(tmpklass, "value", attr_language_value, 0);
+    rbg_define_method(tmpklass, "value", attr_language_value, 0);
 
     MAKE_ATTR(PANGO_ATTR_FAMILY, AttrFamily, attrstring, 1);
     MAKE_ATTR(PANGO_ATTR_STYLE, AttrStyle, pattrint, 1);
@@ -460,7 +458,7 @@ Init_pango_attribute(VALUE mPango)
     MAKE_ATTR(PANGO_ATTR_GRAVITY_HINT, AttrGravityHint, pattrint, 1);
 #endif
     MAKE_ATTR(PANGO_ATTR_FONT_DESC, AttrFontDescription, RG_TARGET_NAMESPACE, 1);
-    rb_define_method(tmpklass, "value", attr_fontdesc_value, 0);
+    rbg_define_method(tmpklass, "value", attr_fontdesc_value, 0);
     MAKE_ATTR(PANGO_ATTR_FOREGROUND, AttrForeground, pattrcolor, 3);
     MAKE_ATTR(PANGO_ATTR_BACKGROUND, AttrBackground, pattrcolor, 3);
     MAKE_ATTR(PANGO_ATTR_UNDERLINE, AttrUnderline, pattrint, 1);
@@ -480,9 +478,9 @@ Init_pango_attribute(VALUE mPango)
     MAKE_ATTR(PANGO_ATTR_LETTER_SPACING, AttrLetterSpacing, pattrint, 1);
 #endif
     MAKE_ATTR(PANGO_ATTR_SHAPE, AttrShape, RG_TARGET_NAMESPACE, -1);
-    rb_define_method(tmpklass, "ink_rect", attr_shape_ink_rect, 0);
-    rb_define_method(tmpklass, "logical_rect", attr_shape_logical_rect, 0);
-    rb_define_method(tmpklass, "value", attr_shape_value, 0);
+    rbg_define_method(tmpklass, "ink_rect", attr_shape_ink_rect, 0);
+    rbg_define_method(tmpklass, "logical_rect", attr_shape_logical_rect, 0);
+    rbg_define_method(tmpklass, "value", attr_shape_value, 0);
     MAKE_ATTR(PANGO_ATTR_SCALE, AttrScale, pattrfloat, 1);
     /* PangoScale */
     rb_define_const(tmpklass, "XX_SMALL", rb_float_new(PANGO_SCALE_XX_SMALL));

data/ext/pango/rbpangocairo.c

@@ -28,13 +28,13 @@
 #define _SELF(self) (RVAL2PANGOCAIROFONTMAP(self))
 
 static VALUE
-rg_s_create(VALUE klass)
+rg_s_create(G_GNUC_UNUSED VALUE klass)
 {
     return GOBJ2RVAL(pango_cairo_font_map_new());
 }
 
 static VALUE
-rg_s_default(VALUE klass)
+rg_s_default(G_GNUC_UNUSED VALUE klass)
 {
     return GOBJ2RVAL(pango_cairo_font_map_get_default());
 }
@@ -75,7 +75,5 @@ Init_pango_cairo(VALUE mPango)
     RG_DEF_METHOD(set_resolution, 1);
     RG_DEF_METHOD(resolution, 0);
     RG_DEF_METHOD(create_context, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }

data/ext/pango/rbpangocolor.c

@@ -114,6 +114,4 @@ Init_pango_color(VALUE mPango)
     RG_DEF_METHOD(set_blue, 1);
     RG_DEF_METHOD(to_a, 0);
     RG_DEF_METHOD_OPERATOR("==", color_equal, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangocontext.c

@@ -315,8 +315,6 @@ Init_pango_context(VALUE mPango)
     /* This will remove 2 or 3 releases later since 0.14.0. */
     RG_DEF_METHOD(list_families, 0);
 
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
     /* PangoDirection */
     G_DEF_CLASS(PANGO_TYPE_DIRECTION, "Direction", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_DIRECTION, "PANGO_");

data/ext/pango/rbpangofontdescription.c

@@ -266,8 +266,6 @@ Init_pango_font_description(VALUE mPango)
     RG_DEF_ALIAS("to_s", "to_str");
     RG_DEF_METHOD(to_filename, 0);
 
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
     /* PangoStyle */
     G_DEF_CLASS(PANGO_TYPE_STYLE, "Style", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_STYLE, "PANGO_");

data/ext/pango/rbpangoglyphinfo.c

@@ -120,6 +120,4 @@ Init_pango_glyph_info(VALUE mPango)
     RG_DEF_METHOD(set_geometry, 3);
     RG_DEF_METHOD_P(cluster_start, 0);
     RG_DEF_METHOD(set_cluster_start, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangoglyphstring.c

@@ -152,6 +152,4 @@ Init_pango_glyph_string(VALUE mPango)
     RG_DEF_METHOD(x_to_index, 3);
     RG_DEF_METHOD(get_logical_widths, 2);
     RG_DEF_METHOD(glyphs, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangoitem.c

@@ -38,8 +38,8 @@ item_int_set_ ## name (VALUE self, VALUE val)\
 }
 
 #define DEF_INT_ACCESSOR(name)                                  \
-    rb_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(name), item_int_ ## name, 0);\
-    rb_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(set_ ## name), item_int_set_ ## name, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(name), item_int_ ## name, 0);\
+    rbg_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(set_ ## name), item_int_set_ ## name, 1);
 
 /**********************************/
 #if ! PANGO_CHECK_VERSION(1,9,0)
@@ -108,6 +108,4 @@ Init_pango_item(VALUE mPango)
 
     RG_DEF_METHOD(analysis, 0);
     RG_DEF_METHOD(set_analysis, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangolayout.c

@@ -539,8 +539,6 @@ Init_pango_layout(VALUE mPango)
     RG_DEF_METHOD(lines, 0);
     RG_DEF_METHOD(iter, 0);
 
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
     /* PangoWrapMode */
     G_DEF_CLASS(PANGO_TYPE_WRAP_MODE, "WrapMode", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_WRAP_MODE, "PANGO_");

data/ext/pango/rbpangolayoutline.c

@@ -269,5 +269,4 @@ Init_pango_layout_line(VALUE mPango)
     RG_DEF_METHOD(resolved_dir, 0); 
     RG_DEF_METHOD(set_resolved_dir, 1); 
 #endif
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangologattr.c

@@ -70,8 +70,8 @@ rg_initialize(VALUE self)
 }
 
 #define DEFINE_ACCESSOR(logattr, name) \
-    rb_define_method(logattr, G_STRINGIFY(name?), log_get_is_ ## name, 0);\
-    rb_define_method(logattr, G_STRINGIFY(set_ ## name), log_set_is_ ## name, 1);
+    rbg_define_method(logattr, G_STRINGIFY(name?), log_get_is_ ## name, 0);\
+    rbg_define_method(logattr, G_STRINGIFY(set_ ## name), log_set_is_ ## name, 1);
 
 ATTR_BOOL(is_line_break);
 ATTR_BOOL(is_mandatory_break);
@@ -107,9 +107,7 @@ Init_pango_logattr(VALUE mPango)
     DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, sentence_end);
 
 #if PANGO_CHECK_VERSION(1,4,0)
-    rb_define_method(RG_TARGET_NAMESPACE, "backspace_deletes_character?", log_get_backspace_deletes_character, 0); 
-    rb_define_method(RG_TARGET_NAMESPACE, "set_backspace_deletes_character", log_set_backspace_deletes_character, 1); 
+    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
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangomatrix.c

@@ -40,8 +40,8 @@ matrix_set_ ## name (VALUE self, VALUE val)\
 }
 
 #define DEFINE_ACCESSOR(name) \
-    rb_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(name), matrix_get_ ## name, 0);\
-    rb_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(set_ ## name), matrix_set_## name, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(name), matrix_get_ ## name, 0);\
+    rbg_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(set_ ## name), matrix_set_## name, 1);
 
 static VALUE
 rg_initialize(int argc, VALUE *argv, VALUE self)
@@ -149,8 +149,5 @@ Init_pango_matrix(VALUE mPango)
     DEFINE_ACCESSOR(yy);
     DEFINE_ACCESSOR(x0);
     DEFINE_ACCESSOR(y0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
 #endif
 }

data/ext/pango/rbpangorectangle.c

@@ -167,6 +167,4 @@ Init_pango_rectangle(VALUE mPango)
     RG_DEF_METHOD(descent, 0);
     RG_DEF_METHOD(lbearing, 0);
     RG_DEF_METHOD(rbearing, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangorenderer.c

@@ -189,8 +189,6 @@ Init_pangorenderer(VALUE mPango)
     RG_DEF_METHOD(set_matrix, 1);
     RG_DEF_METHOD(matrix, 0);
 
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
     /* PangoRenderPart */
 #ifdef HAVE_PANGO_RENDER_PART_GET_TYPE
     G_DEF_CLASS(PANGO_TYPE_RENDER_PART, "Part", RG_TARGET_NAMESPACE);

data/ext/pango/rbpangotabarray.c

@@ -122,8 +122,6 @@ Init_pango_array(VALUE mPango)
     RG_DEF_METHOD(tabs, 0);
     RG_DEF_METHOD_P(positions_in_pixels, 0);
 
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
     /* PangoTabAlign */
     G_DEF_CLASS(PANGO_TYPE_TAB_ALIGN, "TabAlign", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_TAB_ALIGN, "PANGO_");    

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pango
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Project Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 Z
+date: 2012-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cairo
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 1
-        - 2
-        version: 1.1.2
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id002
 description: Ruby/Pango is a Ruby binding of pango-1.x.
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby/Pango is a Ruby binding of pango-1.x.