pango 2.0.2 → 2.0.3

data/ext/pango/rbpangocontext.c

@@ -80,13 +80,11 @@ rg_set_font_map(VALUE self, VALUE font_map)
     return self;
 }
 
-#if PANGO_CHECK_VERSION(1,6,0)
 static VALUE
 rg_font_map(VALUE self)
 {
     return GOBJ2RVAL(pango_context_get_font_map(_SELF(self)));
 }
-#endif
 #endif /* PANGO_ENABLE_BACKEND */
 
 static VALUE
@@ -159,7 +157,6 @@ rg_set_gravity_hint(VALUE self, VALUE gravity_hint)
 }
 #endif
 
-#if PANGO_CHECK_VERSION(1,6,0)
 static VALUE
 rg_matrix(VALUE self)
 {
@@ -174,7 +171,6 @@ rg_set_matrix(VALUE self, VALUE matrix)
                              RVAL2PANGOMATRIX(matrix));
     return self;
 }
-#endif
 
 static VALUE
 rg_load_font(VALUE self, VALUE desc)
@@ -222,8 +218,7 @@ rg_families(VALUE self)
     return result;
 }
 
-#if PANGO_CHECK_VERSION(1,10,0)
-#  ifdef HAVE_RB_CAIRO_H
+#ifdef HAVE_RB_CAIRO_H
 static VALUE
 rg_set_font_options(VALUE self, VALUE options)
 {
@@ -258,7 +253,6 @@ rg_resolution(VALUE self)
 {
     return rb_float_new(pango_cairo_context_get_resolution(_SELF(self)));
 }
-#  endif
 #endif
 
 static VALUE
@@ -278,9 +272,7 @@ Init_pango_context(VALUE mPango)
 #ifdef PANGO_ENABLE_BACKEND
     RG_DEF_METHOD(initialize, 0);
     RG_DEF_METHOD(set_font_map, 1);
-#if PANGO_CHECK_VERSION(1,6,0)
     RG_DEF_METHOD(font_map, 0);
-#endif
 #endif /* PANGO_ENABLE_BACKEND */
     RG_DEF_METHOD(font_description, 0);
     RG_DEF_METHOD(set_font_description, 1);
@@ -294,22 +286,18 @@ Init_pango_context(VALUE mPango)
     RG_DEF_METHOD(gravity_hint, 0);
     RG_DEF_METHOD(set_gravity_hint, 1);
 #endif
-#if PANGO_CHECK_VERSION(1,6,0)
     RG_DEF_METHOD(matrix, 0);
     RG_DEF_METHOD(set_matrix, 1);
-#endif
     RG_DEF_METHOD(load_font, 1);
     RG_DEF_METHOD(load_fontset, 2);
     RG_DEF_METHOD(get_metrics, -1);
     RG_DEF_METHOD(families, 0);
 
-#if PANGO_CHECK_VERSION(1,10,0)
-#  ifdef HAVE_RB_CAIRO_H
+#ifdef HAVE_RB_CAIRO_H
     RG_DEF_METHOD(set_font_options, 1);
     RG_DEF_METHOD(font_options, 0);
     RG_DEF_METHOD(set_resolution, 1);
     RG_DEF_METHOD(resolution, 0);
-#  endif
 #endif
 
     /* This will remove 2 or 3 releases later since 0.14.0. */

data/ext/pango/rbpangofont.c

@@ -41,12 +41,7 @@ rg_describe(int argc, VALUE *argv, VALUE self)
     if (NIL_P(absolute_size) || ! RVAL2CBOOL(absolute_size)){
         desc = PANGOFONTDESCRIPTION2RVAL(pango_font_describe(_SELF(self)));
     } else {
-#if PANGO_CHECK_VERSION(1,14,0)
         desc = PANGOFONTDESCRIPTION2RVAL(pango_font_describe_with_absolute_size(_SELF(self)));
-#else
-        rb_warning("Pango::Font#describe(absolute) has been supported since GTK+-2.10.x. Use Pango::Font#describe() instead."); 
-        desc = PANGOFONTDESCRIPTION2RVAL(pango_font_describe(_SELF(self)));
-#endif
     }
     return desc;
 }
@@ -86,13 +81,11 @@ rg_metrics(int argc, VALUE *argv, VALUE self)
     return PANGOFONTMETRICS2RVAL(pango_font_get_metrics(_SELF(self), lang));
 }
 
-#if PANGO_CHECK_VERSION(1,9,0)
 static VALUE
 rg_font_map(VALUE self)
 {
     return GOBJ2RVAL(pango_font_get_font_map(_SELF(self)));
 }
-#endif
 
 void
 Init_pango_font(VALUE mPango)
@@ -104,10 +97,7 @@ Init_pango_font(VALUE mPango)
     RG_DEF_METHOD(get_coverage, 1);
     RG_DEF_METHOD(get_glyph_extents, 1);
     RG_DEF_METHOD(metrics, -1);
-
-#if PANGO_CHECK_VERSION(1,9,0)
     RG_DEF_METHOD(font_map, 0);
-#endif
 
     G_DEF_CLASS3("PangoXFont", "XFont", mPango);
     G_DEF_CLASS3("PangoFT2Font", "FT2Font", mPango);
@@ -116,7 +106,5 @@ Init_pango_font(VALUE mPango)
     G_DEF_CLASS3("PangoCairoFcFont", "CairoFcFont", mPango);
     G_DEF_CLASS3("PangoCairoFont", "CairoFont", mPango);
     G_DEF_CLASS3("PangoCairoWin32Font", "CairoWin32Font", mPango);
-#if PANGO_CHECK_VERSION(1,12,0)
     G_DEF_CLASS3("PangoATSUIFont", "ATSUIFont", mPango);
-#endif
 }

data/ext/pango/rbpangofontdescription.c

@@ -150,7 +150,6 @@ rg_size(VALUE self)
     return INT2NUM(pango_font_description_get_size(_SELF(self)));
 }
 
-#if PANGO_CHECK_VERSION(1,8,0)
 static VALUE
 rg_set_absolute_size(VALUE self, VALUE size)
 {
@@ -163,7 +162,6 @@ rg_size_is_absolute_p(VALUE self)
 {
     return CBOOL2RVAL(pango_font_description_get_size_is_absolute(_SELF(self)));
 }
-#endif
 
 #if PANGO_CHECK_VERSION(1,16,0)
 static VALUE
@@ -248,11 +246,8 @@ Init_pango_font_description(VALUE mPango)
     RG_DEF_METHOD(stretch, 0);
     RG_DEF_METHOD(set_size, 1);
     RG_DEF_METHOD(size, 0);
-
-#if PANGO_CHECK_VERSION(1,8,0)
     RG_DEF_METHOD(set_absolute_size, 1);
     RG_DEF_METHOD_P(size_is_absolute, 0);
-#endif
 #if PANGO_CHECK_VERSION(1,16,0)
     RG_DEF_METHOD(set_gravity, 1);
     RG_DEF_METHOD(gravity, 0);

data/ext/pango/rbpangofontface.c

@@ -36,7 +36,6 @@ rg_describe(VALUE self)
     return PANGOFONTDESCRIPTION2RVAL(pango_font_face_describe(_SELF(self)));
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
 rg_sizes(VALUE self)
 {
@@ -56,7 +55,6 @@ rg_sizes(VALUE self)
     g_free(sizes);
     return result;
 }
-#endif
 
 void
 Init_pango_font_face(VALUE mPango)
@@ -65,15 +63,11 @@ Init_pango_font_face(VALUE mPango)
 
     RG_DEF_METHOD(name, 0);
     RG_DEF_METHOD(describe, 0);
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_METHOD(sizes, 0);
-#endif
     G_DEF_CLASS3("PangoFcFace", "FcFace", mPango);
     G_DEF_CLASS3("PangoFT2Face", "FT2Face", mPango);
     G_DEF_CLASS3("PangoXftFace", "XftFace", mPango);
     G_DEF_CLASS3("PangoXFace", "XFace", mPango);
     G_DEF_CLASS3("PangoWin32Face", "Win32Face", mPango);
-#if PANGO_CHECK_VERSION(1,12,0)
     G_DEF_CLASS3("PangoATSUIFace", "ATSUIFace", mPango);
-#endif
 }

data/ext/pango/rbpangofontfamily.c

@@ -75,8 +75,5 @@ Init_pango_font_family(VALUE mPango)
     G_DEF_CLASS3("PangoXftFamily", "XftFamily", mPango);
     G_DEF_CLASS3("PangoXFamily", "XFamily", mPango);
     G_DEF_CLASS3("PangoWin32Family", "Win32Family", mPango);
-#if PANGO_CHECK_VERSION(1,12,0)
     G_DEF_CLASS3("PangoATSUIFamily", "ATSUIFamily", mPango);
-#endif
-
 }

data/ext/pango/rbpangofontmap.c

@@ -71,13 +71,11 @@ rg_families(VALUE self)
     return result;
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
 rg_shape_engine_type(VALUE self)
 {
     return CSTR2RVAL(pango_font_map_get_shape_engine_type(_SELF(self)));
 }
-#endif
 
 void
 Init_pango_font_map(VALUE mPango)
@@ -90,9 +88,7 @@ Init_pango_font_map(VALUE mPango)
     RG_DEF_METHOD(load_font, 2);
     RG_DEF_METHOD(load_fontset, 3);
     RG_DEF_METHOD(families, 0);
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_METHOD(shape_engine_type, 0);
-#endif
 
     G_DEF_CLASS3("PangoFcFontMap", "FcFontMap", mPango);
     G_DEF_CLASS3("PangoXftFontMap", "XftFontMap", mPango);

data/ext/pango/rbpangofontmetrics.c

@@ -48,7 +48,6 @@ rg_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
 rg_underline_thickness(VALUE self)
 {
@@ -69,7 +68,7 @@ rg_strikethrough_position(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_strikethrough_position(_SELF(self)));
 }
-#endif
+
 void
 Init_pango_font_metrics(VALUE mPango)
 {
@@ -79,10 +78,8 @@ Init_pango_font_metrics(VALUE mPango)
     RG_DEF_METHOD(descent, 0);
     RG_DEF_METHOD(approximate_char_width, 0);
     RG_DEF_METHOD(approximate_digit_width, 0);
-#if PANGO_CHECK_VERSION(1,6,0)
     RG_DEF_METHOD(underline_thickness, 0);
     RG_DEF_METHOD(underline_position, 0);
     RG_DEF_METHOD(strikethrough_thickness, 0);
     RG_DEF_METHOD(strikethrough_position, 0);
-#endif
 }

data/ext/pango/rbpangofontset.c

@@ -38,7 +38,6 @@ rg_metrics(VALUE self)
     return PANGOFONTMETRICS2RVAL(pango_fontset_get_metrics(_SELF(self)));
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static gboolean
 fontset_each(PangoFontset *fontset, PangoFont *font, gpointer func)
 {
@@ -56,7 +55,6 @@ rg_each(VALUE self)
                           (gpointer)func);
     return self;
 }
-#endif
 
 void
 Init_pango_fontset(VALUE mPango)
@@ -67,7 +65,5 @@ Init_pango_fontset(VALUE mPango)
 
     RG_DEF_METHOD(get_font, 1);
     RG_DEF_METHOD(metrics, 0);
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_METHOD(each, 0);
-#endif
 }

data/ext/pango/rbpangoglyphitem.c

@@ -21,7 +21,6 @@
 
 #include "rbpangoprivate.h"
 
-#if PANGO_CHECK_VERSION(1,2,0)
 #define RG_TARGET_NAMESPACE cGlyphItem
 #define _SELF(r) (RVAL2PANGOGLYPHITEM(r))
 
@@ -102,7 +101,6 @@ rg_appy_attrs(VALUE self, VALUE text, VALUE attrs)
     return ret;
 }
 
-#if PANGO_CHECK_VERSION(1,6,0)
 static VALUE
 rg_letter_space(VALUE self, VALUE text, VALUE log_attrs, VALUE letter_spacing)
 {
@@ -111,13 +109,10 @@ rg_letter_space(VALUE self, VALUE text, VALUE log_attrs, VALUE letter_spacing)
                                   NUM2INT(letter_spacing));
     return self;
 }
-#endif
-#endif
 
 void
 Init_pango_glyph_item(VALUE mPango)
 {
-#if PANGO_CHECK_VERSION(1,2,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_GLYPH_ITEM, "GlyphItem", mPango);
 
     RG_DEF_METHOD(item, 0);
@@ -126,8 +121,5 @@ Init_pango_glyph_item(VALUE mPango)
     RG_DEF_METHOD(split, 2);
     RG_DEF_METHOD(appy_attrs, 2);
 
-#if PANGO_CHECK_VERSION(1,6,0)
     RG_DEF_METHOD(letter_space, 3);
-#endif
-#endif
 }

data/ext/pango/rbpangoglyphstring.c

@@ -62,13 +62,11 @@ rg_extents(int argc, VALUE *argv, VALUE self)
                         PANGORECTANGLE2RVAL(&logical_rect));
 }
 
-#if PANGO_CHECK_VERSION(1,14,0)
 static VALUE
 rg_width(VALUE self)
 {
     return INT2NUM(pango_glyph_string_get_width(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_index_to_x(VALUE self, VALUE text, VALUE analysis, VALUE index, VALUE trailing)
@@ -145,9 +143,7 @@ Init_pango_glyph_string(VALUE mPango)
     RG_DEF_METHOD(initialize, 0);
     RG_DEF_METHOD(set_size, 1);
     RG_DEF_METHOD(extents, -1);
-#if PANGO_CHECK_VERSION(1,14,0)
     RG_DEF_METHOD(width, 0);
-#endif
     RG_DEF_METHOD(index_to_x, 4);
     RG_DEF_METHOD(x_to_index, 3);
     RG_DEF_METHOD(get_logical_widths, 2);

data/ext/pango/rbpangoitem.c

@@ -41,22 +41,6 @@ item_int_set_ ## name (VALUE self, VALUE val)\
     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)
-GType
-pango_item_get_type(void)
-{
-    static GType our_type = 0;
-
-    if (our_type == 0)
-        our_type = g_boxed_type_register_static ("PangoItem",
-                    (GBoxedCopyFunc)pango_item_copy,
-                    (GBoxedFreeFunc)pango_item_free);
-    return our_type;
-}
-#endif
-/**********************************/
-
 static VALUE
 rg_initialize(VALUE self)
 {

data/ext/pango/rbpangolanguage.c

@@ -61,7 +61,6 @@ rg_to_str(VALUE self)
     return CSTR2RVAL(pango_language_to_string(_SELF(self)));
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 /* Moved from Pango::Script */
 static VALUE
 rg_includes_script(VALUE self, VALUE script)
@@ -69,7 +68,6 @@ rg_includes_script(VALUE self, VALUE script)
     return CBOOL2RVAL(pango_language_includes_script(_SELF(self), 
                                                      RVAL2PANGOSCRIPT(script)));
 }
-#endif
 
 void
 Init_pango_language(VALUE mPango)
@@ -84,8 +82,5 @@ Init_pango_language(VALUE mPango)
     RG_DEF_METHOD(to_str, 0);
     RG_DEF_ALIAS("to_s", "to_str");
 
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_METHOD(includes_script, 1);
-#endif
-
 }

data/ext/pango/rbpangolayout.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2005 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -102,7 +102,7 @@ rg_operator_layout_set_markup_eq(VALUE self, VALUE markup)
 static VALUE
 rg_set_attributes(VALUE self, VALUE attrs)
 {
-    pango_layout_set_attributes(_SELF(self), 
+    pango_layout_set_attributes(_SELF(self),
                                 RVAL2PANGOATTRLIST(attrs));
     return self;
 }
@@ -134,14 +134,12 @@ rg_set_font_description(VALUE self, VALUE rb_desc)
     return self;
 }
 
-#ifdef HAVE_PANGO_LAYOUT_GET_FONT_DESCRIPTION
 static VALUE
 rg_font_description(VALUE self)
 {
     const PangoFontDescription* desc = pango_layout_get_font_description(_SELF(self));
     return PANGOFONTDESCRIPTION2RVAL((gpointer)desc);
 }
-#endif
 
 static VALUE
 rg_set_width(VALUE self, VALUE width)
@@ -156,6 +154,21 @@ rg_width(VALUE self)
     return INT2NUM(pango_layout_get_width(_SELF(self)));
 }
 
+#if PANGO_CHECK_VERSION(1, 20, 0)
+static VALUE
+rg_set_height(VALUE self, VALUE width)
+{
+    pango_layout_set_height(_SELF(self), NUM2INT(width));
+    return self;
+}
+
+static VALUE
+rg_height(VALUE self)
+{
+    return INT2NUM(pango_layout_get_height(_SELF(self)));
+}
+#endif
+
 static VALUE
 rg_set_wrap(VALUE self, VALUE wrap)
 {
@@ -169,18 +182,25 @@ rg_wrap(VALUE self)
     return PANGOWRAPMODE2RVAL(pango_layout_get_wrap(_SELF(self)));
 }
 
-#ifdef HAVE_PANGO_LAYOUT_SET_ELLIPSIZE
 static VALUE
 rg_set_ellipsize(VALUE self, VALUE ellipsize)
 {
     pango_layout_set_ellipsize(_SELF(self), RVAL2PANGOELLIPSIZEMODE(ellipsize));
     return self;
 }
+
 static VALUE
 rg_ellipsize(VALUE self)
 {
     return PANGOELLIPSIZEMODE2RVAL(pango_layout_get_ellipsize(_SELF(self)));
 }
+
+#if PANGO_CHECK_VERSION(1, 16, 0)
+static VALUE
+rg_ellipsized_p(VALUE self)
+{
+    return CBOOL2RVAL(pango_layout_is_ellipsized(_SELF(self)));
+}
 #endif
 
 static VALUE
@@ -221,7 +241,6 @@ rg_justify_p(VALUE self)
     return CBOOL2RVAL(pango_layout_get_justify(_SELF(self)));
 }
 
-#if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
 rg_set_auto_dir(VALUE self, VALUE auto_dir)
 {
@@ -233,7 +252,6 @@ rg_auto_dir_p(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_get_auto_dir(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_set_alignment(VALUE self, VALUE align)
@@ -251,7 +269,7 @@ rg_alignment(VALUE self)
 static VALUE
 rg_set_tabs(VALUE self, VALUE tabs)
 {
-    pango_layout_set_tabs(_SELF(self), 
+    pango_layout_set_tabs(_SELF(self),
                           RVAL2PANGOTABARRAY(tabs));
     return self;
 }
@@ -305,8 +323,8 @@ static VALUE
 rg_xy_to_index(VALUE self, VALUE x, VALUE y)
 {
     int index, trailing;
-    gboolean ret = pango_layout_xy_to_index(_SELF(self), 
-                                            NUM2INT(x), NUM2INT(y), 
+    gboolean ret = pango_layout_xy_to_index(_SELF(self),
+                                            NUM2INT(x), NUM2INT(y),
                                             &index, &trailing);
 
     return rb_ary_new3(3, CBOOL2RVAL(ret), INT2NUM(index), INT2NUM(trailing));
@@ -371,7 +389,7 @@ rg_get_extents(int argc, VALUE *argv, VALUE self)
         rlog.y = rect->y;
         rlog.width = rect->width;
         rlog.height = rect->height;
-    }   
+    }
 
     pango_layout_get_extents(_SELF(self), &rink, &rlog);
 
@@ -421,7 +439,7 @@ rg_get_pixel_extents(int argc, VALUE *argv, VALUE self)
         rlog.y = rect->y;
         rlog.width = rect->width;
         rlog.height = rect->height;
-    }   
+    }
 
     pango_layout_get_pixel_extents(_SELF(self), &rink, &rlog);
 
@@ -496,16 +514,19 @@ Init_pango_layout(VALUE mPango)
     RG_DEF_METHOD(set_attributes, 1);
     RG_DEF_METHOD(attributes, 0);
     RG_DEF_METHOD(set_font_description, 1);
-#ifdef HAVE_PANGO_LAYOUT_GET_FONT_DESCRIPTION
     RG_DEF_METHOD(font_description, 0);
-#endif
     RG_DEF_METHOD(set_width, 1);
     RG_DEF_METHOD(width, 0);
+#if PANGO_CHECK_VERSION(1, 20, 0)
+    RG_DEF_METHOD(set_height, 1);
+    RG_DEF_METHOD(height, 0);
+#endif
     RG_DEF_METHOD(set_wrap, 1);
     RG_DEF_METHOD(wrap, 0);
-#ifdef HAVE_PANGO_LAYOUT_SET_ELLIPSIZE
     RG_DEF_METHOD(set_ellipsize, 1);
     RG_DEF_METHOD(ellipsize, 0);
+#if PANGO_CHECK_VERSION(1, 16, 0)
+    RG_DEF_METHOD_P(ellipsized, 0);
 #endif
     RG_DEF_METHOD(set_indent, 1);
     RG_DEF_METHOD(indent, 0);
@@ -513,10 +534,8 @@ Init_pango_layout(VALUE mPango)
     RG_DEF_METHOD(set_spacing, 1);
     RG_DEF_METHOD(set_justify, 1);
     RG_DEF_METHOD_P(justify, 0);
-#if PANGO_CHECK_VERSION(1,4,0)
     RG_DEF_METHOD(set_auto_dir, 1);
     RG_DEF_METHOD_P(auto_dir, 0);
-#endif
     RG_DEF_METHOD(set_alignment, 1);
     RG_DEF_METHOD(alignment, 0);
     RG_DEF_METHOD(set_tabs, 1);
@@ -547,9 +566,7 @@ Init_pango_layout(VALUE mPango)
     G_DEF_CLASS(PANGO_TYPE_ALIGNMENT, "Alignment", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_ALIGNMENT, "PANGO_");
 
-#ifdef HAVE_PANGO_LAYOUT_SET_ELLIPSIZE
     /* PangoEllipsizeMode */
     G_DEF_CLASS(PANGO_TYPE_ELLIPSIZE_MODE, "EllipsizeMode", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_ELLIPSIZE_MODE, "PANGO_");
-#endif
 }