pango 1.0.3 → 1.1.0

data/ext/pango/rbpangologattr.c

@@ -1,17 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 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
+ */
 
-  rbpangologattr.c -
+#include "rbpangoprivate.h"
 
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:33 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(s) ((PangoLogAttr*)RVAL2BOXED(s, PANGO_TYPE_LOG_ATTR))
+#define RG_TARGET_NAMESPACE cLogAttr
+#define _SELF(s) (RVAL2PANGOLOGATTR(s))
 
 /**********************************/
 static PangoLogAttr*
@@ -23,12 +34,12 @@ log_copy(const PangoLogAttr* val)
     *new_val = *val;
     return new_val;
 }
-                                                                                     
+
 GType
 pango_log_attr_get_type(void)
 {
     static GType our_type = 0;
-                                                                                     
+
     if (our_type == 0)
         our_type = g_boxed_type_register_static ("PangoLogAttr",
                     (GBoxedCopyFunc)log_copy,
@@ -51,7 +62,7 @@ log_set_ ## name (VALUE self, VALUE val)\
 }
 
 static VALUE
-log_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     PangoLogAttr log;
     G_INITIALIZE(self, &log);
@@ -78,27 +89,27 @@ ATTR_BOOL(backspace_deletes_character);
 #endif
 
 void
-Init_pango_logattr()
+Init_pango_logattr(VALUE mPango)
 {
-    VALUE logattr = G_DEF_CLASS(PANGO_TYPE_LOG_ATTR, "LogAttr", mPango);
-    
-    rb_define_method(logattr, "initialize", log_initialize, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_LOG_ATTR, "LogAttr", mPango);
+
+    RG_DEF_METHOD(initialize, 0);
 
-    DEFINE_ACCESSOR(logattr, line_break);
-    DEFINE_ACCESSOR(logattr, mandatory_break);
-    DEFINE_ACCESSOR(logattr, char_break);
-    DEFINE_ACCESSOR(logattr, white);
-    DEFINE_ACCESSOR(logattr, cursor_position);
-    DEFINE_ACCESSOR(logattr, word_start);
-    DEFINE_ACCESSOR(logattr, word_end);
-    DEFINE_ACCESSOR(logattr, sentence_boundary);
-    DEFINE_ACCESSOR(logattr, sentence_start);
-    DEFINE_ACCESSOR(logattr, sentence_end);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, line_break);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, mandatory_break);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, char_break);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, white);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, cursor_position);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, word_start);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, word_end);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, sentence_boundary);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, sentence_start);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, sentence_end);
 
 #if PANGO_CHECK_VERSION(1,4,0)
-    rb_define_method(logattr, "backspace_deletes_character?", log_get_backspace_deletes_character, 0); 
-    rb_define_method(logattr, "set_backspace_deletes_character", log_set_backspace_deletes_character, 1); 
+    rb_define_method(RG_TARGET_NAMESPACE, "backspace_deletes_character?", log_get_backspace_deletes_character, 0); 
+    rb_define_method(RG_TARGET_NAMESPACE, "set_backspace_deletes_character", log_set_backspace_deletes_character, 1); 
 #endif
 
-    G_DEF_SETTERS(logattr);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/pango/rbpangomatrix.c

@@ -1,18 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangomatrix.c -
-
-  $Author: mutoh $
-  $Date: 2006/12/10 15:13:10 $
-
-  Copyright (C) 2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005  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"
 
 #if PANGO_CHECK_VERSION(1,6,0)
-#define _SELF(self) ((PangoMatrix*)(RVAL2BOXED(self, PANGO_TYPE_MATRIX)))
+
+#define RG_TARGET_NAMESPACE cMatrix
+#define _SELF(self) (RVAL2PANGOMATRIX(self))
 
 #define ATTR_FLOAT(name)\
 static VALUE \
@@ -28,11 +40,11 @@ matrix_set_ ## name (VALUE self, VALUE val)\
 }
 
 #define DEFINE_ACCESSOR(name) \
-    rb_define_method(matrix, G_STRINGIFY(name), matrix_get_ ## name, 0);\
-    rb_define_method(matrix, G_STRINGIFY(set_ ## name), matrix_set_## name, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(name), matrix_get_ ## name, 0);\
+    rb_define_method(RG_TARGET_NAMESPACE, G_STRINGIFY(set_ ## name), matrix_set_## name, 1);
 
 static VALUE
-matrix_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     PangoMatrix matrix = PANGO_MATRIX_INIT;
     VALUE xx, xy, yx, yy, x0, y0;
@@ -52,21 +64,21 @@ matrix_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-matrix_translate(VALUE self, VALUE tx, VALUE ty)
+rg_translate_bang(VALUE self, VALUE tx, VALUE ty)
 {
     pango_matrix_translate(_SELF(self), NUM2DBL(tx), NUM2DBL(ty));
     return self;
 }
 
 static VALUE
-matrix_scale(VALUE self, VALUE scale_x, VALUE scale_y)
+rg_scale_bang(VALUE self, VALUE scale_x, VALUE scale_y)
 {
     pango_matrix_scale(_SELF(self), NUM2DBL(scale_x), NUM2DBL(scale_y));
     return self;
 }
 
 static VALUE
-matrix_rotate(VALUE self, VALUE degrees)
+rg_rotate_bang(VALUE self, VALUE degrees)
 {
     pango_matrix_rotate(_SELF(self), NUM2DBL(degrees));
     return self;
@@ -74,14 +86,14 @@ matrix_rotate(VALUE self, VALUE degrees)
 
 #if PANGO_CHECK_VERSION(1,16,0)
 static VALUE
-matrix_get_gravity(VALUE self)
+rg_gravity(VALUE self)
 {
-    return GENUM2RVAL(pango_gravity_get_for_matrix(_SELF(self)), PANGO_TYPE_GRAVITY);
+    return PANGOGRAVITY2RVAL(pango_gravity_get_for_matrix(_SELF(self)));
 }
 #endif
 
 static VALUE
-matrix_concat(VALUE self, VALUE new_matrix)
+rg_concat_bang(VALUE self, VALUE new_matrix)
 {
     pango_matrix_concat(_SELF(self), _SELF(new_matrix));
     return self;
@@ -89,7 +101,7 @@ matrix_concat(VALUE self, VALUE new_matrix)
 
 #if PANGO_CHECK_VERSION(1,12,0)
 static VALUE
-matrix_get_font_scale_factor(VALUE self)
+rg_font_scale_factor(VALUE self)
 {
     return rb_float_new(pango_matrix_get_font_scale_factor(_SELF(self)));
 }
@@ -103,7 +115,7 @@ ATTR_FLOAT(x0);
 ATTR_FLOAT(y0);
 
 static VALUE
-matrix_to_a(VALUE self)
+rg_to_a(VALUE self)
 {
     PangoMatrix* matrix = _SELF(self);
     return rb_ary_new3(6, INT2NUM(matrix->xx), INT2NUM(matrix->xy), INT2NUM(matrix->yx),
@@ -113,23 +125,23 @@ matrix_to_a(VALUE self)
 #endif
 
 void
-Init_pango_matrix()
+Init_pango_matrix(VALUE mPango)
 {
 #if PANGO_CHECK_VERSION(1,6,0)
-    VALUE matrix = G_DEF_CLASS(PANGO_TYPE_MATRIX, "Matrix", mPango);
-    
-    rb_define_method(matrix, "initialize", matrix_initialize, -1);
-    rb_define_method(matrix, "translate!", matrix_translate, 2);
-    rb_define_method(matrix, "scale!", matrix_scale, 2);
-    rb_define_method(matrix, "rotate!", matrix_rotate, 1);
-    rb_define_method(matrix, "concat!", matrix_concat, 1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_MATRIX, "Matrix", mPango);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD_BANG(translate, 2);
+    RG_DEF_METHOD_BANG(scale, 2);
+    RG_DEF_METHOD_BANG(rotate, 1);
+    RG_DEF_METHOD_BANG(concat, 1);
 #if PANGO_CHECK_VERSION(1,12,0)
-    rb_define_method(matrix, "font_scale_factor", matrix_get_font_scale_factor, 0);
+    RG_DEF_METHOD(font_scale_factor, 0);
 #endif
 #if PANGO_CHECK_VERSION(1,16,0)
-    rb_define_method(matrix, "gravity", matrix_get_gravity, 0);
+    RG_DEF_METHOD(gravity, 0);
 #endif
-    rb_define_method(matrix, "to_a", matrix_to_a, 0);
+    RG_DEF_METHOD(to_a, 0);
 
     DEFINE_ACCESSOR(xx);
     DEFINE_ACCESSOR(xy);
@@ -138,7 +150,7 @@ Init_pango_matrix()
     DEFINE_ACCESSOR(x0);
     DEFINE_ACCESSOR(y0);
 
-    G_DEF_SETTERS(matrix);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
 #endif
 }

data/ext/pango/rbpangoprivate.h

@@ -0,0 +1,53 @@
+#ifndef RB_PANGO_PRIVATE_H
+#define RB_PANGO_PRIVATE_H
+
+#include "rbpango.h"
+
+#ifndef HAVE_RB_ERRINFO
+#  define rb_errinfo() (ruby_errinfo)
+#endif
+
+#if PANGO_CHECK_VERSION(1,10,0) && defined(HAVE_RB_CAIRO_H)
+#  define CAIRO_AVAILABLE 1
+#endif
+
+G_BEGIN_DECLS
+
+G_GNUC_INTERNAL void Init_pango_analysis(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_attribute(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_attriterator(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_attrlist(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_cairo(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_cairo_context(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_color(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_context(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_coverage(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_engine(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_font(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_font_description(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_font_face(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_font_family(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_font_map(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_font_metrics(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_fontset(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_fontset_simple(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_glyph_info(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_glyph_item(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_glyph_string(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_gravity(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_item(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_language(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_layout(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_layout_iter(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_layout_line(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_logattr(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_matrix(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_rectangle(VALUE mPango);
+G_GNUC_INTERNAL void Init_pangorenderer(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_script(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_script_iter(VALUE mPango);
+G_GNUC_INTERNAL void Init_pango_array(VALUE mPango);
+
+G_END_DECLS
+
+#endif /* RB_PANGO_PRIVATE_H */

data/ext/pango/rbpangorectangle.c

@@ -1,17 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangolayoutline.c -
-
-  $Author: mutoh $
-  $Date: 2005/02/13 17:31:33 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(s) ((PangoRectangle*)RVAL2BOXED(s, PANGO_TYPE_RECTANGLE))
+/*
+ *  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 cRectangle
+#define _SELF(s) (RVAL2PANGORECTANGLE(s))
 
 /**********************************/
 static PangoRectangle*
@@ -38,7 +49,7 @@ pango_rectangle_get_type(void)
 /**********************************/
 
 static VALUE
-pango_rectangle_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
+rg_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     PangoRectangle new;
 
@@ -51,59 +62,58 @@ pango_rectangle_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE heig
     return Qnil;
 }
 
-
 static VALUE
-pango_rectangle_x(VALUE self)
+rg_x(VALUE self)
 {
     return INT2NUM(_SELF(self)->x);
 }
 
 static VALUE
-pango_rectangle_y(VALUE self)
+rg_y(VALUE self)
 {
     return INT2NUM(_SELF(self)->y);
 }
 
 static VALUE
-pango_rectangle_w(VALUE self)
+rg_width(VALUE self)
 {
     return INT2NUM(_SELF(self)->width);
 }
 
 static VALUE
-pango_rectangle_h(VALUE self)
+rg_height(VALUE self)
 {
     return INT2NUM(_SELF(self)->height);
 }
 
 static VALUE
-pango_rectangle_set_x(VALUE self, VALUE x)
+rg_set_x(VALUE self, VALUE x)
 {
     _SELF(self)->x = NUM2INT(x);
     return self;
 }
 
 static VALUE
-pango_rectangle_set_y(VALUE self, VALUE y)
+rg_set_y(VALUE self, VALUE y)
 {
     _SELF(self)->y = NUM2INT(y);
     return self;
 }
 static VALUE
-pango_rectangle_set_w(VALUE self, VALUE width)
+rg_set_width(VALUE self, VALUE width)
 {
     _SELF(self)->width = NUM2INT(width);
     return self;
 }
 
 static VALUE
-pango_rectangle_set_h(VALUE self, VALUE height)
+rg_set_height(VALUE self, VALUE height)
 {
     _SELF(self)->height = NUM2INT(height);
     return self;
 }
 static VALUE
-pango_rectangle_to_a(VALUE self)
+rg_to_a(VALUE self)
 {
   PangoRectangle* a = _SELF(self);
   return rb_ary_new3(4, INT2FIX(a->x), INT2FIX(a->y),
@@ -111,53 +121,52 @@ pango_rectangle_to_a(VALUE self)
 }
 
 static VALUE
-pango_rectangle_ascent(VALUE self)
+rg_ascent(VALUE self)
 {
     PangoRectangle* r =_SELF(self);
     return INT2NUM(PANGO_ASCENT(*r));
 }
 
 static VALUE
-pango_rectangle_descent(VALUE self)
+rg_descent(VALUE self)
 {
     PangoRectangle* r =_SELF(self);
     return INT2NUM(PANGO_DESCENT(*r));
 }
 
 static VALUE
-pango_rectangle_lbearing(VALUE self)
+rg_lbearing(VALUE self)
 {
     PangoRectangle* r =_SELF(self);
     return INT2NUM(PANGO_LBEARING(*r));
 }
 
 static VALUE
-pango_rectangle_rbearing(VALUE self)
+rg_rbearing(VALUE self)
 {
     PangoRectangle* r =_SELF(self);
     return INT2NUM(PANGO_RBEARING(*r));
 }
 
-
 void
-Init_pango_rectangle()
-{
-    VALUE pRectangle = G_DEF_CLASS(PANGO_TYPE_RECTANGLE, "Rectangle", mPango);
-    rb_define_method(pRectangle, "initialize", pango_rectangle_initialize, 4);
-    rb_define_method(pRectangle, "x", pango_rectangle_x, 0);
-    rb_define_method(pRectangle, "y", pango_rectangle_y, 0);
-    rb_define_method(pRectangle, "width", pango_rectangle_w, 0);
-    rb_define_method(pRectangle, "height", pango_rectangle_h, 0);
-    rb_define_method(pRectangle, "set_x", pango_rectangle_set_x, 1);
-    rb_define_method(pRectangle, "set_y", pango_rectangle_set_y, 1);
-    rb_define_method(pRectangle, "set_width", pango_rectangle_set_w, 1);
-    rb_define_method(pRectangle, "set_height", pango_rectangle_set_h, 1);
-    rb_define_method(pRectangle, "to_a", pango_rectangle_to_a, 0);
-
-    rb_define_method(pRectangle, "ascent", pango_rectangle_ascent, 0);
-    rb_define_method(pRectangle, "descent", pango_rectangle_descent, 0);
-    rb_define_method(pRectangle, "lbearing", pango_rectangle_lbearing, 0);
-    rb_define_method(pRectangle, "rbearing", pango_rectangle_rbearing, 0);
-
-    G_DEF_SETTERS(pRectangle);
+Init_pango_rectangle(VALUE mPango)
+{
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_RECTANGLE, "Rectangle", mPango);
+    RG_DEF_METHOD(initialize, 4);
+    RG_DEF_METHOD(x, 0);
+    RG_DEF_METHOD(y, 0);
+    RG_DEF_METHOD(width, 0);
+    RG_DEF_METHOD(height, 0);
+    RG_DEF_METHOD(set_x, 1);
+    RG_DEF_METHOD(set_y, 1);
+    RG_DEF_METHOD(set_width, 1);
+    RG_DEF_METHOD(set_height, 1);
+    RG_DEF_METHOD(to_a, 0);
+
+    RG_DEF_METHOD(ascent, 0);
+    RG_DEF_METHOD(descent, 0);
+    RG_DEF_METHOD(lbearing, 0);
+    RG_DEF_METHOD(rbearing, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }