pango 1.0.3 → 1.1.0

data/ext/pango/rbpangofontface.c

@@ -1,33 +1,44 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh <mutoh@highway.ne.jp>
+ *
+ *  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
+ */
 
-  rbpangofontface.c -
+#include "rbpangoprivate.h"
 
-  $Author: mutoh $
-  $Date: 2006/12/10 15:13:10 $
-
-  Copyright (C) 2002,2003 Masao Mutoh <mutoh@highway.ne.jp>
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) (PANGO_FONT_FACE(RVAL2GOBJ(self)))
+#define RG_TARGET_NAMESPACE cFontFace
+#define _SELF(self) (RVAL2PANGOFONTFACE(self))
 
 static VALUE
-font_face_get_face_name(VALUE self)
+rg_name(VALUE self)
 {
     return CSTR2RVAL(pango_font_face_get_face_name(_SELF(self)));
 }
 
 static VALUE
-font_face_describe(VALUE self)
+rg_describe(VALUE self)
 {
-    return BOXED2RVAL(pango_font_face_describe(_SELF(self)), PANGO_TYPE_FONT_DESCRIPTION);
+    return PANGOFONTDESCRIPTION2RVAL(pango_font_face_describe(_SELF(self)));
 }
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
-font_face_list_sizes(VALUE self)
+rg_sizes(VALUE self)
 {
     int n_sizes;
     int* sizes;
@@ -48,14 +59,14 @@ font_face_list_sizes(VALUE self)
 #endif
 
 void
-Init_pango_font_face()
+Init_pango_font_face(VALUE mPango)
 {
-    VALUE pFace = G_DEF_CLASS(PANGO_TYPE_FONT_FACE, "FontFace", mPango);
-    
-    rb_define_method(pFace, "name", font_face_get_face_name, 0);
-    rb_define_method(pFace, "describe", font_face_describe, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_FONT_FACE, "FontFace", mPango);
+
+    RG_DEF_METHOD(name, 0);
+    RG_DEF_METHOD(describe, 0);
 #if PANGO_CHECK_VERSION(1,4,0)
-    rb_define_method(pFace, "sizes", font_face_list_sizes, 0);
+    RG_DEF_METHOD(sizes, 0);
 #endif
     G_DEF_CLASS3("PangoFcFace", "FcFace", mPango);
     G_DEF_CLASS3("PangoFT2Face", "FT2Face", mPango);

data/ext/pango/rbpangofontfamily.c

@@ -1,34 +1,45 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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
+ */
 
-  rbpangofontfamily.c -
+#include "rbpangoprivate.h"
 
-  $Author: mutoh $
-  $Date: 2006/12/10 15:13:10 $
-
-  Copyright (C) 2002-2005 Masao Mutoh 
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) (PANGO_FONT_FAMILY(RVAL2GOBJ(self)))
+#define RG_TARGET_NAMESPACE cFontFamily
+#define _SELF(self) (RVAL2PANGOFONTFAMILY(self))
 
 static VALUE
-font_family_get_name(VALUE self)
+rg_name(VALUE self)
 {
     return CSTR2RVAL(pango_font_family_get_name(_SELF(self)));
 }
 
 #ifdef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 static VALUE
-font_family_is_monospace(VALUE self)
+rg_monospace_p(VALUE self)
 {
     return CBOOL2RVAL(pango_font_family_is_monospace(_SELF(self)));
 }
 #endif
 
 static VALUE
-font_family_list_faces(VALUE self)
+rg_faces(VALUE self)
 {
     int n_faces;
     PangoFontFace** faces;
@@ -49,15 +60,15 @@ font_family_list_faces(VALUE self)
 }
 
 void
-Init_pango_font_family()
+Init_pango_font_family(VALUE mPango)
 {
-    VALUE pFamily = G_DEF_CLASS(PANGO_TYPE_FONT_FAMILY, "FontFamily", mPango);
-    
-    rb_define_method(pFamily, "name", font_family_get_name, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_FONT_FAMILY, "FontFamily", mPango);
+
+    RG_DEF_METHOD(name, 0);
 #ifdef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
-    rb_define_method(pFamily, "monospace?", font_family_is_monospace, 0);
+    RG_DEF_METHOD_P(monospace, 0);
 #endif
-    rb_define_method(pFamily, "faces", font_family_list_faces, 0);
+    RG_DEF_METHOD(faces, 0);
 
     G_DEF_CLASS3("PangoFcFamily", "FcFamily", mPango);
     G_DEF_CLASS3("PangoFT2Family", "FT2Family", mPango);

data/ext/pango/rbpangofontmap.c

@@ -1,23 +1,32 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbpangofontmap.c -
-
-  $Author: mutoh $
-  $Date: 2006/12/10 15:13:10 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) (PANGO_FONT_MAP(RVAL2GOBJ(self)))
-#define RVAL2DESC(d) ((PangoFontDescription*)RVAL2BOXED(d, PANGO_TYPE_FONT_DESCRIPTION))
-#define RVAL2LANG(l) ((PangoLanguage*)RVAL2BOXED(l, PANGO_TYPE_LANGUAGE))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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"
+
+#define RG_TARGET_NAMESPACE cFontMap
+#define _SELF(self) (RVAL2PANGOFONTMAP(self))
 
 /*
 static VALUE
-font_map_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, pango_ft2_font_map_new());
     return Qnil;
@@ -25,24 +34,24 @@ font_map_initialize(VALUE self)
 */
 
 static VALUE
-font_map_load_font(VALUE self, VALUE context, VALUE desc)
+rg_load_font(VALUE self, VALUE context, VALUE desc)
 {
     return GOBJ2RVAL(pango_font_map_load_font(_SELF(self), 
-                                              PANGO_CONTEXT(RVAL2GOBJ(context)),
-                                              RVAL2DESC(desc)));
+                                              RVAL2PANGOCONTEXT(context),
+                                              RVAL2PANGOFONTDESCRIPTION(desc)));
 }
 
 static VALUE
-font_map_load_fontset(VALUE self, VALUE context, VALUE desc, VALUE lang)
+rg_load_fontset(VALUE self, VALUE context, VALUE desc, VALUE lang)
 {
     return GOBJ2RVAL(pango_font_map_load_fontset(_SELF(self),
-                                                 PANGO_CONTEXT(RVAL2GOBJ(context)),
-                                                 RVAL2DESC(desc),
-                                                 RVAL2LANG(lang)));
+                                                 RVAL2PANGOCONTEXT(context),
+                                                 RVAL2PANGOFONTDESCRIPTION(desc),
+                                                 RVAL2PANGOLANGUAGE(lang)));
 }
 
 static VALUE
-font_map_list_families(VALUE self)
+rg_families(VALUE self)
 {
     int n_families;
     PangoFontFamily** families;
@@ -64,25 +73,25 @@ font_map_list_families(VALUE self)
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
-font_map_get_shape_engine_type(VALUE self)
+rg_shape_engine_type(VALUE self)
 {
     return CSTR2RVAL(pango_font_map_get_shape_engine_type(_SELF(self)));
 }
 #endif
 
 void
-Init_pango_font_map()
+Init_pango_font_map(VALUE mPango)
 {
-    VALUE pMap = G_DEF_CLASS(PANGO_TYPE_FONT_MAP, "FontMap", mPango);
-    
-	 /*
-    rb_define_method(pMap, "initialize", font_map_initialize, 0);
-	 */
-    rb_define_method(pMap, "load_font", font_map_load_font, 2);
-    rb_define_method(pMap, "load_fontset", font_map_load_fontset, 3);
-    rb_define_method(pMap, "families", font_map_list_families, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_FONT_MAP, "FontMap", mPango);
+
+     /*
+    RG_DEF_METHOD(initialize, 0);
+     */
+    RG_DEF_METHOD(load_font, 2);
+    RG_DEF_METHOD(load_fontset, 3);
+    RG_DEF_METHOD(families, 0);
 #if PANGO_CHECK_VERSION(1,4,0)
-    rb_define_method(pMap, "shape_engine_type", font_map_get_shape_engine_type, 0);
+    RG_DEF_METHOD(shape_engine_type, 0);
 #endif
 
     G_DEF_CLASS3("PangoFcFontMap", "FcFontMap", mPango);
@@ -96,4 +105,3 @@ Init_pango_font_map()
     G_DEF_CLASS3("PangoATSUIFontMap", "ATSUIFontMap", mPango);
 #endif
 }
-

data/ext/pango/rbpangofontmetrics.c

@@ -1,77 +1,88 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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
+ */
 
-  rbpangofontmetrics.c -
+#include "rbpangoprivate.h"
 
-  $Author: mutoh $
-  $Date: 2005/02/13 17:31:33 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) ((PangoFontMetrics*)RVAL2BOXED(self, PANGO_TYPE_FONT_METRICS))
+#define RG_TARGET_NAMESPACE cFontMetrics
+#define _SELF(self) (RVAL2PANGOFONTMETRICS(self))
 
 static VALUE
-font_metrics_get_ascent(VALUE self)
+rg_ascent(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_ascent(_SELF(self)));
 }
 
 static VALUE
-font_metrics_get_descent(VALUE self)
+rg_descent(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_descent(_SELF(self)));
 }
 
 static VALUE
-font_metrics_get_approximate_char_width(VALUE self)
+rg_approximate_char_width(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_approximate_char_width(_SELF(self)));
 }
 
 static VALUE
-font_metrics_get_approximate_digit_width(VALUE self)
+rg_approximate_digit_width(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_approximate_digit_width(_SELF(self)));
 }
 
 #if PANGO_CHECK_VERSION(1,6,0)
 static VALUE
-font_metrics_get_underline_thickness(VALUE self)
+rg_underline_thickness(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_underline_thickness(_SELF(self)));
 }
 static VALUE
-font_metrics_get_underline_position(VALUE self)
+rg_underline_position(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_underline_position(_SELF(self)));
 }
 static VALUE
-font_metrics_get_strikethrough_thickness(VALUE self)
+rg_strikethrough_thickness(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_strikethrough_thickness(_SELF(self)));
 }
 static VALUE
-font_metrics_get_strikethrough_position(VALUE self)
+rg_strikethrough_position(VALUE self)
 {
     return INT2NUM(pango_font_metrics_get_strikethrough_position(_SELF(self)));
 }
 #endif
 void
-Init_pango_font_metrics()
+Init_pango_font_metrics(VALUE mPango)
 {
-    VALUE pMetrics = G_DEF_CLASS(PANGO_TYPE_FONT_METRICS, "FontMetrics", mPango);
-    
-    rb_define_method(pMetrics, "ascent", font_metrics_get_ascent, 0);
-    rb_define_method(pMetrics, "descent", font_metrics_get_descent, 0);
-    rb_define_method(pMetrics, "approximate_char_width", font_metrics_get_approximate_char_width, 0);
-    rb_define_method(pMetrics, "approximate_digit_width", font_metrics_get_approximate_digit_width, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_FONT_METRICS, "FontMetrics", mPango);
+
+    RG_DEF_METHOD(ascent, 0);
+    RG_DEF_METHOD(descent, 0);
+    RG_DEF_METHOD(approximate_char_width, 0);
+    RG_DEF_METHOD(approximate_digit_width, 0);
 #if PANGO_CHECK_VERSION(1,6,0)
-    rb_define_method(pMetrics, "underline_thickness", font_metrics_get_underline_thickness, 0);
-    rb_define_method(pMetrics, "underline_position", font_metrics_get_underline_position, 0);
-    rb_define_method(pMetrics, "strikethrough_thickness", font_metrics_get_strikethrough_thickness, 0);
-    rb_define_method(pMetrics, "strikethrough_position", font_metrics_get_strikethrough_position, 0);
+    RG_DEF_METHOD(underline_thickness, 0);
+    RG_DEF_METHOD(underline_position, 0);
+    RG_DEF_METHOD(strikethrough_thickness, 0);
+    RG_DEF_METHOD(strikethrough_position, 0);
 #endif
 }

data/ext/pango/rbpangofontset.c

@@ -1,30 +1,41 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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
+ */
 
-  rbpangofontset.c -
+#include "rbpangoprivate.h"
 
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:33 $
-
-  Copyright (C) 2002-2005 Masao Mutoh 
-************************************************/
-
-#include "rbpango.h"
-
-#define _SELF(self) (PANGO_FONTSET(RVAL2GOBJ(self)))
+#define RG_TARGET_NAMESPACE cFontset
+#define _SELF(self) (RVAL2PANGOFONTSET(self))
 
 static ID id_call;
 
 static VALUE
-fontset_get_font(VALUE self, VALUE wc)
+rg_get_font(VALUE self, VALUE wc)
 {
     return GOBJ2RVAL(pango_fontset_get_font(_SELF(self), NUM2UINT(wc)));
 }
 
 static VALUE
-fontset_get_metrics(VALUE self)
+rg_metrics(VALUE self)
 {
-    return BOXED2RVAL(pango_fontset_get_metrics(_SELF(self)), PANGO_TYPE_FONT_METRICS);
+    return PANGOFONTMETRICS2RVAL(pango_fontset_get_metrics(_SELF(self)));
 }
 
 #if PANGO_CHECK_VERSION(1,4,0)
@@ -36,7 +47,7 @@ fontset_each(PangoFontset *fontset, PangoFont *font, gpointer func)
 }
 
 static VALUE
-fontset_foreach(VALUE self)
+rg_each(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -48,15 +59,15 @@ fontset_foreach(VALUE self)
 #endif
 
 void
-Init_pango_fontset()
+Init_pango_fontset(VALUE mPango)
 {
-    VALUE pFontSet = G_DEF_CLASS(PANGO_TYPE_FONTSET, "Fontset", mPango);
-    
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(PANGO_TYPE_FONTSET, "Fontset", mPango);
+
     id_call = rb_intern("call");
 
-    rb_define_method(pFontSet, "get_font", fontset_get_font, 1);
-    rb_define_method(pFontSet, "metrics", fontset_get_metrics, 0);
+    RG_DEF_METHOD(get_font, 1);
+    RG_DEF_METHOD(metrics, 0);
 #if PANGO_CHECK_VERSION(1,4,0)
-    rb_define_method(pFontSet, "each", fontset_foreach, 0);
+    RG_DEF_METHOD(each, 0);
 #endif
 }