pango 0.90.7-x86-mingw32 → 0.90.8-x86-mingw32

data/ext/pango/rbpangoattriterator.c

@@ -28,15 +28,13 @@ pango_attr_iter_get_type(void)
 /**********************************/
 
 static VALUE
-attriterator_next(self)
-    VALUE self;
+attriterator_next(VALUE self)
 {
     return CBOOL2RVAL(pango_attr_iterator_next(_SELF(self)));
 }
 
 static VALUE
-attriterator_range(self)
-    VALUE self;
+attriterator_range(VALUE self)
 {
     gint start = 0;
     gint end = 0;
@@ -45,10 +43,7 @@ attriterator_range(self)
 }
 
 static VALUE
-attriterator_get(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+attriterator_get(int argc, VALUE *argv, VALUE self)
 {
     VALUE type, ret;
     PangoAttribute* attr;
@@ -72,8 +67,7 @@ attriterator_get(argc, argv, self)
 }
 
 static VALUE
-attriterator_get_font(self)
-    VALUE self;
+attriterator_get_font(VALUE self)
 {
     PangoFontDescription* desc;
     PangoLanguage* lang;
@@ -100,8 +94,7 @@ attriterator_get_font(self)
 
 #ifdef HAVE_PANGO_ATTR_ITERATOR_GET_ATTRS
 static VALUE
-attriterator_get_attrs(self)
-    VALUE self;
+attriterator_get_attrs(VALUE self)
 {
     GSList* list = pango_attr_iterator_get_attrs(_SELF(self));
     GSList* base = list;

data/ext/pango/rbpangoattrlist.c

@@ -16,40 +16,35 @@ static ID id_call;
 #define _SELF(self) ((PangoAttrList*)RVAL2BOXED(self, PANGO_TYPE_ATTR_LIST))
 
 static VALUE
-attrlist_initialize(self)
-    VALUE self;
+attrlist_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_attr_list_new());
     return Qnil;
 }
 
 static VALUE
-attrlist_insert(self, attr)
-    VALUE self, attr;
+attrlist_insert(VALUE self, VALUE attr)
 {
     pango_attr_list_insert(_SELF(self), RVAL2ATTR(attr));
     return self;
 }
 
 static VALUE
-attrlist_insert_before(self, attr)
-    VALUE self, attr;
+attrlist_insert_before(VALUE self, VALUE attr)
 {
     pango_attr_list_insert_before(_SELF(self), RVAL2ATTR(attr));
     return self;
 }
 
 static VALUE
-attrlist_change(self, attr)
-    VALUE self, attr;
+attrlist_change(VALUE self, VALUE attr)
 {
     pango_attr_list_change(_SELF(self), RVAL2ATTR(attr));
     return self;
 }
 
 static VALUE
-attrlist_splice(self, other, pos, len)
-    VALUE self, other, pos, len;
+attrlist_splice(VALUE self, VALUE other, VALUE pos, VALUE len)
 {
     pango_attr_list_splice(_SELF(self), _SELF(other), NUM2INT(pos), NUM2INT(len));
     return self;
@@ -57,16 +52,13 @@ attrlist_splice(self, other, pos, len)
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static gboolean
-filter_func(attr, data)
-    PangoAttribute* attr;
-    gpointer data;
+filter_func(PangoAttribute *attr, gpointer data)
 {
     return CBOOL2RVAL(rb_funcall((VALUE)data, id_call, 1, ATTR2RVAL(attr)));
 }
 
 static VALUE
-attrlist_filter(self)
-    VALUE self;
+attrlist_filter(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -78,8 +70,7 @@ attrlist_filter(self)
 #endif
 
 static VALUE
-attrlist_get_iterator(self)
-    VALUE self;
+attrlist_get_iterator(VALUE self)
 {
     return BOXED2RVAL(pango_attr_list_get_iterator(_SELF(self)), PANGO_TYPE_ATTR_ITERATOR);
 }

data/ext/pango/rbpangocairo.c

@@ -26,30 +26,26 @@
 #define RVAL2LINE(v) ((PangoLayoutLine*)RVAL2BOXED(v, PANGO_TYPE_LAYOUT_LINE))
 
 static VALUE
-font_map_create(klass)
-    VALUE klass;
+font_map_create(VALUE klass)
 {
     return GOBJ2RVAL(pango_cairo_font_map_new());
 }
 
 static VALUE
-font_map_get_default(klass)
-    VALUE klass;
+font_map_get_default(VALUE klass)
 {
     return GOBJ2RVAL(pango_cairo_font_map_get_default());
 }
 
 static VALUE
-font_map_set_resolution(self, dpi)
-    VALUE self, dpi;
+font_map_set_resolution(VALUE self, VALUE dpi)
 {
     pango_cairo_font_map_set_resolution(_SELF(self), NUM2DBL(dpi));
     return self;
 }
 
 static VALUE
-font_map_get_resolution(self)
-    VALUE self;
+font_map_get_resolution(VALUE self)
 {
     return rb_float_new(pango_cairo_font_map_get_resolution(_SELF(self)));
 }
@@ -61,8 +57,7 @@ font_map_create_context(VALUE self)
 }
 
 static VALUE
-update_context(self, context)
-    VALUE self, context;
+update_context(VALUE self, VALUE context)
 {
     pango_cairo_update_context(RVAL2CRCONTEXT(self), RVAL2CONTEXT(context));
     return self;
@@ -76,8 +71,7 @@ create_layout(VALUE self)
 }
 
 static VALUE
-update_layout(self, layout)
-    VALUE self, layout;
+update_layout(VALUE self, VALUE layout)
 {
     pango_cairo_update_layout(RVAL2CRCONTEXT(self), RVAL2LAYOUT(layout));
     return self;
@@ -85,8 +79,7 @@ update_layout(self, layout)
 
 /* Rendering */
 static VALUE
-show_glyph_string(self, font, glyphs)
-    VALUE self, font, glyphs;
+show_glyph_string(VALUE self, VALUE font, VALUE glyphs)
 {
     pango_cairo_show_glyph_string(RVAL2CRCONTEXT(self),
                                   RVAL2FONT(font),
@@ -95,16 +88,14 @@ show_glyph_string(self, font, glyphs)
 }
 
 static VALUE
-show_layout_line(self, line)
-    VALUE self, line;
+show_layout_line(VALUE self, VALUE line)
 {
     pango_cairo_show_layout_line(RVAL2CRCONTEXT(self), RVAL2LINE(line));
     return self;
 }
 
 static VALUE
-show_layout(self, layout)
-    VALUE self, layout;
+show_layout(VALUE self, VALUE layout)
 {
     pango_cairo_show_layout(RVAL2CRCONTEXT(self), RVAL2LAYOUT(layout));
     return self;
@@ -112,8 +103,7 @@ show_layout(self, layout)
 
 #if PANGO_CHECK_VERSION(1,14,0)
 static VALUE
-show_error_underline(self, x, y, width, height)
-    VALUE self, x, y, width, height;
+show_error_underline(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     pango_cairo_show_error_underline(RVAL2CRCONTEXT(self), 
                                      NUM2DBL(x), NUM2DBL(y), 
@@ -124,8 +114,7 @@ show_error_underline(self, x, y, width, height)
 
 /* Rendering to a path */
 static VALUE
-glyph_string_path(self, font, glyphs)
-    VALUE self, font, glyphs;
+glyph_string_path(VALUE self, VALUE font, VALUE glyphs)
 {
     pango_cairo_glyph_string_path(RVAL2CRCONTEXT(self),
                                   RVAL2FONT(font),
@@ -134,16 +123,14 @@ glyph_string_path(self, font, glyphs)
 }
 
 static VALUE
-layout_line_path(self, line)
-    VALUE self, line;
+layout_line_path(VALUE self, VALUE line)
 {
     pango_cairo_layout_line_path(RVAL2CRCONTEXT(self), RVAL2LINE(line));
     return self;
 }
 
 static VALUE
-layout_path(self, layout)
-    VALUE self, layout;
+layout_path(VALUE self, VALUE layout)
 {
     pango_cairo_layout_path(RVAL2CRCONTEXT(self), RVAL2LAYOUT(layout));
     return self;
@@ -151,8 +138,7 @@ layout_path(self, layout)
 
 #if PANGO_CHECK_VERSION(1,14,0)
 static VALUE
-error_underline_path(self, x, y, width, height)
-    VALUE self, x, y, width, height;
+error_underline_path(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     pango_cairo_error_underline_path(RVAL2CRCONTEXT(self), 
                                      NUM2DBL(x), NUM2DBL(y), 

data/ext/pango/rbpangocolor.c

@@ -14,8 +14,7 @@
 #define _SELF(self) ((PangoColor*)RVAL2BOXED(self, PANGO_TYPE_COLOR))
 
 static VALUE
-color_initialize(self, red, green, blue)
-    VALUE self, red, green, blue;
+color_initialize(VALUE self, VALUE red, VALUE green, VALUE blue)
 {
     PangoColor c;
     c.red = NUM2INT(red);
@@ -27,63 +26,52 @@ color_initialize(self, red, green, blue)
 }
 
 static VALUE
-color_parse(self, spec)
-    VALUE self, spec;
+color_parse(VALUE self, VALUE spec)
 {
     return CBOOL2RVAL(pango_color_parse(_SELF(self), RVAL2CSTR(spec)));
 }
 
 static VALUE
-color_red(self)
-    VALUE self;
+color_red(VALUE self)
 {
     return INT2FIX(_SELF(self)->red);
 }
 
 static VALUE
-color_set_red(self, red)
-    VALUE self;
-    VALUE red;
+color_set_red(VALUE self, VALUE red)
 {
     _SELF(self)->red = NUM2INT(red);
     return self;
 }
 
 static VALUE
-color_green(self)
-    VALUE self;
+color_green(VALUE self)
 {
     return INT2FIX(_SELF(self)->green);
 }
 
 static VALUE
-color_set_green(self, green)
-    VALUE self;
-    VALUE green;
+color_set_green(VALUE self, VALUE green)
 {
     _SELF(self)->green = NUM2INT(green);
     return self;
 }
 
 static VALUE
-color_blue(self)
-    VALUE self;
+color_blue(VALUE self)
 {
     return INT2FIX(_SELF(self)->blue);
 }
 
 static VALUE
-color_set_blue(self, blue)
-    VALUE self;
-    VALUE blue;
+color_set_blue(VALUE self, VALUE blue)
 {
     _SELF(self)->blue = NUM2INT(blue);
     return self;
 }
 
 static VALUE
-color_to_a(self)
-    VALUE self;
+color_to_a(VALUE self)
 {
     PangoColor *c = _SELF(self);
     return rb_ary_new3(3, INT2FIX(c->red), 
@@ -91,8 +79,7 @@ color_to_a(self)
 }
 
 static VALUE
-color_equal(self, other)
-	VALUE self, other;
+color_equal(VALUE self, VALUE other)
 {
     PangoColor* c1 = _SELF(self);
     PangoColor* c2 = _SELF(other);

data/ext/pango/rbpangocontext.c

@@ -16,10 +16,7 @@
 #define RVAL2LANG(v) ((PangoLanguage*)RVAL2BOXED(v, PANGO_TYPE_LANGUAGE))
 
 static VALUE
-rcontext_itemize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rcontext_itemize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3, arg4, arg5, arg6;
     GList* list;
@@ -61,16 +58,14 @@ GList*      pango_reorder_items             (GList *logical_items);
 
 #ifdef PANGO_ENABLE_BACKEND
 static VALUE
-rcontext_initialize(self)
-    VALUE self;
+rcontext_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_context_new());
     return Qnil;
 }
 
 static VALUE
-rcontext_set_font_map(self, font_map)
-    VALUE self, font_map;
+rcontext_set_font_map(VALUE self, VALUE font_map)
 {
     pango_context_set_font_map(_SELF(self), PANGO_FONT_MAP(RVAL2GOBJ(font_map)));
     return self;
@@ -78,8 +73,7 @@ rcontext_set_font_map(self, font_map)
 
 #if PANGO_CHECK_VERSION(1,6,0)
 static VALUE
-rcontext_get_font_map(self)
-    VALUE self;
+rcontext_get_font_map(VALUE self)
 {
     return GOBJ2RVAL(pango_context_get_font_map(_SELF(self)));
 }
@@ -87,32 +81,28 @@ rcontext_get_font_map(self)
 #endif /* PANGO_ENABLE_BACKEND */
 
 static VALUE
-rcontext_get_font_description(self)
-    VALUE self;
+rcontext_get_font_description(VALUE self)
 {
     PangoFontDescription* ret = pango_context_get_font_description(_SELF(self));
     return BOXED2RVAL(ret, PANGO_TYPE_FONT_DESCRIPTION);
 }
 
 static VALUE
-rcontext_set_font_description(self, desc)
-    VALUE self, desc;
+rcontext_set_font_description(VALUE self, VALUE desc)
 {
     pango_context_set_font_description(_SELF(self), RVAL2DESC(desc));
     return self;
 }
 
 static VALUE
-rcontext_get_language(self)
-    VALUE self;
+rcontext_get_language(VALUE self)
 {
     PangoLanguage* ret = pango_context_get_language(_SELF(self));
     return BOXED2RVAL(ret, PANGO_TYPE_LANGUAGE);
 }
 
 static VALUE
-rcontext_set_language(self, lang)
-    VALUE self, lang;
+rcontext_set_language(VALUE self, VALUE lang)
 {
     pango_context_set_language(_SELF(self), 
                                RVAL2LANG(lang));
@@ -120,15 +110,13 @@ rcontext_set_language(self, lang)
 }
 
 static VALUE
-rcontext_get_base_dir(self)
-    VALUE self;
+rcontext_get_base_dir(VALUE self)
 {
     return GENUM2RVAL(pango_context_get_base_dir(_SELF(self)), PANGO_TYPE_DIRECTION);
 }
 
 static VALUE
-rcontext_set_base_dir(self, direction)
-    VALUE self, direction;
+rcontext_set_base_dir(VALUE self, VALUE direction)
 {
     pango_context_set_base_dir(_SELF(self), RVAL2GENUM(direction, PANGO_TYPE_DIRECTION));
     return self;
@@ -164,16 +152,14 @@ rcontext_set_gravity_hint(VALUE self, VALUE gravity_hint)
 
 #if PANGO_CHECK_VERSION(1,6,0)
 static VALUE
-rcontext_get_matrix(self)
-    VALUE self;
+rcontext_get_matrix(VALUE self)
 {
     const PangoMatrix* matrix = pango_context_get_matrix(_SELF(self));
     return BOXED2RVAL((PangoMatrix*)matrix, PANGO_TYPE_MATRIX);
 }
 
 static VALUE
-rcontext_set_matrix(self, matrix)
-    VALUE self, matrix;
+rcontext_set_matrix(VALUE self, VALUE matrix)
 {
     pango_context_set_matrix(_SELF(self), 
                              (PangoMatrix*)RVAL2BOXED(matrix, PANGO_TYPE_MATRIX));
@@ -182,25 +168,20 @@ rcontext_set_matrix(self, matrix)
 #endif
 
 static VALUE
-rcontext_load_font(self, desc)
-    VALUE self, desc;
+rcontext_load_font(VALUE self, VALUE desc)
 {
     return GOBJ2RVAL(pango_context_load_font(_SELF(self), RVAL2DESC(desc)));
 }
 
 static VALUE
-rcontext_load_fontset(self, desc, lang)
-    VALUE self, desc, lang;
+rcontext_load_fontset(VALUE self, VALUE desc, VALUE lang)
 {
     return GOBJ2RVAL(pango_context_load_fontset(_SELF(self),
                                                 RVAL2DESC(desc), RVAL2LANG(lang)));
 }
 
 static VALUE
-rcontext_get_metrics(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rcontext_get_metrics(int argc, VALUE *argv, VALUE self)
 {
     VALUE desc, lang;
 
@@ -213,8 +194,7 @@ rcontext_get_metrics(argc, argv, self)
 }
 
 static VALUE
-rcontext_list_families(self)
-    VALUE self;
+rcontext_list_families(VALUE self)
 {
     int n_families;
     PangoFontFamily** families;
@@ -237,8 +217,7 @@ rcontext_list_families(self)
 #if PANGO_CHECK_VERSION(1,10,0)
 #  if HAVE_RB_CAIRO_H
 static VALUE
-rcontext_set_font_options(self, options)
-    VALUE self, options;
+rcontext_set_font_options(VALUE self, VALUE options)
 {
     if (NIL_P(options))
         pango_cairo_context_set_font_options(_SELF(self), NULL);
@@ -249,8 +228,7 @@ rcontext_set_font_options(self, options)
 }
 
 static VALUE
-rcontext_get_font_options(self)
-    VALUE self;
+rcontext_get_font_options(VALUE self)
 {
     const cairo_font_options_t *options;
     options = pango_cairo_context_get_font_options(_SELF(self));
@@ -261,16 +239,14 @@ rcontext_get_font_options(self)
 }
 
 static VALUE
-rcontext_set_resolution(self, dpi)
-    VALUE self, dpi;
+rcontext_set_resolution(VALUE self, VALUE dpi)
 {
     pango_cairo_context_set_resolution(_SELF(self), NUM2DBL(dpi));
     return self;
 }
 
 static VALUE
-rcontext_get_resolution(self)
-    VALUE self;
+rcontext_get_resolution(VALUE self)
 {
     return rb_float_new(pango_cairo_context_get_resolution(_SELF(self)));
 }
@@ -279,8 +255,7 @@ rcontext_get_resolution(self)
 
 
 static VALUE
-rcontext_list_families_old(self)
-    VALUE self;
+rcontext_list_families_old(VALUE self)
 {
     rb_warn("Deprecated. Use Pango::Context#families instead.");
     return rcontext_list_families(self);