pango 3.1.6-x86-mingw32 → 3.1.7-x86-mingw32

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

data/vendor/local/include/pango-1.0/pango/pango-features.h

@@ -4,9 +4,9 @@
 
 #define PANGO_VERSION_MAJOR 1
 #define PANGO_VERSION_MINOR 40
-#define PANGO_VERSION_MICRO 5
+#define PANGO_VERSION_MICRO 6
 
-#define PANGO_VERSION_STRING "1.40.5"
+#define PANGO_VERSION_STRING "1.40.6"
 
 
 #endif

data/vendor/local/include/pango-1.0/pango/pango-version-macros.h

@@ -327,303 +327,310 @@
 /* These macros are used to mark deprecated functions in Pango headers,
  * and thus have to be exposed in installed headers.
  */
-#define PANGO_DEPRECATED                         G_DEPRECATED _PANGO_EXTERN
-#define PANGO_DEPRECATED_FOR(f)                  G_DEPRECATED_FOR(f) _PANGO_EXTERN
+#ifdef PANGO_DISABLE_DEPRECATION_WARNINGS
+# define PANGO_DEPRECATED                       _PANGO_EXTERN
+# define PANGO_DEPRECATED_FOR(f)                _PANGO_EXTERN
+# define PANGO_UNAVAILABLE(maj,min)             _PANGO_EXTERN
+#else
+# define PANGO_DEPRECATED                       G_DEPRECATED _PANGO_EXTERN
+# define PANGO_DEPRECATED_FOR(f)                G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_UNAVAILABLE(maj,min)             G_UNAVAILABLE(maj,min) _PANGO_EXTERN
+#endif
 
 /* XXX: Every new stable minor release should add a set of macros here */
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_2
-# define PANGO_DEPRECATED_IN_1_2                 G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_2_FOR(f)          G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_2                PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_2_FOR(f)         PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_2                 _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_2_FOR(f)          _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_2                _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_2_FOR(f)         _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_2
-# define PANGO_AVAILABLE_IN_1_2                  PANGO_UNAVAILABLE(1, 2)
+# define PANGO_AVAILABLE_IN_1_2                 PANGO_UNAVAILABLE(1, 2)
 #else
-# define PANGO_AVAILABLE_IN_1_2                  _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_2                 _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_4
-# define PANGO_DEPRECATED_IN_1_4                 G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_4_FOR(f)          G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_4                PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_4_FOR(f)         PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_4                 _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_4_FOR(f)          _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_4                _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_4_FOR(f)         _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_4
-# define PANGO_AVAILABLE_IN_1_4                  PANGO_UNAVAILABLE(1, 4)
+# define PANGO_AVAILABLE_IN_1_4                 PANGO_UNAVAILABLE(1, 4)
 #else
-# define PANGO_AVAILABLE_IN_1_4                  _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_4                 _PANGO_EXTERN
 #endif
 
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_6
-# define PANGO_DEPRECATED_IN_1_6                 G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_6_FOR(f)          G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_6                PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_6_FOR(f)         PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_6                 _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_6_FOR(f)          _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_6                _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_6_FOR(f)         _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_6
-# define PANGO_AVAILABLE_IN_1_6                  PANGO_UNAVAILABLE(1, 6)
+# define PANGO_AVAILABLE_IN_1_6                 PANGO_UNAVAILABLE(1, 6)
 #else
-# define PANGO_AVAILABLE_IN_1_6                  _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_6                 _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_8
-# define PANGO_DEPRECATED_IN_1_8                 G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_8_FOR(f)          G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_8                PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_8_FOR(f)         PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_8                 _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_8_FOR(f)          _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_8                _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_8_FOR(f)         _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_8
-# define PANGO_AVAILABLE_IN_1_8                  PANGO_UNAVAILABLE(1, 8)
+# define PANGO_AVAILABLE_IN_1_8                 PANGO_UNAVAILABLE(1, 8)
 #else
-# define PANGO_AVAILABLE_IN_1_8                  _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_8                 _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_10
-# define PANGO_DEPRECATED_IN_1_10                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_10_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_10               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_10_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_10                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_10_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_10               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_10_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_10
-# define PANGO_AVAILABLE_IN_1_10                 PANGO_UNAVAILABLE(1, 10)
+# define PANGO_AVAILABLE_IN_1_10                PANGO_UNAVAILABLE(1, 10)
 #else
-# define PANGO_AVAILABLE_IN_1_10                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_10                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_12
-# define PANGO_AVAILABLE_IN_1_12                 PANGO_UNAVAILABLE(1, 12)
+# define PANGO_AVAILABLE_IN_1_12                PANGO_UNAVAILABLE(1, 12)
 #else
-# define PANGO_AVAILABLE_IN_1_12                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_12                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_12
-# define PANGO_DEPRECATED_IN_1_12                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_12_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_12               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_12_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_12                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_12_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_12               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_12_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_14
-# define PANGO_AVAILABLE_IN_1_14                 PANGO_UNAVAILABLE(1, 14)
+# define PANGO_AVAILABLE_IN_1_14                PANGO_UNAVAILABLE(1, 14)
 #else
-# define PANGO_AVAILABLE_IN_1_14                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_14                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_14
-# define PANGO_DEPRECATED_IN_1_14                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_14_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_14               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_14_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_14                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_14_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_14               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_14_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_16
-# define PANGO_AVAILABLE_IN_1_16                 PANGO_UNAVAILABLE(1, 16)
+# define PANGO_AVAILABLE_IN_1_16                PANGO_UNAVAILABLE(1, 16)
 #else
-# define PANGO_AVAILABLE_IN_1_16                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_16                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_16
-# define PANGO_DEPRECATED_IN_1_16                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_16_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_16               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_16_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_16                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_16_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_16               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_16_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_18
-# define PANGO_DEPRECATED_IN_1_18                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_18_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_18               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_18_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_18                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_18_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_18               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_18_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_18
-# define PANGO_AVAILABLE_IN_1_18                 PANGO_UNAVAILABLE(1, 18)
+# define PANGO_AVAILABLE_IN_1_18                PANGO_UNAVAILABLE(1, 18)
 #else
-# define PANGO_AVAILABLE_IN_1_18                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_18                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_20
-# define PANGO_DEPRECATED_IN_1_20                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_20_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_20               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_20_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_20                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_20_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_20               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_20_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_20
-# define PANGO_AVAILABLE_IN_1_20                 PANGO_UNAVAILABLE(1, 20)
+# define PANGO_AVAILABLE_IN_1_20                PANGO_UNAVAILABLE(1, 20)
 #else
-# define PANGO_AVAILABLE_IN_1_20                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_20                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_22
-# define PANGO_DEPRECATED_IN_1_22                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_22_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_22               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_22_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_22                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_22_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_22               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_22_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_22
-# define PANGO_AVAILABLE_IN_1_22                 PANGO_UNAVAILABLE(1, 22)
+# define PANGO_AVAILABLE_IN_1_22                PANGO_UNAVAILABLE(1, 22)
 #else
-# define PANGO_AVAILABLE_IN_1_22                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_22                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_24
-# define PANGO_DEPRECATED_IN_1_24                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_24_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_24               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_24_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_24                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_24_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_24               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_24_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_24
-# define PANGO_AVAILABLE_IN_1_24                 PANGO_UNAVAILABLE(1, 24)
+# define PANGO_AVAILABLE_IN_1_24                PANGO_UNAVAILABLE(1, 24)
 #else
-# define PANGO_AVAILABLE_IN_1_24                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_24                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_26
-# define PANGO_DEPRECATED_IN_1_26                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_26_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_26               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_26_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_26                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_26_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_26               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_26_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_26
-# define PANGO_AVAILABLE_IN_1_26                 PANGO_UNAVAILABLE(1, 26)
+# define PANGO_AVAILABLE_IN_1_26                PANGO_UNAVAILABLE(1, 26)
 #else
-# define PANGO_AVAILABLE_IN_1_26                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_26                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_28
-# define PANGO_DEPRECATED_IN_1_28                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_28_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_28               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_28_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_28                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_28_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_28               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_28_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_28
-# define PANGO_AVAILABLE_IN_1_28                 PANGO_UNAVAILABLE(1, 28)
+# define PANGO_AVAILABLE_IN_1_28                PANGO_UNAVAILABLE(1, 28)
 #else
-# define PANGO_AVAILABLE_IN_1_28                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_28                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_30
-# define PANGO_DEPRECATED_IN_1_30                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_30_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_30               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_30_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_30                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_30_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_30               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_30_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_30
-# define PANGO_AVAILABLE_IN_1_30                 PANGO_UNAVAILABLE(1, 30)
+# define PANGO_AVAILABLE_IN_1_30                PANGO_UNAVAILABLE(1, 30)
 #else
-# define PANGO_AVAILABLE_IN_1_30                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_30                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_32
-# define PANGO_DEPRECATED_IN_1_32                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_32_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_32               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_32_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_32                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_32_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_32               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_32_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_32
-# define PANGO_AVAILABLE_IN_1_32                 PANGO_UNAVAILABLE(1, 32)
+# define PANGO_AVAILABLE_IN_1_32                PANGO_UNAVAILABLE(1, 32)
 #else
-# define PANGO_AVAILABLE_IN_1_32                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_32                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_34
-# define PANGO_DEPRECATED_IN_1_34                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_34_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_34               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_34_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_34                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_34_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_34               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_34_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_34
-# define PANGO_AVAILABLE_IN_1_34                 PANGO_UNAVAILABLE(1, 34)
+# define PANGO_AVAILABLE_IN_1_34                PANGO_UNAVAILABLE(1, 34)
 #else
-# define PANGO_AVAILABLE_IN_1_34                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_34                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_36
-# define PANGO_DEPRECATED_IN_1_36                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_36_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_36               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_36_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_36                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_36_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_36               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_36_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_36
-# define PANGO_AVAILABLE_IN_1_36                 PANGO_UNAVAILABLE(1, 36)
+# define PANGO_AVAILABLE_IN_1_36                PANGO_UNAVAILABLE(1, 36)
 #else
-# define PANGO_AVAILABLE_IN_1_36                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_36                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_38
-# define PANGO_DEPRECATED_IN_1_38                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_38_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_38               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_38_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_38                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_38_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_38               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_38_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_38
-# define PANGO_AVAILABLE_IN_1_38                 PANGO_UNAVAILABLE(1, 38)
+# define PANGO_AVAILABLE_IN_1_38                PANGO_UNAVAILABLE(1, 38)
 #else
-# define PANGO_AVAILABLE_IN_1_38                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_38                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_40
-# define PANGO_DEPRECATED_IN_1_40                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_40_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_40               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_40_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_40                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_40_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_40               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_40_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_40
-# define PANGO_AVAILABLE_IN_1_40                 PANGO_UNAVAILABLE(1, 40)
+# define PANGO_AVAILABLE_IN_1_40                PANGO_UNAVAILABLE(1, 40)
 #else
-# define PANGO_AVAILABLE_IN_1_40                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_40                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_42
-# define PANGO_DEPRECATED_IN_1_42                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_42_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_42               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_42_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_42                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_42_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_42               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_42_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_42
-# define PANGO_AVAILABLE_IN_1_42                 PANGO_UNAVAILABLE(1, 42)
+# define PANGO_AVAILABLE_IN_1_42                PANGO_UNAVAILABLE(1, 42)
 #else
-# define PANGO_AVAILABLE_IN_1_42                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_42                _PANGO_EXTERN
 #endif
 
 #endif /* __PANGO_VERSION_H__ */