Up to 0.19.

Tue Sep 18 15:47:08 2001  Owen Taylor  <otaylor@redhat.com>

	* configure.in (PANGO_MINOR_VERSION): Up to 0.19.

	* pango/pango-font.h pango/pango-fontmap.[ch] pango/fonts.c
	pango/pangoxft-fontmap.c pango/pangoft-fontmap.c pango/pango-context.[ch]
	pango/pangox-fontmap.c: Add new PangoFontFace and PangoFontFamily
	object types, and change the font listing API to list faces and
	families, instead of face names and font descriptions.

	* pango/pango-font.h pango/fonts.c: Make PangoFontDescription
	an opaque heap-allocated structure, add accessors and
	convenience functions.

	* pango/pango-font.h pango/pango-private.h: Make PangoFontMetrics
	heap allocated, protect the structure definition with
	#ifdef PANGO_ENABLE_BACKEND, and add getters for the fields.

	* pango/pango-attributes.[ch] ( pango_attr_iterator_get_font):
	instead of providing a base font description and one to fill
	in, provide a single font description to modify based on
	the attributes.

	* pango/pango-attributes.[ch]: Fix PangoAttrFontDesc to have
	a PangoFontDescription by reference, not by value.

	* pango/pango-utils.[ch]: make pango_parse_style() and friends
	take pointers to individual enumerations instead of to a
	PangoFontDescription structure.

	* pango/*.c: Fix for the PangoFontDescription and PangoFontMetrics
	changes.

        * pango/pango-{break,engine,indic,ot,xft}.h pango/Makefile.am
	pango/opentype/Makefile.am: Protect portions with
	PANGO_ENABLE_ENGINE to shrink the public API.

	* modules/*/Makefile.am: -DPANGO_ENABLE_ENGINE.

	* pango/{pangox.h,pangox-private.h} modules/basic/basic-x.c: Move
	pango_x_font_get_unknown_glyph() into public header since it is
	used from modules.

	* pango/pango-{context,font,fontmap,modules.utils}.h pango/Makefile.am:
	Protect portions with PANGO_ENABLE_BACKEND to shrink the public	API.

	* pango/*.h: Use G_BEGIN/END_DECLS

	* examples/viewer-qt.[cc,h]: Fix for changes to font listing API,
	PangoFontDescription.

	* pango/pango-indic.h modules/indic/*: Since we install this
	header fix it up to Pango conventions, namespece
	ZERO_WIDTH_JOINER, ZERO_WIDTH_NON_JOINER.

	* docs/pango-sections.txt: Updated.

10 files changed, 13 insertions, 13 deletions

diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 9f431a27..c2920ea4 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -60,7 +60,7 @@ module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX)
 moduledir = $(libdir)/pango/modules
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
+INCLUDES = -DPANGO_ENABLE_ENGINE -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
 
 pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_arabic_x_la_LIBADD = $(arabic_x_libadd)
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 3f56e5ea..b42f5a17 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -64,6 +64,7 @@ moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX)
 moduledir = $(libdir)/pango/modules
 
 INCLUDES = 			\
+	-DPANGO_ENABLE_ENGINE	\
 	-I$(top_srcdir) 	\
 	-I$(top_srcdir)/pango/ 	\
 	$(X_CFLAGS) 		\
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index 99316cc9..7359ad33 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -22,7 +22,6 @@
 #include <glib.h>
 #include <string.h>
 #include "pangox.h"
-#include "pangox-private.h"
 #include "pango-engine.h"
 #include "pango-utils.h"
 
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index 9f8e2752..84456e48 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -18,7 +18,7 @@ hangul_x_libadd = $(pangoxlibs)
 endif
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
+INCLUDES = -DPANGO_ENABLE_ENGINE -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
 pango_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_hangul_x_la_SOURCES = $(sources)
diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index 0aad3db7..3fb613b7 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -18,7 +18,7 @@ hebrew_x_libadd=$(pangoxlibs)
 endif
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
+INCLUDES = -DPANGO_ENABLE_ENGINE -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
 pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_hebrew_x_la_LIBADD = $(hebrew_x_libadd)
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 8fe3dd8a..fd7ec3f0 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -62,7 +62,7 @@ module_LTLIBRARIES = $(myanmar_x_inst) $(gurmukhi_x_inst) $(bengali_x_inst) $(de
 
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(X_CFLAGS) $(myanmar_x_cflags) $(gurmukhi_x_cflags) $(bengali_x_cflags) $(devanagari_x_cflags) $(gujarati_x_cflags)
+INCLUDES = -DPANGO_ENABLE_ENGINE -I$(top_srcdir) -I$(top_srcdir)/pango/ $(X_CFLAGS) $(myanmar_x_cflags) $(gurmukhi_x_cflags) $(bengali_x_cflags) $(devanagari_x_cflags) $(gujarati_x_cflags)
 
 EXTRA_DIST = \
 	pango-indic-script.h
diff --git a/modules/indic/devanagari-x.c b/modules/indic/devanagari-x.c
index a7e08fb6..0082109f 100644
--- a/modules/indic/devanagari-x.c
+++ b/modules/indic/devanagari-x.c
@@ -76,7 +76,7 @@ static char *default_charset = "iso10646-dev";
 static PangoEngineRange pango_indic_range[] =
 {
   {RANGE_START, RANGE_END, "*"},
-  {ZERO_WIDTH_JOINER, ZERO_WIDTH_JOINER, "*"},
+  {PANGO_ZERO_WIDTH_JOINER, PANGO_ZERO_WIDTH_JOINER, "*"},
 };
 
 SCRIPT_ENGINE_DEFINITION
@@ -95,7 +95,7 @@ pango_indic_engine_get_coverage (PangoFont * font, PangoLanguage *lang)
       for (i = RANGE_START; i <= RANGE_END; i++)
 	pango_coverage_set (result, i, PANGO_COVERAGE_EXACT);
 
-      pango_coverage_set (result, ZERO_WIDTH_JOINER, PANGO_COVERAGE_EXACT);
+      pango_coverage_set (result, PANGO_ZERO_WIDTH_JOINER, PANGO_COVERAGE_EXACT);
     }
 
   return result;
@@ -163,7 +163,7 @@ is_intermediate_form (int q)
 static int 
 is_consonantal_form (int q) 
 {
-  return (q == ZERO_WIDTH_JOINER) || is_consonant (q) || (q >= 0xd000);
+  return (q == PANGO_ZERO_WIDTH_JOINER) || is_consonant (q) || (q >= 0xd000);
 }
 
 static int 
diff --git a/modules/indic/gujarati-x.c b/modules/indic/gujarati-x.c
index 55faeb6a..47599b55 100644
--- a/modules/indic/gujarati-x.c
+++ b/modules/indic/gujarati-x.c
@@ -61,7 +61,7 @@ static char *default_charset = "iso10646-guj";
 static PangoEngineRange pango_indic_range[] =
 {
   {RANGE_START, RANGE_END, "*"},
-  {ZERO_WIDTH_JOINER, ZERO_WIDTH_JOINER, "*"},
+  {PANGO_ZERO_WIDTH_JOINER, PANGO_ZERO_WIDTH_JOINER, "*"},
 };
 
 SCRIPT_ENGINE_DEFINITION
@@ -80,7 +80,7 @@ pango_indic_engine_get_coverage (PangoFont * font, PangoLanguage *lang)
       for (i = RANGE_START; i <= RANGE_END; i++)
 	pango_coverage_set (result, i, PANGO_COVERAGE_EXACT);
 
-      pango_coverage_set (result, ZERO_WIDTH_JOINER, PANGO_COVERAGE_EXACT);
+      pango_coverage_set (result, PANGO_ZERO_WIDTH_JOINER, PANGO_COVERAGE_EXACT);
     }
 
   return result;
@@ -140,7 +140,7 @@ is_intermediate_form (int q)
 static int 
 is_consonantal_form (int q) 
 {
-  return (q == ZERO_WIDTH_JOINER) || is_consonant (q) || (q >= 0xc000);
+  return (q == PANGO_ZERO_WIDTH_JOINER) || is_consonant (q) || (q >= 0xc000);
 }
 
 static int 
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am
index f0fb4e61..def87435 100644
--- a/modules/tamil/Makefile.am
+++ b/modules/tamil/Makefile.am
@@ -52,7 +52,7 @@ module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX)
 moduledir = $(libdir)/pango/modules
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
+INCLUDES = -DPANGO_ENABLE_ENGINE -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
 
 pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_tamil_x_la_LIBADD = $(tamil_x_libadd)
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index fc4e4a98..7fc5efee 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -18,7 +18,7 @@ thai_x_libadd=$(pangoxlibs)
 endif
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
+INCLUDES = -DPANGO_ENABLE_ENGINE -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
 pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_thai_x_la_LIBADD = $(thai_x_libadd)