Memory management functions for PangoItem.

Mon Mar 13 10:54:48 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pango-item.[ch]: Memory management functions for PangoItem.

	* pango/*.[ch]: Random constification.

	* pango/pangox.c pango/pango-layout.c pango/pango-context.c:
	Add an extra_attrs field to PangoItem. Use this to handle underlining
	for PangoLayout.

	* examples/viewer.c (reload_font): Make paragraphs global
	to save the complexity of passing it around all over the place.

	* pango/pango-layout.[ch] (pango_layout_context_changed): Add
	a function to reset the layout on changes to the layout's
	context.

	* pango/pangox.c (pango_x_make_matching_xlfd): Prefer bitmap
	to scaleable if the discrepancy is < 1 pixel. (Probably not
	the ideal criterion.)

	* pango/pangox.c (pango_x_font_map_for_display): Fix resolution
	computation error.

	* pango/pango-layout.c (pango_layout_check_lines): Handle
	text with embedded newlines.

	* pango/pangox.c (pango_x_render_layout): Fix y to refer
	to the top of the layout, not the baseline of the first
	line.

	* pango/pango-layout.c (process_item): Don't wrap if width is
	set to -1.

	* Makefile.am configure.in **/*.[ch]: move libpango/ directory
	and fix all headers to install under include/pango/

6 files changed, 6 insertions, 6 deletions

diff --git a/modules/Makefile.am b/modules/Makefile.am
index fd2f7d55..93cf108e 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -4,5 +4,5 @@ SUBDIRS=basic hangul tamil arabic
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/pango
-	$(top_builddir)/libpango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so > $(DESTDIR)$(localstatedir)/lib/pango/pango.modules
+	$(top_builddir)/pango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so > $(DESTDIR)$(localstatedir)/lib/pango/pango.modules
 
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 550668cb..951a3247 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_LTLIBRARIES = pango-arabic.la
 
-INCLUDES = -I$(top_srcdir)/libpango/
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ 
 
 pango_arabic_la_SOURCES = \
 	arabic.c \
diff --git a/modules/arabic/arconv.h b/modules/arabic/arconv.h
index 89c72b7d..a90a0e78 100644
--- a/modules/arabic/arconv.h
+++ b/modules/arabic/arconv.h
@@ -1,7 +1,7 @@
 
 #ifndef __arconv_h_
 #define __arconv_h_
-#include "../../libpango/utils.h"
+#include "utils.h"
 
 void reshape(int* len,GUChar4* string);
 int  arabic_isvowel(GUChar4 s);
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 505b9dad..dd459259 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -6,7 +6,7 @@ module_LTLIBRARIES = pango-basic.la
 pango_basic_la_SOURCES = basic.c
 pango_basic_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
 
-INCLUDES = -I$(top_srcdir)/libpango/
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ 
 
 
 EXTRA_DIST= \
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index 6c341960..aa5c7e72 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -3,7 +3,7 @@
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-hangul.la
 
-INCLUDES = -I$(top_srcdir)/libpango
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ 
 
 pango_hangul_la_SOURCES = hangul.c
 pango_hangul_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am
index c9966ef2..05bd6320 100644
--- a/modules/tamil/Makefile.am
+++ b/modules/tamil/Makefile.am
@@ -3,7 +3,7 @@
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-tamil.la
 
-INCLUDES = -I$(top_srcdir)/libpango/
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ 
 
 pango_tamil_la_SOURCES = tamil.c taconv.c taconv.h tadefs.h
 pango_tamil_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module