pango 0.90.7 → 0.90.8

data/ext/pango/rbpangocoverage.c

@@ -29,32 +29,28 @@ pango_coverage_get_type(void)
 /**********************************/
 
 static VALUE
-coverage_initialize(self)
-    VALUE self;
+coverage_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_coverage_new());
     return Qnil;
 }
 
 static VALUE
-coverage_get_level(self, index_)
-    VALUE self, index_;
+coverage_get_level(VALUE self, VALUE index_)
 {
     return GENUM2RVAL(pango_coverage_get(_SELF(self), NUM2INT(index_)), 
                       PANGO_TYPE_COVERAGE_LEVEL);
 }
 
 static VALUE
-coverage_max(self, other)
-    VALUE self, other;
+coverage_max(VALUE self, VALUE other)
 {
     pango_coverage_max(_SELF(self), _SELF(other));
     return self;
 }
 
 static VALUE
-coverage_set(self, index_, level)
-    VALUE self, index_, level;
+coverage_set(VALUE self, VALUE index_, VALUE level)
 {
     pango_coverage_set(_SELF(self), NUM2INT(index_), 
                        RVAL2GENUM(level, PANGO_TYPE_COVERAGE_LEVEL));
@@ -62,8 +58,7 @@ coverage_set(self, index_, level)
 }
 
 static VALUE
-coverage_to_bytes(self)
-    VALUE self;
+coverage_to_bytes(VALUE self)
 {
     guchar* bytes;
     int n_bytes;
@@ -77,8 +72,7 @@ coverage_to_bytes(self)
 }
 
 static VALUE
-coverage_s_from_bytes(self, bytes)
-    VALUE self, bytes;
+coverage_s_from_bytes(VALUE self, VALUE bytes)
 {
     StringValue(bytes);
     return BOXED2RVAL(pango_coverage_from_bytes((guchar*)RVAL2CSTR(bytes), 

data/ext/pango/rbpangoengine.c

@@ -17,8 +17,7 @@
 
 /* FIXME
 static VALUE
-rbpango_s_engine_list(self)
-    VALUE self;
+rbpango_s_engine_list(VALUE self)
 {
     PangoEngineInfo* engines = g_new(PangoEngineInfo, 1);
     int i, n;
@@ -34,8 +33,7 @@ rbpango_s_engine_list(self)
 }
 
 static VALUE
-rbpango_s_engine_create(self, id)
-    VALUE self, id;
+rbpango_s_engine_create(VALUE self, VALUE id)
 {
     return GOBJ2RVAL(script_engine_create(RVAL2CSTR(id)));
 }

data/ext/pango/rbpangofont.c

@@ -14,8 +14,7 @@
 #define _SELF(self) (PANGO_FONT(RVAL2GOBJ(self)))
 
 static VALUE
-font_find_shaper(self, language, ch)
-    VALUE self, language, ch;
+font_find_shaper(VALUE self, VALUE language, VALUE ch)
 {
     return GOBJ2RVAL(pango_font_find_shaper(_SELF(self), 
                                             (PangoLanguage*)RVAL2BOXED(language, PANGO_TYPE_LANGUAGE),
@@ -23,10 +22,7 @@ font_find_shaper(self, language, ch)
 }
 
 static VALUE
-font_describe(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+font_describe(int argc, VALUE *argv, VALUE self)
 {
     VALUE desc, absolute_size;
     rb_scan_args(argc, argv, "01", &absolute_size);
@@ -46,8 +42,7 @@ font_describe(argc, argv, self)
 }
 
 static VALUE
-font_get_coverage(self, language)
-    VALUE self, language;
+font_get_coverage(VALUE self, VALUE language)
 {
     PangoCoverage* c = pango_font_get_coverage(_SELF(self), 
                                                (PangoLanguage*)RVAL2BOXED(language, PANGO_TYPE_LANGUAGE));
@@ -55,8 +50,7 @@ font_get_coverage(self, language)
 }
 
 static VALUE
-font_get_glyph_extents(self, glyph)
-    VALUE self, glyph;
+font_get_glyph_extents(VALUE self, VALUE glyph)
 {
     PangoRectangle ink_rect, logical_rect;
     pango_font_get_glyph_extents(_SELF(self),
@@ -69,10 +63,7 @@ font_get_glyph_extents(self, glyph)
 }
 
 static VALUE
-font_get_metrics(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+font_get_metrics(int argc, VALUE *argv, VALUE self)
 {
     VALUE language;
     PangoLanguage* lang = NULL;
@@ -88,8 +79,7 @@ font_get_metrics(argc, argv, self)
 
 #if PANGO_CHECK_VERSION(1,9,0)
 static VALUE
-font_get_font_map(self)
-    VALUE self;
+font_get_font_map(VALUE self)
 {
     return GOBJ2RVAL(pango_font_get_font_map(_SELF(self)));
 }

data/ext/pango/rbpangofontdescription.c

@@ -40,15 +40,13 @@ PangoFontDescription* pango_font_description_copy_static
 */
 
 static VALUE
-font_desc_hash(self)
-    VALUE self;
+font_desc_hash(VALUE self)
 {
     return UINT2NUM(pango_font_description_hash(_SELF(self)));
 }
 
 static VALUE
-font_desc_equal(self, other)
-    VALUE self, other;
+font_desc_equal(VALUE self, VALUE other)
 {
     return CBOOL2RVAL(pango_font_description_equal(_SELF(self), _SELF(other)));
 }
@@ -59,8 +57,7 @@ void        pango_font_descriptions_free    (PangoFontDescription **descs,
 */
 
 static VALUE
-font_desc_set_family(self, family)
-    VALUE self, family;
+font_desc_set_family(VALUE self, VALUE family)
 {
     pango_font_description_set_family(_SELF(self), RVAL2CSTR(family));
     return self;
@@ -72,38 +69,33 @@ void        pango_font_description_set_family_static
 */
 
 static VALUE
-font_desc_get_family(self)
-    VALUE self;
+font_desc_get_family(VALUE self)
 {
     return CSTR2RVAL(pango_font_description_get_family(_SELF(self)));
 }
 
 static VALUE
-font_desc_set_style(self, style)
-    VALUE self, style;
+font_desc_set_style(VALUE self, VALUE style)
 {
     pango_font_description_set_style(_SELF(self), RVAL2GENUM(style, PANGO_TYPE_STYLE));
     return self;
 }
 
 static VALUE
-font_desc_get_style(self)
-    VALUE self;
+font_desc_get_style(VALUE self)
 {
     return GENUM2RVAL(pango_font_description_get_style(_SELF(self)), PANGO_TYPE_STYLE);
 }
 
 static VALUE
-font_desc_set_variant(self, variant)
-    VALUE self, variant;
+font_desc_set_variant(VALUE self, VALUE variant)
 {
     pango_font_description_set_variant(_SELF(self), RVAL2GENUM(variant, PANGO_TYPE_VARIANT));
     return self;
 }
 
 static VALUE
-font_desc_get_variant(self)
-    VALUE self;
+font_desc_get_variant(VALUE self)
 {
     return GENUM2RVAL(pango_font_description_get_variant(_SELF(self)), PANGO_TYPE_VARIANT);
 }
@@ -117,54 +109,47 @@ font_desc_set_weight(VALUE self, VALUE weight)
 }
 
 static VALUE
-font_desc_get_weight(self)
-    VALUE self;
+font_desc_get_weight(VALUE self)
 {
     return GENUM2RVAL(pango_font_description_get_weight(_SELF(self)), PANGO_TYPE_WEIGHT);
 }
 
 static VALUE
-font_desc_set_stretch(self, stretch)
-    VALUE self, stretch;
+font_desc_set_stretch(VALUE self, VALUE stretch)
 {
     pango_font_description_set_stretch(_SELF(self), RVAL2GENUM(stretch, PANGO_TYPE_STRETCH));
     return self;
 }
 
 static VALUE
-font_desc_get_stretch(self)
-    VALUE self;
+font_desc_get_stretch(VALUE self)
 {
     return GENUM2RVAL(pango_font_description_get_stretch(_SELF(self)), PANGO_TYPE_STRETCH);
 }
 
 static VALUE
-font_desc_set_size(self, size)
-    VALUE self, size;
+font_desc_set_size(VALUE self, VALUE size)
 {
     pango_font_description_set_size(_SELF(self), NUM2INT(size));
     return self;
 }
 
 static VALUE
-font_desc_get_size(self)
-    VALUE self;
+font_desc_get_size(VALUE self)
 {
     return INT2NUM(pango_font_description_get_size(_SELF(self)));
 }
 
 #if PANGO_CHECK_VERSION(1,8,0)
 static VALUE
-font_desc_set_absolute_size(self, size)
-    VALUE self, size;
+font_desc_set_absolute_size(VALUE self, VALUE size)
 {
     pango_font_description_set_absolute_size(_SELF(self), NUM2INT(size));
     return self;
 }
 
 static VALUE
-font_desc_get_size_is_absolute(self)
-    VALUE self;
+font_desc_get_size_is_absolute(VALUE self)
 {
     return CBOOL2RVAL(pango_font_description_get_size_is_absolute(_SELF(self)));
 }
@@ -186,23 +171,20 @@ font_desc_set_gravity(VALUE self, VALUE gravity)
 #endif
 
 static VALUE
-font_desc_get_set_fields(self)
-    VALUE self;
+font_desc_get_set_fields(VALUE self)
 {
     return GFLAGS2RVAL(pango_font_description_get_set_fields(_SELF(self)), PANGO_TYPE_FONT_MASK);
 }
 
 static VALUE
-font_desc_unset_fields(self, to_unset)
-    VALUE self, to_unset;
+font_desc_unset_fields(VALUE self, VALUE to_unset)
 {
     pango_font_description_unset_fields(_SELF(self), RVAL2GFLAGS(to_unset, PANGO_TYPE_FONT_MASK));
     return self;
 }
 
 static VALUE
-font_desc_merge(self, desc_to_merge, replace_existing)
-    VALUE self, desc_to_merge, replace_existing;
+font_desc_merge(VALUE self, VALUE desc_to_merge, VALUE replace_existing)
 {
     pango_font_description_merge(_SELF(self), _SELF(desc_to_merge),
                                  RVAL2CBOOL(replace_existing));
@@ -217,8 +199,7 @@ void        pango_font_description_merge_static
 */
 
 static VALUE
-font_desc_better_match(self, old_match, new_match)
-    VALUE self, old_match, new_match;
+font_desc_better_match(VALUE self, VALUE old_match, VALUE new_match)
 {
     return CBOOL2RVAL(pango_font_description_better_match(_SELF(self), 
                                                           _SELF(old_match),
@@ -226,15 +207,13 @@ font_desc_better_match(self, old_match, new_match)
 }
 
 static VALUE
-font_desc_to_string(self)
-    VALUE self;
+font_desc_to_string(VALUE self)
 {
     return CSTR2RVAL(pango_font_description_to_string(_SELF(self)));
 }
 
 static VALUE
-font_desc_to_filename(self)
-    VALUE self;
+font_desc_to_filename(VALUE self)
 {
     return CSTR2RVAL(pango_font_description_to_filename(_SELF(self)));
 }

data/ext/pango/rbpangofontface.c

@@ -14,23 +14,20 @@
 #define _SELF(self) (PANGO_FONT_FACE(RVAL2GOBJ(self)))
 
 static VALUE
-font_face_get_face_name(self)
-    VALUE self;
+font_face_get_face_name(VALUE self)
 {
     return CSTR2RVAL(pango_font_face_get_face_name(_SELF(self)));
 }
 
 static VALUE
-font_face_describe(self)
-    VALUE self;
+font_face_describe(VALUE self)
 {
     return BOXED2RVAL(pango_font_face_describe(_SELF(self)), PANGO_TYPE_FONT_DESCRIPTION);
 }
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
-font_face_list_sizes(self)
-    VALUE self;
+font_face_list_sizes(VALUE self)
 {
     int n_sizes;
     int* sizes;

data/ext/pango/rbpangofontfamily.c

@@ -14,24 +14,21 @@
 #define _SELF(self) (PANGO_FONT_FAMILY(RVAL2GOBJ(self)))
 
 static VALUE
-font_family_get_name(self)
-    VALUE self;
+font_family_get_name(VALUE self)
 {
     return CSTR2RVAL(pango_font_family_get_name(_SELF(self)));
 }
 
 #ifdef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 static VALUE
-font_family_is_monospace(self)
-    VALUE self;
+font_family_is_monospace(VALUE self)
 {
     return CBOOL2RVAL(pango_font_family_is_monospace(_SELF(self)));
 }
 #endif
 
 static VALUE
-font_family_list_faces(self)
-    VALUE self;
+font_family_list_faces(VALUE self)
 {
     int n_faces;
     PangoFontFace** faces;

data/ext/pango/rbpangofontmap.c

@@ -17,8 +17,7 @@
 
 /*
 static VALUE
-font_map_initialize(self)
-    VALUE self;
+font_map_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_ft2_font_map_new());
     return Qnil;
@@ -26,8 +25,7 @@ font_map_initialize(self)
 */
 
 static VALUE
-font_map_load_font(self, context, desc)
-    VALUE self, context, desc;
+font_map_load_font(VALUE self, VALUE context, VALUE desc)
 {
     return GOBJ2RVAL(pango_font_map_load_font(_SELF(self), 
                                               PANGO_CONTEXT(RVAL2GOBJ(context)),
@@ -35,8 +33,7 @@ font_map_load_font(self, context, desc)
 }
 
 static VALUE
-font_map_load_fontset(self, context, desc, lang)
-    VALUE self, context, desc, lang;
+font_map_load_fontset(VALUE self, VALUE context, VALUE desc, VALUE lang)
 {
     return GOBJ2RVAL(pango_font_map_load_fontset(_SELF(self),
                                                  PANGO_CONTEXT(RVAL2GOBJ(context)),
@@ -45,8 +42,7 @@ font_map_load_fontset(self, context, desc, lang)
 }
 
 static VALUE
-font_map_list_families(self)
-    VALUE self;
+font_map_list_families(VALUE self)
 {
     int n_families;
     PangoFontFamily** families;
@@ -68,8 +64,7 @@ font_map_list_families(self)
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
-font_map_get_shape_engine_type(self)
-    VALUE self;
+font_map_get_shape_engine_type(VALUE self)
 {
     return CSTR2RVAL(pango_font_map_get_shape_engine_type(_SELF(self)));
 }

data/ext/pango/rbpangofontmetrics.c

@@ -14,55 +14,47 @@
 #define _SELF(self) ((PangoFontMetrics*)RVAL2BOXED(self, PANGO_TYPE_FONT_METRICS))
 
 static VALUE
-font_metrics_get_ascent(self)
-    VALUE self;
+font_metrics_get_ascent(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_ascent(_SELF(self)));
 }
 
 static VALUE
-font_metrics_get_descent(self)
-    VALUE self;
+font_metrics_get_descent(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_descent(_SELF(self)));
 }
 
 static VALUE
-font_metrics_get_approximate_char_width(self)
-    VALUE self;
+font_metrics_get_approximate_char_width(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_approximate_char_width(_SELF(self)));
 }
 
 static VALUE
-font_metrics_get_approximate_digit_width(self)
-    VALUE self;
+font_metrics_get_approximate_digit_width(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_approximate_digit_width(_SELF(self)));
 }
 
 #if PANGO_CHECK_VERSION(1,6,0)
 static VALUE
-font_metrics_get_underline_thickness(self)
-    VALUE self;
+font_metrics_get_underline_thickness(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_underline_thickness(_SELF(self)));
 }
 static VALUE
-font_metrics_get_underline_position(self)
-    VALUE self;
+font_metrics_get_underline_position(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_underline_position(_SELF(self)));
 }
 static VALUE
-font_metrics_get_strikethrough_thickness(self)
-    VALUE self;
+font_metrics_get_strikethrough_thickness(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_strikethrough_thickness(_SELF(self)));
 }
 static VALUE
-font_metrics_get_strikethrough_position(self)
-    VALUE self;
+font_metrics_get_strikethrough_position(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_strikethrough_position(_SELF(self)));
 }