pango 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b47705e3fbee25a3a17f088c190dd2175077bc
-  data.tar.gz: 80b49ed0fe185132b544ef6dd9c903f611117509
+  metadata.gz: 13aec0addeeddca2d47c77c24525a916e70d3ba2
+  data.tar.gz: bc72ac66cb33eb742d588023522c98e0ed1dd5aa
 SHA512:
-  metadata.gz: 38c50ec51ab76398e2dd4450cde1c36b19ab8f2ab7ac68d3bda375a60144a8d44971e75d1c20f4d867eb6f7ba32b6ac6c08d2395719c56b42971915842f8c016
-  data.tar.gz: 9c0a8d0209b9d2678b8d870d8556fb3ca51cd0b0d4fa060c1f0b89d17ede6088e3404f7d4086501b94fde3a2c795c11e671fc65dae7b321efb2236569990d9b6
+  metadata.gz: 606469bd983e8a30e5560289b45ae145223ca793cf59f4652635738901ff9e209bf89120b682e4ea42947e6babc5f31ed813016110a4188b01b62928d867db36
+  data.tar.gz: fd93e8a06ade62dc87a8944c63172b5e6e6b91ca36e6cc378b32baa251dfccc0e7a33e1b7dc3903551dfaf6b8ed025d5afdd537ecb0374850d22e5fae88f1bc2

data/Rakefile

@@ -91,7 +91,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "pango",
       :download_site => :gnome,
       :label => "Pango",
-      :version => "1.40.5",
+      :version => "1.40.6",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/pango/pango.def

@@ -1,2 +1,3 @@
 EXPORTS
     Init_pango
+    pango_attr_list_get_type

data/ext/pango/rb-pango-attr-iterator.c

@@ -0,0 +1,60 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rb-pango-private.h"
+
+#define RG_TARGET_NAMESPACE cAttrIterator
+#define _SELF(self) (RVAL2PANGOATTRITERATOR(self))
+
+G_DEFINE_BOXED_TYPE(PangoAttrIterator,
+                    pango_attr_iterator,
+                    pango_attr_iterator_copy,
+                    pango_attr_iterator_destroy);
+
+static VALUE
+rg_attrs(VALUE self)
+{
+    GSList *attrs;
+    GSList *node;
+    VALUE rb_attrs;
+
+    attrs = pango_attr_iterator_get_attrs(_SELF(self));
+    rb_attrs = rb_ary_new();
+    for (node = attrs; node; node = g_slist_next(node)) {
+        PangoAttribute *attr = node->data;
+        VALUE rb_attr;
+
+        rb_attr = rbpango_attribute_to_ruby(attr);
+        rb_ary_push(rb_attrs, rb_attr);
+    }
+    g_slist_free(attrs);
+
+    return rb_attrs;
+}
+
+void
+rbpango_attr_iterator_init(VALUE mPango)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE =
+        G_DEF_CLASS(PANGO_TYPE_ATTR_ITERATOR, "AttrIterator", mPango);
+    RG_DEF_METHOD(attrs, 0);
+}

data/ext/pango/rb-pango-attr-list.c

@@ -52,6 +52,15 @@ rg_insert_before(VALUE self, VALUE rb_attribute)
     return self;
 }
 
+static VALUE
+rg_iterator(VALUE self)
+{
+    PangoAttrIterator *iterator;
+
+    iterator = pango_attr_list_get_iterator(RVAL2PANGOATTRLIST(self));
+    return PANGOATTRITERATOR2RVAL(iterator);
+}
+
 void
 rbpango_attr_list_init(VALUE mPango)
 {
@@ -61,4 +70,5 @@ rbpango_attr_list_init(VALUE mPango)
 
     RG_DEF_METHOD(insert, 1);
     RG_DEF_METHOD(insert_before, 1);
+    RG_DEF_METHOD(iterator, 0);
 }

data/ext/pango/rb-pango-attribute.c

@@ -20,12 +20,150 @@
 
 #include "rb-pango-private.h"
 
+VALUE
+rbpango_attribute_to_ruby(PangoAttribute *attribute)
+{
+    VALUE rb_attr_type;
+    ID id_to_class;
+    VALUE klass;
+
+    rb_attr_type = GENUM2RVAL(attribute->klass->type, PANGO_TYPE_ATTR_TYPE);
+    CONST_ID(id_to_class, "to_class");
+    klass = rb_funcall(rb_attr_type, id_to_class, 0);
+    return Data_Wrap_Struct(klass,
+                            NULL,
+                            pango_attribute_destroy,
+                            pango_attribute_copy(attribute));
+}
+
+PangoAttribute *
+rbpango_attribute_from_ruby(VALUE rb_attribute)
+{
+    PangoAttribute *attribute;
+
+    Data_Get_Struct(rb_attribute, PangoAttribute, attribute);
+
+    return attribute;
+}
+
 static VALUE
 rbpango_attribute_allocate(VALUE klass)
 {
     return Data_Wrap_Struct(klass, NULL, pango_attribute_destroy, 0);
 }
 
+static VALUE
+rbpango_attr_bool_get_value(VALUE self)
+{
+    PangoAttribute *attribute;
+
+    attribute = rbpango_attribute_from_ruby(self);
+
+    return CBOOL2RVAL(((PangoAttrInt *)attribute)->value);
+}
+
+static VALUE
+rbpango_attr_language_initialize(VALUE self, VALUE rb_language)
+{
+    PangoLanguage *language;
+
+    language = RVAL2PANGOLANGUAGE(rb_language);
+    DATA_PTR(self) = pango_attr_language_new(language);
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_family_initialize(VALUE self, VALUE rb_family)
+{
+    DATA_PTR(self) = pango_attr_family_new(RVAL2CSTR(rb_family));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_style_initialize(VALUE self, VALUE rb_style)
+{
+    DATA_PTR(self) = pango_attr_style_new(RVAL2PANGOSTYLE(rb_style));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_style_get_value(VALUE self)
+{
+    PangoAttribute *attribute;
+
+    attribute = rbpango_attribute_from_ruby(self);
+
+    return PANGOSTYLE2RVAL(((PangoAttrInt *)attribute)->value);
+}
+
+static VALUE
+rbpango_attr_weight_initialize(VALUE self, VALUE rb_weight)
+{
+    DATA_PTR(self) = pango_attr_weight_new(RVAL2PANGOWEIGHT(rb_weight));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_weight_get_value(VALUE self)
+{
+    PangoAttribute *attribute;
+
+    attribute = rbpango_attribute_from_ruby(self);
+
+    return PANGOWEIGHT2RVAL(((PangoAttrInt *)attribute)->value);
+}
+
+static VALUE
+rbpango_attr_variant_initialize(VALUE self, VALUE rb_variant)
+{
+    DATA_PTR(self) = pango_attr_variant_new(RVAL2PANGOVARIANT(rb_variant));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_variant_get_value(VALUE self)
+{
+    PangoAttribute *attribute;
+
+    attribute = rbpango_attribute_from_ruby(self);
+
+    return PANGOVARIANT2RVAL(((PangoAttrInt *)attribute)->value);
+}
+
+static VALUE
+rbpango_attr_stretch_initialize(VALUE self, VALUE rb_stretch)
+{
+    DATA_PTR(self) = pango_attr_stretch_new(RVAL2PANGOSTRETCH(rb_stretch));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_stretch_get_value(VALUE self)
+{
+    PangoAttribute *attribute;
+
+    attribute = rbpango_attribute_from_ruby(self);
+
+    return PANGOSTRETCH2RVAL(((PangoAttrInt *)attribute)->value);
+}
+
+static VALUE
+rbpango_attr_size_initialize(VALUE self, VALUE rb_size)
+{
+    gint size;
+
+    size = NUM2INT(rb_size);
+    DATA_PTR(self) = pango_attr_size_new(size);
+
+    return Qnil;
+}
+
 static VALUE
 rbpango_attr_font_desc_initialize(VALUE self, VALUE rb_font_desc)
 {
@@ -48,20 +186,61 @@ rbpango_attr_font_desc_initialize(VALUE self, VALUE rb_font_desc)
 }
 
 static VALUE
-rbpango_attr_font_features_initialize(VALUE self, VALUE rb_font_features)
+rbpango_attr_foregound_initialize(VALUE self,
+                                  VALUE rb_red,
+                                  VALUE rb_green,
+                                  VALUE rb_blue)
 {
-    DATA_PTR(self) = pango_attr_font_features_new(RVAL2CSTR(rb_font_features));
+    DATA_PTR(self) = pango_attr_foreground_new(NUM2UINT(rb_red),
+                                               NUM2UINT(rb_green),
+                                               NUM2UINT(rb_blue));
 
     return Qnil;
 }
 
 static VALUE
-rbpango_attr_language_initialize(VALUE self, VALUE rb_language)
+rbpango_attr_background_initialize(VALUE self,
+                                   VALUE rb_red,
+                                   VALUE rb_green,
+                                   VALUE rb_blue)
 {
-    PangoLanguage *language;
+    DATA_PTR(self) = pango_attr_background_new(NUM2UINT(rb_red),
+                                               NUM2UINT(rb_green),
+                                               NUM2UINT(rb_blue));
 
-    language = RVAL2PANGOLANGUAGE(rb_language);
-    DATA_PTR(self) = pango_attr_language_new(language);
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_underline_initialize(VALUE self, VALUE rb_underline)
+{
+    DATA_PTR(self) = pango_attr_underline_new(RVAL2PANGOUNDERLINE(rb_underline));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_underline_get_value(VALUE self)
+{
+    PangoAttribute *attribute;
+
+    attribute = rbpango_attribute_from_ruby(self);
+
+    return PANGOUNDERLINE2RVAL(((PangoAttrInt *)attribute)->value);
+}
+
+static VALUE
+rbpango_attr_strikethrough_initialize(VALUE self, VALUE rb_strikethrough)
+{
+    DATA_PTR(self) = pango_attr_strikethrough_new(RVAL2CBOOL(rb_strikethrough));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_rise_initialize(VALUE self, VALUE rb_rise)
+{
+    DATA_PTR(self) = pango_attr_rise_new(NUM2INT(rb_rise));
 
     return Qnil;
 }
@@ -102,17 +281,126 @@ rbpango_attr_shape_get_data(VALUE self)
 
     Data_Get_Struct(self, PangoAttrShape, attr_shape);
     rb_data = (VALUE)(attr_shape->data);
-    rb_p(rb_data);
     return rb_data;
 }
 
 static VALUE
-rbpango_attr_size_initialize(VALUE self, VALUE rb_size)
+rbpango_attr_scale_initialize(VALUE self, VALUE rb_scale)
 {
-    gint size;
+    DATA_PTR(self) = pango_attr_scale_new(NUM2DBL(rb_scale));
 
-    size = NUM2INT(rb_size);
-    DATA_PTR(self) = pango_attr_size_new(size);
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_fallback_initialize(VALUE self, VALUE rb_enable_fallback)
+{
+    DATA_PTR(self) = pango_attr_fallback_new(RVAL2CBOOL(rb_enable_fallback));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_letter_spacing_initialize(VALUE self, VALUE rb_letter_spacing)
+{
+    DATA_PTR(self) = pango_attr_letter_spacing_new(NUM2INT(rb_letter_spacing));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_underline_color_initialize(VALUE self,
+                                        VALUE rb_red,
+                                        VALUE rb_green,
+                                        VALUE rb_blue)
+{
+    DATA_PTR(self) = pango_attr_underline_color_new(NUM2UINT(rb_red),
+                                                    NUM2UINT(rb_green),
+                                                    NUM2UINT(rb_blue));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_strikethrough_color_initialize(VALUE self,
+                                            VALUE rb_red,
+                                            VALUE rb_green,
+                                            VALUE rb_blue)
+{
+    DATA_PTR(self) = pango_attr_strikethrough_color_new(NUM2UINT(rb_red),
+                                                        NUM2UINT(rb_green),
+                                                        NUM2UINT(rb_blue));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_absolute_size_initialize(VALUE self, VALUE rb_absolute_size)
+{
+    DATA_PTR(self) = pango_attr_size_new_absolute(NUM2INT(rb_absolute_size));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_gravity_initialize(VALUE self, VALUE rb_gravity)
+{
+    DATA_PTR(self) = pango_attr_gravity_new(RVAL2PANGOGRAVITY(rb_gravity));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_gravity_get_value(VALUE self)
+{
+    PangoAttribute *attribute;
+
+    attribute = rbpango_attribute_from_ruby(self);
+
+    return PANGOGRAVITY2RVAL(((PangoAttrInt *)attribute)->value);
+}
+
+static VALUE
+rbpango_attr_gravity_hint_initialize(VALUE self, VALUE rb_gravity_hint)
+{
+    PangoGravityHint hint;
+
+    hint = RVAL2PANGOGRAVITYHINT(rb_gravity_hint);
+    DATA_PTR(self) = pango_attr_gravity_hint_new(hint);
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_gravity_hint_get_value(VALUE self)
+{
+    PangoAttribute *attribute;
+
+    attribute = rbpango_attribute_from_ruby(self);
+
+    return PANGOGRAVITYHINT2RVAL(((PangoAttrInt *)attribute)->value);
+}
+
+static VALUE
+rbpango_attr_font_features_initialize(VALUE self, VALUE rb_font_features)
+{
+    DATA_PTR(self) = pango_attr_font_features_new(RVAL2CSTR(rb_font_features));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_foreground_alpha_initialize(VALUE self, VALUE rb_alpha)
+{
+    DATA_PTR(self) = pango_attr_foreground_alpha_new(NUM2UINT(rb_alpha));
+
+    return Qnil;
+}
+
+static VALUE
+rbpango_attr_background_alpha_initialize(VALUE self, VALUE rb_alpha)
+{
+    DATA_PTR(self) = pango_attr_background_alpha_new(NUM2UINT(rb_alpha));
 
     return Qnil;
 }
@@ -121,45 +409,136 @@ void
 rbpango_attribute_init(VALUE mPango)
 {
     VALUE cAttribute;
+    VALUE cAttrString;
+    VALUE cAttrColor;
+    VALUE cAttrInt;
+    VALUE cAttrBool;
+    VALUE cAttrFloat;
+    VALUE cAttrLanguage;
+    VALUE cAttrFamily;
+    VALUE cAttrStyle;
+    VALUE cAttrWeight;
+    VALUE cAttrVariant;
+    VALUE cAttrStretch;
+    VALUE cAttrSize;
+    VALUE cAttrFontDesc;
+    VALUE cAttrForeground;
+    VALUE cAttrBackground;
+    VALUE cAttrUnderline;
+    VALUE cAttrStrikethrough;
+    VALUE cAttrRise;
+    VALUE cAttrShape;
+    VALUE cAttrScale;
+    VALUE cAttrFallback;
+    VALUE cAttrLetterSpacing;
+    VALUE cAttrUnderlineColor;
+    VALUE cAttrStrikethroughColor;
+    VALUE cAttrAbsoluteSize;
+    VALUE cAttrGravity;
+    VALUE cAttrGravityHint;
+    VALUE cAttrFontFeatures;
+    VALUE cAttrForegroundAlpha;
+    VALUE cAttrBackgroundAlpha;
 
     cAttribute = rb_define_class_under(mPango, "Attribute", rb_cData);
     rb_define_alloc_func(cAttribute, rbpango_attribute_allocate);
 
-#define DEFINE_ABSTRACT_ATTRIBUTE(ClassName)                            \
-    do {                                                                \
-        rb_define_class_under(mPango,                                   \
-                              #ClassName,                               \
-                              cAttribute);                              \
+#define DEFINE_ABSTRACT_ATTRIBUTE_BEGIN(ClassName, parent) do { \
+        c ## ClassName = rb_define_class_under(mPango,          \
+                                               #ClassName,      \
+                                               parent);
+
+#define DEFINE_ABSTRACT_ATTRIBUTE_END()         \
     } while (FALSE)
 
-#define DEFINE_ATTRIBUTE_BEGIN(ClassName, method_name, n_initialize_args)     \
-        VALUE c ## ClassName;                                           \
+#define DEFINE_ABSTRACT_ATTRIBUTE(ClassName, parent)                    \
+    DEFINE_ABSTRACT_ATTRIBUTE_BEGIN(ClassName, parent) {                \
+    } DEFINE_ABSTRACT_ATTRIBUTE_END()
+
+#define DEFINE_ATTRIBUTE_BEGIN(ClassName,                               \
+                               parent,                                  \
+                               method_name,                             \
+                               n_initialize_args) do {                  \
         c ## ClassName = rb_define_class_under(mPango,                  \
                                                #ClassName,              \
-            cAttribute);                                                \
+                                               parent);                 \
         rb_define_method(c ## ClassName, "initialize",                  \
                          rbpango_ ## method_name ## _initialize,        \
                          n_initialize_args);                            \
 
-#define DEFINE_ATTRIBUTE_END                    \
+#define DEFINE_ATTRIBUTE_END()                  \
+    } while (FALSE)
+
+#define DEFINE_ATTRIBUTE(ClassName,             \
+                         parent,                \
+                         method_name,           \
+                         n_initialize_args)     \
+    DEFINE_ATTRIBUTE_BEGIN(ClassName,           \
+                           parent,              \
+                           method_name,         \
+                           n_initialize_args) { \
+    } DEFINE_ATTRIBUTE_END();
 
-#define DEFINE_ATTRIBUTE(ClassName, method_name, n_initialize_args)     \
-    DEFINE_ATTRIBUTE_BEGIN(ClassName, method_name, n_initialize_args) { \
-    } DEFINE_ATTRIBUTE_END;
+    DEFINE_ABSTRACT_ATTRIBUTE(AttrString, cAttribute);
+    DEFINE_ABSTRACT_ATTRIBUTE(AttrColor, cAttribute);
+    DEFINE_ABSTRACT_ATTRIBUTE(AttrInt, cAttribute);
+    DEFINE_ABSTRACT_ATTRIBUTE_BEGIN(AttrBool, cAttrInt) {
+        rb_define_method(cAttrBool, "value", rbpango_attr_bool_get_value, 0);
+    } DEFINE_ABSTRACT_ATTRIBUTE_END();
+    DEFINE_ABSTRACT_ATTRIBUTE(AttrFloat, cAttribute);
 
-    DEFINE_ABSTRACT_ATTRIBUTE(AttrBool);
-    DEFINE_ABSTRACT_ATTRIBUTE(AttrColor);
-    DEFINE_ABSTRACT_ATTRIBUTE(AttrFloat);
-    DEFINE_ATTRIBUTE(AttrFontDesc, attr_font_desc, 1);
-    DEFINE_ATTRIBUTE(AttrFontFeatures, attr_font_features, 1);
-    DEFINE_ABSTRACT_ATTRIBUTE(AttrInt);
-    DEFINE_ATTRIBUTE(AttrLanguage, attr_language, 1);
-    DEFINE_ATTRIBUTE_BEGIN(AttrShape, attr_shape, -1) {
+    DEFINE_ATTRIBUTE(AttrLanguage, cAttribute, attr_language, 1);
+    DEFINE_ATTRIBUTE(AttrFamily, cAttrString, attr_family, 1);
+    DEFINE_ATTRIBUTE_BEGIN(AttrStyle, cAttrInt, attr_style, 1) {
+        rb_define_method(cAttrStyle, "value", rbpango_attr_style_get_value, 0);
+    } DEFINE_ATTRIBUTE_END();
+    DEFINE_ATTRIBUTE_BEGIN(AttrWeight, cAttrInt, attr_weight, 1) {
+        rb_define_method(cAttrWeight, "value", rbpango_attr_weight_get_value, 0);
+    } DEFINE_ATTRIBUTE_END();
+    DEFINE_ATTRIBUTE_BEGIN(AttrVariant, cAttrInt, attr_variant, 1) {
+        rb_define_method(cAttrVariant,
+                         "value", rbpango_attr_variant_get_value, 0);
+    } DEFINE_ATTRIBUTE_END();
+    DEFINE_ATTRIBUTE_BEGIN(AttrStretch, cAttrInt, attr_stretch, 1) {
+        rb_define_method(cAttrStretch,
+                         "value", rbpango_attr_stretch_get_value, 0);
+    } DEFINE_ATTRIBUTE_END();
+    DEFINE_ATTRIBUTE(AttrSize, cAttribute, attr_size, 1);
+    DEFINE_ATTRIBUTE(AttrFontDesc, cAttribute, attr_font_desc, 1);
+    DEFINE_ATTRIBUTE(AttrForeground, cAttrColor, attr_foregound, 3);
+    DEFINE_ATTRIBUTE(AttrBackground, cAttrColor, attr_background, 3);
+    DEFINE_ATTRIBUTE_BEGIN(AttrUnderline, cAttrInt, attr_underline, 1) {
+        rb_define_method(cAttrUnderline,
+                         "value", rbpango_attr_underline_get_value, 0);
+    } DEFINE_ATTRIBUTE_END();
+    DEFINE_ATTRIBUTE(AttrStrikethrough, cAttrBool, attr_strikethrough, 1);
+    DEFINE_ATTRIBUTE(AttrRise, cAttrInt, attr_rise, 1);
+    DEFINE_ATTRIBUTE_BEGIN(AttrShape, cAttribute, attr_shape, -1) {
         rb_define_method(cAttrShape, "data", rbpango_attr_shape_get_data, 0);
-    } DEFINE_ATTRIBUTE_END;
-    DEFINE_ATTRIBUTE(AttrSize, attr_size, 1);
-    DEFINE_ABSTRACT_ATTRIBUTE(AttrString);
+    } DEFINE_ATTRIBUTE_END();
+    DEFINE_ATTRIBUTE(AttrScale, cAttrFloat, attr_scale, 1);
+    DEFINE_ATTRIBUTE(AttrFallback, cAttrBool, attr_fallback, 1);
+    DEFINE_ATTRIBUTE(AttrLetterSpacing, cAttrInt, attr_letter_spacing, 1);
+    DEFINE_ATTRIBUTE(AttrUnderlineColor, cAttrColor, attr_underline_color, 3);
+    DEFINE_ATTRIBUTE(AttrStrikethroughColor, cAttrColor,
+                     attr_strikethrough_color, 3);
+    DEFINE_ATTRIBUTE(AttrAbsoluteSize, cAttrSize, attr_absolute_size, 1);
+    DEFINE_ATTRIBUTE_BEGIN(AttrGravity, cAttrInt, attr_gravity, 1) {
+        rb_define_method(cAttrGravity,
+                         "value", rbpango_attr_gravity_get_value, 0);
+    } DEFINE_ATTRIBUTE_END();
+    DEFINE_ATTRIBUTE_BEGIN(AttrGravityHint, cAttrInt, attr_gravity_hint, 1) {
+        rb_define_method(cAttrGravityHint,
+                         "value", rbpango_attr_gravity_hint_get_value, 0);
+    } DEFINE_ATTRIBUTE_END();
+    DEFINE_ATTRIBUTE(AttrFontFeatures, cAttrString, attr_font_features, 1);
+    DEFINE_ATTRIBUTE(AttrForegroundAlpha, cAttrInt, attr_foreground_alpha, 1);
+    DEFINE_ATTRIBUTE(AttrBackgroundAlpha, cAttrInt, attr_background_alpha, 1);
 
 #undef DEFINE_ABSTRACT_ATTRIBUTE
+#undef DEFINE_ABSTRACT_ATTRIBUTE_BEGIN
+#undef DEFINE_ABSTRACT_ATTRIBUTE_END
 #undef DEFINE_ATTRIBUTE
+#undef DEFINE_ATTRIBUTE_BEGIN
+#undef DEFINE_ATTRIBUTE_END
 }

data/ext/pango/rb-pango-conversions.h

@@ -20,6 +20,15 @@
 
 #pragma once
 
+#define PANGO_TYPE_ATTR_ITERATOR pango_attr_iterator_get_type()
+extern GType pango_attr_iterator_get_type(void) G_GNUC_CONST;
+
+extern VALUE rbpango_attribute_to_ruby(PangoAttribute *attribute);
+extern PangoAttribute *rbpango_attribute_from_ruby(VALUE rb_attribute);
+
+#define ATTR2RVAL(attr)    (rbpango_attribute_to_ruby((attr)))
+#define RVAL2ATTR(rb_attr) (rbpango_attribute_from_ruby((rb_attr)))
+
 #define RVAL2PANGOCAIROFONTMAP(o)          (PANGO_CAIRO_FONT_MAP(RVAL2GOBJ(o)))
 #define RVAL2PANGOCONTEXT(o)               (PANGO_CONTEXT(RVAL2GOBJ(o)))
 #define RVAL2PANGOENGINE(o)                (PANGO_ENGINE(RVAL2GOBJ(o)))

data/ext/pango/rb-pango-private.h

@@ -23,5 +23,7 @@
 #include "rb-pango.h"
 
 G_GNUC_INTERNAL void rbpango_attribute_init(VALUE mPango);
+G_GNUC_INTERNAL void rbpango_attr_iterator_init(VALUE mPango);
 G_GNUC_INTERNAL void rbpango_attr_list_init(VALUE mPango);
 G_GNUC_INTERNAL void rbpango_context_init(VALUE mPango);
+G_GNUC_INTERNAL void rbpango_scale_init(VALUE mPango);

data/ext/pango/rb-pango-scale.c

@@ -0,0 +1,53 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rb-pango-private.h"
+
+#define RG_TARGET_NAMESPACE mScale
+
+void
+rbpango_scale_init(VALUE mPango)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = rb_define_module_under(mPango, "Scale");
+
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "XX_SMALL",
+                    rb_float_new(PANGO_SCALE_XX_SMALL));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "X_SMALL",
+                    rb_float_new(PANGO_SCALE_X_SMALL));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "SMALL",
+                    rb_float_new(PANGO_SCALE_SMALL));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "MEDIUM",
+                    rb_float_new(PANGO_SCALE_MEDIUM));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "LARGE",
+                    rb_float_new(PANGO_SCALE_LARGE));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "X_LARGE",
+                    rb_float_new(PANGO_SCALE_X_LARGE));
+    rb_define_const(RG_TARGET_NAMESPACE,
+                    "XX_LARGE",
+                    rb_float_new(PANGO_SCALE_XX_LARGE));
+}

data/ext/pango/rb-pango.c

@@ -38,6 +38,8 @@ Init_pango(void)
     RG_DEF_SMETHOD(pixels, 1);
 
     rbpango_attribute_init(RG_TARGET_NAMESPACE);
+    rbpango_attr_iterator_init(RG_TARGET_NAMESPACE);
     rbpango_attr_list_init(RG_TARGET_NAMESPACE);
     rbpango_context_init(RG_TARGET_NAMESPACE);
+    rbpango_scale_init(RG_TARGET_NAMESPACE);
 }

data/lib/pango/attr-type.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Pango
+  class AttrType
+    def to_class
+      class_name = "Attr"
+      nick.split(/_/).each do |component|
+        class_name << component.capitalize
+      end
+      Pango.const_get(class_name)
+    end
+  end
+end

data/lib/pango/deprecated.rb

@@ -18,19 +18,52 @@ module Pango
   extend GLib::Deprecatable
 
   define_deprecated_enums :Alignment, "ALIGN"
+  define_deprecated_enums :Alignment
   define_deprecated_enums :CoverageLevel, "COVERAGE"
+  define_deprecated_enums :CoverageLevel
   define_deprecated_enums :Direction, "DIRECTION"
+  define_deprecated_enums :Direction
   define_deprecated_enums :WrapMode, "WRAP"
+  define_deprecated_enums :WrapMode
   define_deprecated_enums :FontMask, "FONT_MASK"
+  define_deprecated_enums :FontMask
   define_deprecated_enums :Stretch, "STRETCH"
+  define_deprecated_enums :Stretch
   define_deprecated_enums :Style, "STYLE"
+  define_deprecated_enums :Style
   define_deprecated_enums :Variant, "VARIANT"
+  define_deprecated_enums :Variant
   define_deprecated_enums :Weight, "WEIGHT"
+  define_deprecated_enums :Weight
   define_deprecated_enums :TabAlign, "TAB"
+  define_deprecated_enums :TabAlign
   define_deprecated_enums :Underline, "UNDERLINE"
+  define_deprecated_enums :Underline
+  define_deprecated_const :UNDERLINE, "Pango::Underline"
   define_deprecated_enums :Script, "SCRIPT"
+  define_deprecated_enums :Script
   define_deprecated_enums :EllipsizeMode, "ELLIPSIZE"
+  define_deprecated_enums :EllipsizeMode
   define_deprecated_enums :RenderPart, "PART"
+  define_deprecated_enums :RenderPart
+
+  class AttrScale
+    extend GLib::Deprecatable
+
+    define_deprecated_const :XX_SMALL, "Pango::Scale::XX_SMALL"
+    define_deprecated_const :X_SMALL, "Pango::Scale::X_SMALL"
+    define_deprecated_const :SMALL, "Pango::Scale::SMALL"
+    define_deprecated_const :MEDIUM, "Pango::Scale::MEDIUM"
+    define_deprecated_const :LARGE, "Pango::Scale::LARGE"
+    define_deprecated_const :X_LARGE, "Pango::Scale::X_LARGE"
+    define_deprecated_const :XX_LARGE, "Pango::Scale::XX_LARGE"
+  end
+
+  class AttrUnderline
+    extend GLib::Deprecatable
+
+    define_deprecated_enums :Underline
+  end
 
   class Context
     extend GLib::Deprecatable

data/lib/pango/loader.rb

@@ -36,14 +36,8 @@ module Pango
       case info.name
       when /Class\z/
         super
-      when "Attribute"
+      when "Attribute", /\AAttr[A-Z]/
         @pending_attribute_infos << info
-      when /\AAttr[A-Z]/
-        if info.name == "AttrIterator"
-          super
-        else
-          @pending_attribute_infos << info
-        end
       else
         super
       end
@@ -64,7 +58,7 @@ module Pango
         when "translate", "scale", "rotate", "concat"
           method_name += "!"
         end
-      when "Pango::AttrList"
+      when "Pango::AttrList", "Pango::AttrIterator"
         return if klass.method_defined?(method_name)
       end
       super(info, klass, method_name)
@@ -80,6 +74,7 @@ module Pango
     end
 
     def require_libraries
+      require "pango/attr-type"
       require "pango/color"
       require "pango/font-description"
       require "pango/language"

data/test/test-attr-iterator.rb

@@ -0,0 +1,36 @@
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestAttrIterator < Test::Unit::TestCase
+  include PangoTestUtils
+
+  def setup
+    attrs, = Pango.parse_markup("Hello <b>world</b>!")
+    @iterator = attrs.iterator
+  end
+
+  def test_attrs
+    @iterator.next
+    indexes = @iterator.attrs.collect do |attr|
+      [
+        attr.start_index,
+        attr.end_index,
+        attr.value,
+      ]
+    end
+    assert_equal([[6, 11, Pango::Weight::BOLD]], indexes)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pango
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
 description: Ruby/Pango is a Ruby binding of pango-1.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -63,15 +63,18 @@ files:
 - ext/pango/depend
 - ext/pango/extconf.rb
 - ext/pango/pango.def
+- ext/pango/rb-pango-attr-iterator.c
 - ext/pango/rb-pango-attr-list.c
 - ext/pango/rb-pango-attribute.c
 - ext/pango/rb-pango-context.c
 - ext/pango/rb-pango-conversions.h
 - ext/pango/rb-pango-private.h
+- ext/pango/rb-pango-scale.c
 - ext/pango/rb-pango.c
 - ext/pango/rb-pango.h
 - extconf.rb
 - lib/pango.rb
+- lib/pango/attr-type.rb
 - lib/pango/cairo-loader.rb
 - lib/pango/color.rb
 - lib/pango/deprecated.rb
@@ -86,6 +89,7 @@ files:
 - test/pango-test-utils.rb
 - test/run-test.rb
 - test/test-analysis.rb
+- test/test-attr-iterator.rb
 - test/test-attr-list.rb
 - test/test-attribute.rb
 - test/test-color.rb