
Property changes on: .
___________________________________________________________________
Modified: svn:ignore
   - Makefile.in
Makefile
makefile.mingw
pango.rc
pangoft2.rc
pangowin32.rc
pango-enum-types.[ch]
pango-features.h
s-enum-types-[ch]
pango-querymodules
module-defs.h
module-defs-*.c
*.lo
*.la
*.def.list
*.def.expected
.deps
.libs
TAGS

   + Makefile.in
Makefile
makefile.mingw
pango.rc
pangoft2.rc
pangowin32.rc
pango-enum-types.[ch]
pango-features.h
s-enum-types-[ch]
pango-querymodules
module-defs.h
module-defs-*.c
Pango-1.0.gir
PangoCairo-1.0.gir
PangoFT2-1.0.gir
PangoXft-1.0.gir
PangoX-1.0.gir
*.lo
*.la
*.def.list
*.def.expected
*.typelib
.deps
.libs
TAGS


Index: pango-attributes.c
===================================================================
--- pango-attributes.c	(revision 2797)
+++ pango-attributes.c	(working copy)
@@ -1793,7 +1793,8 @@
  *        <literal>pango_font_description_set_family (desc, pango_font_description_get_family (desc))</literal>.
  * @language: if non-%NULL, location to store language tag for item, or %NULL
  *            if none is found.
- * @extra_attrs: if non-%NULL, location in which to store a list of non-font
+ * @extra_attrs: (element type Pango.Attribute): (transfer full): if non-%NULL,
+ *           location in which to store a list of non-font
  *           attributes at the the current position; only the highest priority
  *           value of each attribute will be added to this list. In order
  *           to free this value, you must call pango_attribute_destroy() on
@@ -2013,7 +2014,8 @@
  * Gets a list of all attributes at the current position of the
  * iterator.
  *
- * Return value: a list of all attributes for the current range.
+ * Return value: (element-type Pango.Attribute): (transfer full): a list of
+ *   all attributes for the current range.
  *   To free this value, call pango_attribute_destroy() on
  *   each value and g_slist_free() on the list.
  *
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 2797)
+++ Makefile.am	(working copy)
@@ -8,6 +8,10 @@
 OPENTYPE_SUBDIR=opentype
 endif
 
+EXTRA_DIST = 
+GIRSOURCES = HarfBuzz-1.0.gir
+BUILT_GIRSOURCES =
+
 FRIBIDI_SUBDIR=mini-fribidi
 
 SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR)
@@ -40,6 +44,7 @@
 # ------------------- libpango -------------------
 
 lib_LTLIBRARIES = libpango-1.0.la
+BUILT_GIRSOURCES += Pango-1.0.gir
 
 libpango_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpango_1_0_la_LIBADD =		\
@@ -155,15 +160,37 @@
 pango-features.h:
 	cd $(top_builddir) && ./config.status pango/pango-features.h
 
+Pango-1.0.gir: $(libpango_1_0_la_SOURCES)
+Pango-1.0.gir: $(pango_headers)
+Pango-1.0.gir: libpango-1.0.la
+Pango-1.0.gir: $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace Pango --nsversion=1.0 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=cairo-1.0 \
+            --library=pango-1.0 \
+	    --libtool="$(LIBTOOL)" \
+            --output $@ \
+            --pkg gobject-2.0 \
+            --pkg cairo \
+            --pkg freetype2 \
+	    -I$(top_srcdir) \
+	    $(PANGO_CFLAGS) \
+            $(libpango_1_0_la_SOURCES) \
+	    $(pango_headers)
+
 # ------------------- libpangox -------------------
 
 if HAVE_X
-pangoinclude_HEADERS += pangox.h
+pangoinclude_HEADERS += $(pangox_headers)
 lib_LTLIBRARIES += libpangox-1.0.la
 aliasdir = $(sysconfdir)/pango
 alias_DATA = pangox.aliases
+BUILT_GIRSOURCES += PangoX-1.0.gir
 endif
 
+pangox_headers = pangox.h
+
 libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangox_1_0_la_LIBADD = 			\
 	libpango-$(PANGO_API_VERSION).la	\
@@ -182,15 +209,40 @@
 	pangox-fontcache.c \
 	pangox-fontmap.c
 
+PangoX-1.0.gir: $(libpangox_1_0_la_SOURCES)
+PangoX-1.0.gir: $(pangox_headers)
+PangoX-1.0.gir: libpangox-1.0.la
+PangoX-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace PangoX --nsversion=1.0 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=xlib-2.0 \
+            --include=Pango-1.0 \
+            --library=pangox-1.0 \
+	    --libtool="$(LIBTOOL)" \
+            --output $@ \
+            --pkg gobject-2.0 \
+            --pkg freetype2 \
+            --pkg pangox \
+	    -I$(top_srcdir) \
+            $(libpangox_1_0_la_SOURCES) \
+	    $(pangox_headers)
 
 # ------------------- libpangoft2 -------------------
 
 if HAVE_FREETYPE
-pangoinclude_HEADERS += pangofc-font.h pangofc-fontmap.h
-pangoinclude_HEADERS += pangoft2.h pango-ot.h pangofc-decoder.h
+pangoinclude_HEADERS += $(pangoft2_headers)
 lib_LTLIBRARIES += libpangoft2-1.0.la
+BUILT_GIRSOURCES += PangoFT2-1.0.gir
 endif
 
+pangoft2_headers = 		\
+	pango-ot.h		\
+	pangofc-font.h		\
+	pangofc-fontmap.h	\
+	pangofc-decoder.h	\
+	pangoft2.h
+
 libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangoft2_1_0_la_LIBADD =			\
 	opentype/libharfbuzz-1.la		\
@@ -229,14 +281,37 @@
 pangoft2-win32-res.o: pangoft2.rc
 	$(WINDRES) $< $@
 
+PangoFT2-1.0.gir: $(pangoft2_headers)
+PangoFT2-1.0.gir: $(libpangoft2_1_0_la_SOURCES)
+PangoFT2-1.0.gir: libpangoft2-1.0.la
+PangoFT2-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=Pango-1.0 \
+            --include=freetype2-2.0 \
+            --include=fontconfig-2.0 \
+            --include=HarfBuzz-1.0 \
+            --library=pangoft2-1.0 \
+	    --libtool="$(LIBTOOL)" \
+            --output $@ \
+            --pkg gobject-2.0 \
+            --pkg freetype2 \
+            --pkg pangoft2 \
+	    -I$(top_srcdir) \
+            $(pangoft2_headers) \
+            $(libpangoft2_1_0_la_SOURCES)
 
 # ------------------- libpangoxft -------------------
 
 if HAVE_XFT
-pangoinclude_HEADERS += pangoxft.h pangoxft-render.h pango-ot.h
+pangoinclude_HEADERS += $(pangoxft_headers)
 lib_LTLIBRARIES += libpangoxft-1.0.la
+BUILT_GIRSOURCES += PangoXft-1.0.gir
 endif
 
+pangoxft_headers = pangoxft.h pangoxft-render.h pango-ot.h
+
 libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangoxft_1_0_la_LIBADD =			\
 	libpangoft2-$(PANGO_API_VERSION).la	\
@@ -256,13 +331,36 @@
 	pangoxft-render.c
 
 
+PangoXft-1.0.gir: $(pangoxft_headers)
+PangoXft-1.0.gir: $(libpangoxft_1_0_la_SOURCES)
+PangoXft-1.0.gir: libpangoxft-1.0.la
+PangoXft-1.0.gir: Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=xft-2.0 \
+            --include=xlib-2.0 \
+            --include=PangoFT2-1.0 \
+            --library=pangoxft-1.0 \
+	    --libtool="$(LIBTOOL)" \
+            --output $@ \
+            --pkg gobject-2.0 \
+            --pkg freetype2 \
+	    -I$(top_srcdir) \
+	    $(PANGO_CFLAGS) \
+            $(pangoxft_headers) \
+            $(libpangoxft_1_0_la_SOURCES)
+
 # ------------------- libpangocairo -------------------
 
 if HAVE_CAIRO
-pangoinclude_HEADERS += pangocairo.h
+pangoinclude_HEADERS += $(pangocairo_headers)
 lib_LTLIBRARIES += libpangocairo-1.0.la
+BUILT_GIRSOURCES += PangoCairo-1.0.gir
 endif
 
+pangocairo_headers = pangocairo.h
+
 libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpangocairo_1_0_la_LIBADD =			\
 	libpango-$(PANGO_API_VERSION).la	\
@@ -319,6 +417,25 @@
 libpangocairo_1_0_la_LIBADD += $(INCLUDED_ATSUI_MODULES)
 endif
 
+PangoCairo-1.0.gir: $(libpangocairo_1_0_la_SOURCES)
+PangoCairo-1.0.gir: $(pangocairo_headers)
+PangoCairo-1.0.gir: libpangocairo-1.0.la
+PangoCairo-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+            --include=GObject-2.0 \
+            --include=cairo-1.0 \
+            --include=Pango-1.0 \
+            --library=pangocairo-1.0 \
+	    --libtool="$(LIBTOOL)" \
+            --output $@ \
+            --pkg gobject-2.0 \
+            --pkg cairo \
+	    -I$(top_srcdir) \
+	    $(PANGO_CFLAGS) \
+            $(libpangocairo_1_0_la_SOURCES) \
+	    $(pangocairo_headers)
+
 # ------------------- libpangowin32 -------------------
 
 if HAVE_WIN32
@@ -416,6 +533,24 @@
 	lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangocairo-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@
 
 
+# ------------------- introspection -------------------
+
+if HAVE_INTROSPECTION
+
+girdir = $(GIRDIR)
+dist_gir_DATA = $(BUILT_GIRSOURCES)
+
+EXTRA_DIST += $(GIRSOURCES)
+EXTRA_DIST += $(BUILT_GIRSOURCES)
+
+typelibsdir = $(TYPELIBDIR)
+typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(GIRSOURCES:.gir=.typelib)
+
+%.typelib: %.gir $(G_IR_COMPILER)
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+
+endif # HAVE_INTROSPECTION
+
 # ------------------- pango-querymodules -------------------
 
 bin_PROGRAMS = pango-querymodules
@@ -441,7 +576,7 @@
 endif
 pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
 
-EXTRA_DIST =					\
+EXTRA_DIST +=					\
 	pango-enum-types.h			\
 	module-defs.h				\
 	module-defs-fc.c.win32			\
Index: HarfBuzz-1.0.gir
===================================================================
--- HarfBuzz-1.0.gir	(revision 0)
+++ HarfBuzz-1.0.gir	(revision 0)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<repository version="1.0"
+            xmlns="http://www.gtk.org/introspection/core/1.0"
+            xmlns:c="http://www.gtk.org/introspection/c/1.0">
+  <namespace name="HarfBuzz" version="1.0" shared-library="pangoft2-1.0">
+    <record name="GDEF" c:type="HB_GDEF"/>
+    <record name="GPOS" c:type="HB_GPOS"/>
+    <record name="GSUB" c:type="HB_GSUB"/>
+    <record name="Buffer" c:type="HB_Buffer"/>
+    <function name="dummy" c:identifier="HG_dummy">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+      </parameters>
+    </function>
+  </namespace>
+</repository>
Index: pango-layout.c
===================================================================
--- pango-layout.c	(revision 2797)
+++ pango-layout.c	(working copy)
@@ -1315,9 +1315,9 @@
  * Use the faster pango_layout_get_lines_readonly() if you do not plan
  * to modify the contents of the lines (glyphs, glyph widths, etc.).
  *
- * Return value: a #GSList containing the lines in the layout. This
- * points to internal data of the #PangoLayout and must be used with
- * care. It will become invalid on any change to the layout's
+ * Return value: (element-type Pango.LayoutLine): (transfer none): a #GSList containing
+ * the lines in the layout. This points to internal data of the #PangoLayout
+ * and must be used with care. It will become invalid on any change to the layout's
  * text or properties.
  **/
 GSList *
@@ -1350,9 +1350,9 @@
  * but the user is not expected
  * to modify the contents of the lines (glyphs, glyph widths, etc.).
  *
- * Return value: a #GSList containing the lines in the layout. This
- * points to internal data of the #PangoLayout and must be used with
- * care. It will become invalid on any change to the layout's
+ * Return value: (element-type Pango.LayoutLine): (transfer none): a #GSList containing
+ * the lines in the layout. This points to internal data of the #PangoLayout and
+ * must be used with care. It will become invalid on any change to the layout's
  * text or properties.  No changes should be made to the lines.
  *
  * Since: 1.16
@@ -4188,7 +4188,8 @@
  *               the last range will extend all the way to the trailing
  *               edge of the layout. Otherwise, it will end at the
  *               trailing edge of the last character.
- * @ranges:      location to store a pointer to an array of ranges.
+ * @ranges: (out): (array length=n_ranges): (transfer=full):
+ *               location to store a pointer to an array of ranges.
  *               The array will be of length <literal>2*n_ranges</literal>,
  *               with each range starting at <literal>(*ranges)[2*n]</literal>
  *               and of width <literal>(*ranges)[2*n + 1] - (*ranges)[2*n]</literal>.
