pango 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/pango/rbpangotabarray.c

@@ -1,20 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangoarray.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:33 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) ((PangoTabArray*)RVAL2BOXED(self, PANGO_TYPE_TAB_ARRAY))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *
+ *  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 "rbpangoprivate.h"
+
+#define RG_TARGET_NAMESPACE cTabArray
+#define _SELF(self) (RVAL2PANGOTABARRAY(self))
 
 static VALUE
-rtab_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE size, positions_in_pixels, attr_ary;
     PangoTabArray *array;
@@ -29,11 +40,11 @@ rtab_initialize(int argc, VALUE *argv, VALUE self)
     if (! NIL_P(attr_ary)){
         for (i = 0; i < RARRAY_LEN(attr_ary); i++) {
             pango_tab_array_set_tab(array, i, 
-                                    RVAL2GENUM(RARRAY_PTR(RARRAY_PTR(attr_ary)[i])[0], PANGO_TYPE_TAB_ALIGN),
+                                    RVAL2PANGOTABALIGN(RARRAY_PTR(RARRAY_PTR(attr_ary)[i])[0]),
                                     FIX2INT(RARRAY_PTR(RARRAY_PTR(attr_ary)[i])[1]));
         }
     }
-     
+
     return Qnil;
 }
 /* This is implemented in rtab_initialize.
@@ -45,38 +56,38 @@ PangoTabArray* pango_tab_array_new_with_positions
                                              ...);
 */
 static VALUE
-rtab_get_size(VALUE self)
+rg_size(VALUE self)
 {
     return INT2NUM(pango_tab_array_get_size(_SELF(self)));
 }
 
 static VALUE
-rtab_resize(VALUE self, VALUE size)
+rg_resize(VALUE self, VALUE size)
 {
     pango_tab_array_resize(_SELF(self), NUM2INT(size));
     return self;
 }
 
 static VALUE
-rtab_set_tab(VALUE self, VALUE tab_index, VALUE align, VALUE location)
+rg_set_tab(VALUE self, VALUE tab_index, VALUE align, VALUE location)
 {
-    pango_tab_array_set_tab(_SELF(self), NUM2INT(tab_index), RVAL2GENUM(align, PANGO_TYPE_TAB_ALIGN),
+    pango_tab_array_set_tab(_SELF(self), NUM2INT(tab_index), RVAL2PANGOTABALIGN(align),
                             NUM2INT(location));
     return self;
 }
 
 static VALUE
-rtab_get_tab(VALUE self, VALUE tab_index)
+rg_get_tab(VALUE self, VALUE tab_index)
 {
     PangoTabAlign align;
     gint location;
     pango_tab_array_get_tab(_SELF(self), NUM2INT(tab_index),
                             &align, &location);
-    return rb_ary_new3(2, GENUM2RVAL(align, PANGO_TYPE_TAB_ALIGN), INT2NUM(location));
+    return rb_ary_new3(2, PANGOTABALIGN2RVAL(align), INT2NUM(location));
 }
 
 static VALUE
-rtab_get_tabs(VALUE self)
+rg_tabs(VALUE self)
 {
     PangoTabAlign* aligns;
     gint* locations;
@@ -87,33 +98,33 @@ rtab_get_tabs(VALUE self)
     pango_tab_array_get_tabs(tab_array, &aligns, &locations);
 
     for (i = 0; i < pango_tab_array_get_size(tab_array); i++){
-        rb_ary_push(ary, rb_ary_new3(2, GENUM2RVAL(aligns[i], PANGO_TYPE_TAB_ALIGN), 
+        rb_ary_push(ary, rb_ary_new3(2, PANGOTABALIGN2RVAL(aligns[i]), 
                                      INT2NUM(locations[i])));
     }
     return ary;
 }
 
 static VALUE
-rtab_get_positions_in_pixels(VALUE self)
+rg_positions_in_pixels_p(VALUE self)
 {
     return CBOOL2RVAL(pango_tab_array_get_positions_in_pixels(_SELF(self)));
 }
 
 void
-Init_pango_array()
+Init_pango_array(VALUE mPango)
 {
-    VALUE pTabArray = G_DEF_CLASS(PANGO_TYPE_TAB_ARRAY, "TabArray", mPango);
-    rb_define_method(pTabArray, "initialize", rtab_initialize, -1);
-    rb_define_method(pTabArray, "size", rtab_get_size, 0);
-    rb_define_method(pTabArray, "resize", rtab_resize, 1);
-    rb_define_method(pTabArray, "set_tab", rtab_set_tab, 3);
-    rb_define_method(pTabArray, "get_tab", rtab_get_tab, 1);
-    rb_define_method(pTabArray, "tabs", rtab_get_tabs, 0);
-    rb_define_method(pTabArray, "positions_in_pixels?", rtab_get_positions_in_pixels, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_TAB_ARRAY, "TabArray", mPango);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(size, 0);
+    RG_DEF_METHOD(resize, 1);
+    RG_DEF_METHOD(set_tab, 3);
+    RG_DEF_METHOD(get_tab, 1);
+    RG_DEF_METHOD(tabs, 0);
+    RG_DEF_METHOD_P(positions_in_pixels, 0);
 
-    G_DEF_SETTERS(pTabArray);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* PangoTabAlign */
-    G_DEF_CLASS(PANGO_TYPE_TAB_ALIGN, "TabAlign", pTabArray);
-    G_DEF_CONSTANTS(pTabArray, PANGO_TYPE_TAB_ALIGN, "PANGO_");    
+    G_DEF_CLASS(PANGO_TYPE_TAB_ALIGN, "TabAlign", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, PANGO_TYPE_TAB_ALIGN, "PANGO_");    
 }

data/vendor/local/etc/pango/pango.modules

@@ -1,5 +1,5 @@
 # Pango Modules file
 # Automatically generated file, do not edit
 #
-# ModulesPath = c:/devel/target/18e9007417f775a5bc83c60917e98632/lib/pango\1.6.0\modules
+# ModulesPath = C:/MinGW/msys/1.0/devel/target/e7ccdb85e6820e4560d75f6316aa481d/lib/pango\1.6.0\modules
 #

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

@@ -180,7 +180,7 @@ struct _PangoAttrFontDesc
 };
 
 PangoAttrType         pango_attr_type_register (const gchar        *name);
-G_CONST_RETURN char * pango_attr_type_get_name (PangoAttrType       type) G_GNUC_CONST;
+const char *          pango_attr_type_get_name (PangoAttrType       type) G_GNUC_CONST;
 
 void             pango_attribute_init        (PangoAttribute       *attr,
 					      const PangoAttrClass *klass);

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

@@ -84,9 +84,9 @@ void                      pango_context_set_gravity_hint     (PangoContext
 							      PangoGravityHint            hint);
 PangoGravityHint          pango_context_get_gravity_hint     (PangoContext               *context);
 
-void                        pango_context_set_matrix (PangoContext      *context,
-						      const PangoMatrix *matrix);
-G_CONST_RETURN PangoMatrix *pango_context_get_matrix (PangoContext      *context);
+void                      pango_context_set_matrix           (PangoContext      *context,
+						              const PangoMatrix *matrix);
+const PangoMatrix *       pango_context_get_matrix           (PangoContext      *context);
 
 /* Break a string of Unicode characters into segments with
  * consistent shaping/language engine and bidrectional level.

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

@@ -3,10 +3,10 @@
 #define PANGO_FEATURES_H
 
 #define PANGO_VERSION_MAJOR 1
-#define PANGO_VERSION_MINOR 28
-#define PANGO_VERSION_MICRO 3
+#define PANGO_VERSION_MINOR 29
+#define PANGO_VERSION_MICRO 4
 
-#define PANGO_VERSION_STRING "1.28.3"
+#define PANGO_VERSION_STRING "1.29.4"
 
 
 #endif

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

@@ -117,7 +117,7 @@ void                 pango_font_description_set_family        (PangoFontDescript
 							       const char           *family);
 void                 pango_font_description_set_family_static (PangoFontDescription *desc,
 							       const char           *family);
-G_CONST_RETURN char *pango_font_description_get_family        (const PangoFontDescription *desc) G_GNUC_PURE;
+const char          *pango_font_description_get_family        (const PangoFontDescription *desc) G_GNUC_PURE;
 void                 pango_font_description_set_style         (PangoFontDescription *desc,
 							       PangoStyle            style);
 PangoStyle           pango_font_description_get_style         (const PangoFontDescription *desc) G_GNUC_PURE;
@@ -212,7 +212,7 @@ GType      pango_font_family_get_type       (void) G_GNUC_CONST;
 void                 pango_font_family_list_faces (PangoFontFamily  *family,
 						   PangoFontFace  ***faces,
 						   int              *n_faces);
-G_CONST_RETURN char *pango_font_family_get_name   (PangoFontFamily  *family) G_GNUC_PURE;
+const char *pango_font_family_get_name   (PangoFontFamily  *family) G_GNUC_PURE;
 gboolean   pango_font_family_is_monospace         (PangoFontFamily  *family) G_GNUC_PURE;
 
 #ifdef PANGO_ENABLE_BACKEND
@@ -261,7 +261,7 @@ struct _PangoFontFamilyClass
 GType      pango_font_face_get_type       (void) G_GNUC_CONST;
 
 PangoFontDescription *pango_font_face_describe       (PangoFontFace  *face);
-G_CONST_RETURN char  *pango_font_face_get_face_name  (PangoFontFace  *face) G_GNUC_PURE;
+const char           *pango_font_face_get_face_name  (PangoFontFace  *face) G_GNUC_PURE;
 void                  pango_font_face_list_sizes     (PangoFontFace  *face,
 						      int           **sizes,
 						      int            *n_sizes);

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

@@ -34,11 +34,11 @@ typedef struct _PangoLanguage PangoLanguage;
 GType          pango_language_get_type    (void) G_GNUC_CONST;
 PangoLanguage *pango_language_from_string (const char *language);
 
-G_CONST_RETURN char *pango_language_to_string   (PangoLanguage *language) G_GNUC_CONST;
+const char    *pango_language_to_string   (PangoLanguage *language) G_GNUC_CONST;
 /* For back compat.  Will have to keep indefinitely. */
 #define pango_language_to_string(language) ((const char *)language)
 
-G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
+const char    *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
 PangoLanguage *pango_language_get_default (void) G_GNUC_CONST;
 
 gboolean      pango_language_matches  (PangoLanguage *language,
@@ -48,7 +48,7 @@ gboolean      pango_language_matches  (PangoLanguage *language,
 
 gboolean		    pango_language_includes_script (PangoLanguage *language,
 							    PangoScript    script) G_GNUC_PURE;
-G_CONST_RETURN PangoScript *pango_language_get_scripts	   (PangoLanguage *language,
+const PangoScript          *pango_language_get_scripts	   (PangoLanguage *language,
 							    int           *num_scripts);
 
 G_END_DECLS

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

@@ -103,6 +103,8 @@ void           pango_layout_set_text       (PangoLayout    *layout,
 					    int             length);
 const char    *pango_layout_get_text       (PangoLayout    *layout);
 
+gint           pango_layout_get_character_count (PangoLayout *layout);
+
 void           pango_layout_set_markup     (PangoLayout    *layout,
 					    const char     *markup,
 					    int             length);
@@ -116,7 +118,7 @@ void           pango_layout_set_markup_with_accel (PangoLayout    *layout,
 void           pango_layout_set_font_description (PangoLayout                *layout,
 						  const PangoFontDescription *desc);
 
-G_CONST_RETURN PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
+const PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
 
 void           pango_layout_set_width            (PangoLayout                *layout,
 						  int                         width);
@@ -166,6 +168,9 @@ void     pango_layout_get_log_attrs (PangoLayout    *layout,
 				     PangoLogAttr  **attrs,
 				     gint           *n_attrs);
 
+const PangoLogAttr *pango_layout_get_log_attrs_readonly (PangoLayout *layout,
+							 gint        *n_attrs);
+
 void     pango_layout_index_to_pos         (PangoLayout    *layout,
 					    int             index_,
 					    PangoRectangle *pos);

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

@@ -249,7 +249,7 @@ PangoColor *pango_renderer_get_color (PangoRenderer    *renderer,
 
 void                        pango_renderer_set_matrix (PangoRenderer     *renderer,
 						       const PangoMatrix *matrix);
-G_CONST_RETURN PangoMatrix *pango_renderer_get_matrix (PangoRenderer     *renderer);
+const PangoMatrix          *pango_renderer_get_matrix (PangoRenderer     *renderer);
 
 PangoLayout     *pango_renderer_get_layout      (PangoRenderer     *renderer);
 PangoLayoutLine *pango_renderer_get_layout_line (PangoRenderer     *renderer);

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

@@ -128,12 +128,12 @@ PangoScript pango_script_for_unichar         (gunichar             ch) G_GNUC_CO
 
 PangoScriptIter *pango_script_iter_new       (const char          *text,
 					      int                  length);
-void             pango_script_iter_get_range (PangoScriptIter      *iter,
-					      G_CONST_RETURN char **start,
-					      G_CONST_RETURN char **end,
-					      PangoScript          *script);
-gboolean         pango_script_iter_next      (PangoScriptIter      *iter);
-void             pango_script_iter_free      (PangoScriptIter      *iter);
+void             pango_script_iter_get_range (PangoScriptIter     *iter,
+                                              const char         **start,
+                                              const char         **end,
+                                              PangoScript         *script);
+gboolean         pango_script_iter_next      (PangoScriptIter     *iter);
+void             pango_script_iter_free      (PangoScriptIter     *iter);
 
 #include <pango/pango-language.h>
 

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

@@ -82,13 +82,13 @@ gboolean pango_parse_stretch (const char   *str,
  * stored in the registry). The returned string should not be
  * g_free'd.
  */
-G_CONST_RETURN char *   pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
+const char *   pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
 
 /* Ditto for LIBDIR/pango. On Win32, use the same Pango
  * installation directory. This returned string should not be
  * g_free'd either.
  */
-G_CONST_RETURN char *   pango_get_lib_subdirectory (void) G_GNUC_PURE;
+const char *   pango_get_lib_subdirectory (void) G_GNUC_PURE;
 
 #endif /* PANGO_ENABLE_BACKEND */
 
@@ -131,12 +131,12 @@ gboolean pango_is_zero_width (gunichar ch) G_GNUC_CONST;
 int pango_version (void) G_GNUC_CONST;
 
 /* Return run-time Pango version as an string */
-G_CONST_RETURN char * pango_version_string (void) G_GNUC_CONST;
+const char * pango_version_string (void) G_GNUC_CONST;
 
 /* Check that run-time Pango is as new as required */
-G_CONST_RETURN char * pango_version_check (int required_major,
-					   int required_minor,
-					   int required_micro) G_GNUC_CONST;
+const char * pango_version_check (int required_major,
+                                  int required_minor,
+                                  int required_micro) G_GNUC_CONST;
 
 G_END_DECLS
 

data/vendor/local/lib/pango-1.0.def

@@ -232,6 +232,7 @@ EXPORTS
 	pango_layout_get_attributes
 	pango_layout_get_auto_dir
 	pango_layout_get_baseline
+	pango_layout_get_character_count
 	pango_layout_get_context
 	pango_layout_get_cursor_pos
 	pango_layout_get_ellipsize
@@ -247,6 +248,7 @@ EXPORTS
 	pango_layout_get_lines
 	pango_layout_get_lines_readonly
 	pango_layout_get_log_attrs
+	pango_layout_get_log_attrs_readonly
 	pango_layout_get_pixel_extents
 	pango_layout_get_pixel_size
 	pango_layout_get_single_paragraph_mode

data/vendor/local/lib/pangowin32-1.0.def

@@ -13,7 +13,7 @@ EXPORTS
 	pango_win32_font_description_from_logfontw
 	pango_win32_font_get_glyph_index
 	pango_win32_font_logfont
-	pango_win32_font_logfont
+	pango_win32_font_logfontw
 	pango_win32_font_map_for_display
 	pango_win32_font_map_get_font_cache
 	pango_win32_get_context

data/vendor/local/lib/pkgconfig/pango.pc

@@ -7,7 +7,7 @@ pango_module_version=1.6.0
 
 Name: Pango
 Description: Internationalized text handling
-Version: 1.28.3
+Version: 1.29.4
 Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0
 Libs: -L${libdir} -lpango-1.0 
 Cflags: -I${includedir}/pango-1.0

data/vendor/local/lib/pkgconfig/pangocairo.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango Cairo
 Description: Cairo rendering support for Pango
-Version: 1.28.3
+Version: 1.29.4
 Requires: pango cairo 
 Libs: -L${libdir} -lpangocairo-1.0
 Cflags: -I${includedir}/pango-1.0

data/vendor/local/lib/pkgconfig/pangoft2.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango FT2 and Pango Fc
 Description: Freetype 2.0 and fontconfig font support for Pango
-Version: 1.28.3
+Version: 1.29.4
 Requires: pango freetype2 fontconfig
 Libs: -L${libdir} -lpangoft2-1.0
 Cflags: -I${includedir}/pango-1.0

data/vendor/local/lib/pkgconfig/pangowin32.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango Win32
 Description: Win32 GDI font support for Pango
-Version: 1.28.3
+Version: 1.29.4
 Requires: pango
 Libs: -L${libdir} -lpangowin32-1.0 -lgdi32
 Cflags: -I${includedir}/pango-1.0