update to pango 1.19.3

2008-01-31  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/pango/: update to pango 1.19.3

	* vapi/pango.vapi: regenerated

svn path=/trunk/; revision=937

diff --git a/ChangeLog b/ChangeLog
index f9998dec6642727cd557af9265634813c1a6eba8..6cdcc5a85fc243b0e55a237dd01c8205ad41d4b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-31  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/packages/pango/: update to pango 1.19.3
+
+       * vapi/pango.vapi: regenerated
+
 2008-01-31  Jürg Billeter  <j@bitron.ch>
 
        * vapi/packages/gio-2.0/: update to glib 2.15.4

diff --git a/vapi/packages/pango/pango.gi b/vapi/packages/pango/pango.gi
index 4f1853c5ecc3ac3a0658086f2df57435868c5d62..e8f14b0e977017021eef96aec971696cb8728019 100644 (file)
--- a/vapi/packages/pango/pango.gi
+++ b/vapi/packages/pango/pango.gi
@@ -130,8 +130,8 @@
                <function name="extents_to_pixels" symbol="pango_extents_to_pixels">
                        <return-type type="void"/>
                        <parameters>
-                               <parameter name="ink_rect" type="PangoRectangle*"/>
-                               <parameter name="logical_rect" type="PangoRectangle*"/>
+                               <parameter name="inclusive" type="PangoRectangle*"/>
+                               <parameter name="nearest" type="PangoRectangle*"/>
                        </parameters>
                </function>
                <function name="find_base_dir" symbol="pango_find_base_dir">
@@ -2165,6 +2165,12 @@
                                        <parameter name="layout" type="PangoLayout*"/>
                                </parameters>
                        </method>
+                       <method name="get_height" symbol="pango_layout_get_height">
+                               <return-type type="int"/>
+                               <parameters>
+                                       <parameter name="layout" type="PangoLayout*"/>
+                               </parameters>
+                       </method>
                        <method name="get_indent" symbol="pango_layout_get_indent">
                                <return-type type="int"/>
                                <parameters>
@@ -2372,6 +2378,13 @@
                                        <parameter name="desc" type="PangoFontDescription*"/>
                                </parameters>
                        </method>
+                       <method name="set_height" symbol="pango_layout_set_height">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="layout" type="PangoLayout*"/>
+                                       <parameter name="height" type="int"/>
+                               </parameters>
+                       </method>
                        <method name="set_indent" symbol="pango_layout_set_indent">
                                <return-type type="void"/>
                                <parameters>
@@ -2692,8 +2705,8 @@
                <constant name="PANGO_UNKNOWN_GLYPH_HEIGHT" type="int" value="14"/>
                <constant name="PANGO_UNKNOWN_GLYPH_WIDTH" type="int" value="10"/>
                <constant name="PANGO_VERSION_MAJOR" type="int" value="1"/>
-               <constant name="PANGO_VERSION_MICRO" type="int" value="1"/>
+               <constant name="PANGO_VERSION_MICRO" type="int" value="3"/>
                <constant name="PANGO_VERSION_MINOR" type="int" value="19"/>
-               <constant name="PANGO_VERSION_STRING" type="char*" value="1.19.1"/>
+               <constant name="PANGO_VERSION_STRING" type="char*" value="1.19.3"/>
        </namespace>
 </api>

diff --git a/vapi/packages/pango/pango.metadata b/vapi/packages/pango/pango.metadata
index 954154b20b1762bd900ab3c4fb7d147e3bf129b1..4ae43e18363bba709dc2709c68c924b056a480ae 100644 (file)
--- a/vapi/packages/pango/pango.metadata
+++ b/vapi/packages/pango/pango.metadata
@@ -2,8 +2,8 @@ Pango cheader_filename="pango/pango.h"
 pango_attr_size_new_absolute hidden="1"
 pango_break.attrs is_array="1"
 PangoColor is_value_type="1"
-pango_extents_to_pixels.ink_rect is_ref="1"
-pango_extents_to_pixels.logical_rect is_ref="1"
+pango_extents_to_pixels.inclusive is_ref="1"
+pango_extents_to_pixels.nearest is_ref="1"
 pango_get_log_attrs.log_attrs is_array="1"
 pango_font_get_glyph_extents.ink_rect is_out="1"
 pango_font_get_glyph_extents.logical_rect is_out="1"

diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index e94f90be03c3c06b14793fda4f9319d22bb09687..eb4780b085384d4b964daf335b16f6c0aff0d569 100644 (file)
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -578,6 +578,7 @@ namespace Pango {
                public Pango.EllipsizeMode get_ellipsize ();
                public void get_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
                public weak Pango.FontDescription get_font_description ();
+               public int get_height ();
                public int get_indent ();
                public weak Pango.LayoutIter get_iter ();
                public bool get_justify ();
@@ -609,6 +610,7 @@ namespace Pango {
                public void set_auto_dir (bool auto_dir);
                public void set_ellipsize (Pango.EllipsizeMode ellipsize);
                public void set_font_description (Pango.FontDescription desc);
+               public void set_height (int height);
                public void set_indent (int indent);
                public void set_justify (bool justify);
                public void set_markup (string markup, int length);
@@ -730,7 +732,7 @@ namespace Pango {
        public static weak Pango.Attribute attr_weight_new (Pango.Weight weight);
        [NoArrayLength]
        public static void @break (string text, int length, Pango.Analysis analysis, Pango.LogAttr[] attrs, int attrs_len);
-       public static void extents_to_pixels (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
+       public static void extents_to_pixels (ref Pango.Rectangle inclusive, ref Pango.Rectangle nearest);
        public static Pango.Direction find_base_dir (string text, int length);
        public static void find_paragraph_boundary (string text, int length, int paragraph_delimiter_index, int next_paragraph_start);
        [NoArrayLength]
@@ -749,11 +751,11 @@ namespace Pango {
        public static bool parse_variant (string str, Pango.Variant variant, bool warn);
        public static bool parse_weight (string str, Pango.Weight weight, bool warn);
        public static void quantize_line_geometry (int thickness, int position);
-       public static int read_line (GLib.FileStream stream, GLib.String str);
+       public static int read_line (GLib.FileStream stream, GLib.StringBuilder str);
        public static weak GLib.List reorder_items (GLib.List logical_items);
        public static bool scan_int (out weak string pos, int @out);
-       public static bool scan_string (out weak string pos, GLib.String @out);
-       public static bool scan_word (out weak string pos, GLib.String @out);
+       public static bool scan_string (out weak string pos, GLib.StringBuilder @out);
+       public static bool scan_word (out weak string pos, GLib.StringBuilder @out);
        public static Pango.Script script_for_unichar (unichar ch);
        public static weak Pango.Language script_get_sample_language (Pango.Script script);
        public static void shape (string text, int length, Pango.Analysis analysis, Pango.GlyphString glyphs);