Add HAVE_X.

2003-05-29  Tor Lillqvist  <tml@iki.fi>

	* acconfig.h: Add HAVE_X.

	* configure.in: Set HAVE_X.

	* modules/thai/thai-shaper.h: Don't include pangox.h unless
	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.

	* modules/hangul/Makefile.am
	* modules/indic/Makefile.am
	* modules/thai/Makefile.am: Use -no-undefined on Windows.

	* modules/thai/thai-shaper.c: Include config.h for HAVE_X.

	* README.win32: Some minor edits.

	* pango/pango.def: Add pango_fc_* entries.

	* pango/pangoft2.def: Add some missing entries.

15 files changed, 142 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index e731522e..c73d01c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2003-05-29  Tor Lillqvist  <tml@iki.fi>
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/hangul/Makefile.am
+	* modules/indic/Makefile.am
+	* modules/thai/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.c: Include config.h for HAVE_X.
+
+	* README.win32: Some minor edits.
+
+	* pango/pango.def: Add pango_fc_* entries.
+
+	* pango/pangoft2.def: Add some missing entries.
+
 Wed May 28 17:43:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	(#107630, Federic Zhang)
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index e731522e..c73d01c6 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,24 @@
+2003-05-29  Tor Lillqvist  <tml@iki.fi>
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/hangul/Makefile.am
+	* modules/indic/Makefile.am
+	* modules/thai/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.c: Include config.h for HAVE_X.
+
+	* README.win32: Some minor edits.
+
+	* pango/pango.def: Add pango_fc_* entries.
+
+	* pango/pangoft2.def: Add some missing entries.
+
 Wed May 28 17:43:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	(#107630, Federic Zhang)
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index e731522e..c73d01c6 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,24 @@
+2003-05-29  Tor Lillqvist  <tml@iki.fi>
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/hangul/Makefile.am
+	* modules/indic/Makefile.am
+	* modules/thai/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.c: Include config.h for HAVE_X.
+
+	* README.win32: Some minor edits.
+
+	* pango/pango.def: Add pango_fc_* entries.
+
+	* pango/pangoft2.def: Add some missing entries.
+
 Wed May 28 17:43:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	(#107630, Federic Zhang)
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index e731522e..c73d01c6 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,24 @@
+2003-05-29  Tor Lillqvist  <tml@iki.fi>
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/hangul/Makefile.am
+	* modules/indic/Makefile.am
+	* modules/thai/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.c: Include config.h for HAVE_X.
+
+	* README.win32: Some minor edits.
+
+	* pango/pango.def: Add pango_fc_* entries.
+
+	* pango/pangoft2.def: Add some missing entries.
+
 Wed May 28 17:43:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	(#107630, Federic Zhang)
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index e731522e..c73d01c6 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,24 @@
+2003-05-29  Tor Lillqvist  <tml@iki.fi>
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/hangul/Makefile.am
+	* modules/indic/Makefile.am
+	* modules/thai/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.c: Include config.h for HAVE_X.
+
+	* README.win32: Some minor edits.
+
+	* pango/pango.def: Add pango_fc_* entries.
+
+	* pango/pangoft2.def: Add some missing entries.
+
 Wed May 28 17:43:16 2003  Owen Taylor  <otaylor@redhat.com>
 
 	(#107630, Federic Zhang)
diff --git a/README.win32 b/README.win32
index 50df5a19..654ae757 100644
--- a/README.win32
+++ b/README.win32
@@ -1,8 +1,7 @@
-There are two Pango backends written for Win32: pangowin32 and
-pangoft2. Pangowin32 uses the Win32 GDI font API. Pangoft2 uses
-FreeType2. Neither one is even close to being as useable as the X11
-backend. They are buggy and slow, and print copious amounts of
-debugging output.
+The Pango backend written for Win32 is pangowin32. Pangowin32 uses the
+Win32 GDI font API. GTK+ on Win32 uses the pangowin32 backend. The
+pangoft2 backend was originally written with Win32 in mind, but its
+main use nowadays is on other platforms than Win32.
 
 There are two supported ways to build Pango for Win32:
 
diff --git a/acconfig.h b/acconfig.h
index e4f933d9..f5dbde89 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -20,4 +20,5 @@
 #undef HAVE_USP10_H
 
 #undef MINI_XFTCONFIG_DIR
+#undef HAVE_X
 #undef HAVE_XFT2
diff --git a/configure.in b/configure.in
index bf9e701e..a3b6cf9a 100644
--- a/configure.in
+++ b/configure.in
@@ -183,6 +183,7 @@ if test x$no_x = xyes ; then
 else
   X_LIBS="$X_LIBS -lX11"
   have_x=true
+  AC_DEFINE(HAVE_X)
 fi
 AM_CONDITIONAL(HAVE_X, $have_x) 
 
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index a4047f3b..a83aae54 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -13,6 +13,10 @@ INCLUDES = 				\
 	-I$(top_srcdir)/pango/		\
 	$(GLIB_CFLAGS)
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
@@ -65,7 +69,7 @@ endif
 
 ft2_sources = hangul-fc.c hangul-defs.h
 
-pango_hangul_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_hangul_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_hangul_ft2_la_LIBADD = $(pangoft2libs)
 pango_hangul_ft2_la_SOURCES = $(ft2_sources)
 pango_hangul_ft2_la_CFLAGS = -DBUILD_FT2
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 42912836..bc55ad7e 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -13,6 +13,9 @@ INCLUDES =					\
 	-I$(top_srcdir)/pango/			\
 	$(GLIB_CFLAGS)
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
 
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
@@ -120,7 +123,7 @@ ft2_sources =		 	\
 	indic-ot.c		\
 	indic-ot.h
 
-pango_indic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_indic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_indic_ft2_la_LIBADD = $(pangoft2libs)
 pango_indic_ft2_la_SOURCES = $(ft2_sources)
 pango_indic_ft2_la_CFLAGS = -DBUILD_FT2
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index 82918faf..179c5ffc 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -13,6 +13,10 @@ INCLUDES =			\
 	-I$(top_srcdir)/pango/	\
 	$(GLIB_CFLAGS)
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 module_LTLIBRARIES =
 noinst_LTLIBRARIES =
@@ -68,7 +72,7 @@ endif
 
 thai_ft2_sources = $(common_sources) thai-fc.c 
 
-pango_thai_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_thai_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_thai_ft2_la_LIBADD = $(pangoft2libs)
 pango_thai_ft2_la_SOURCES = $(thai_ft2_sources)
 pango_thai_ft2_la_CFLAGS = -DBUILD_FT2
diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c
index 39e3ee14..fd052dd3 100644
--- a/modules/thai/thai-shaper.c
+++ b/modules/thai/thai-shaper.c
@@ -25,7 +25,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
+#include "config.h"
 
 #include <string.h>
 
diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h
index 401a4f78..7a9bb31e 100644
--- a/modules/thai/thai-shaper.h
+++ b/modules/thai/thai-shaper.h
@@ -1,7 +1,9 @@
 #ifndef __THAI_SHAPER_H__
 #define __THAI_SHAPER_H__
 
+#ifdef HAVE_X
 #include "pangox.h"
+#endif
 
 #define ucs2tis(wc)     (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0)
 #define tis2uni(c)      ((gunichar)(c) - 0xA0 + 0x0E00)
@@ -28,7 +30,9 @@ struct _ThaiFontInfo
 {
   PangoFont       *font;
   ThaiFontSet      font_set;
+#ifdef HAVE_X
   PangoXSubfont    subfont; /* For X backend */
+#endif
 };
 
 /*
diff --git a/pango/pango.def b/pango/pango.def
index f0228572..bd1b0eef 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -67,6 +67,13 @@ EXPORTS
 	pango_coverage_unref
 	pango_default_break
 	pango_direction_get_type
+	pango_fc_font_get_glyph
+	pango_fc_font_get_kerning
+	pango_fc_font_get_type
+	pango_fc_font_get_unknown_glyph
+	pango_fc_font_has_char
+	pango_fc_font_lock_face
+	pango_fc_font_unlock_face
 	pango_find_map
 	pango_find_paragraph_boundary
 	pango_font_describe
diff --git a/pango/pangoft2.def b/pango/pangoft2.def
index e221a7df..3383ceef 100644
--- a/pango/pangoft2.def
+++ b/pango/pangoft2.def
@@ -2,7 +2,11 @@ EXPORTS
 	pango_ft2_font_get_coverage
 	pango_ft2_font_get_face
 	pango_ft2_font_get_kerning
+	pango_ft2_font_map_create_context
 	pango_ft2_font_map_for_display
+	pango_ft2_font_map_get_type
+	pango_ft2_font_map_new
+	pango_ft2_font_map_set_resolution
 	pango_ft2_get_context
 	pango_ft2_get_unknown_glyph
 	pango_ft2_render
@@ -12,10 +16,10 @@ EXPORTS
 	pango_ot_info_find_feature
 	pango_ot_info_find_language
 	pango_ot_info_find_script
+	pango_ot_info_get
 	pango_ot_info_list_features
 	pango_ot_info_list_languages
 	pango_ot_info_list_scripts
-	pango_ot_info_new
 	pango_ot_ruleset_add_feature
 	pango_ot_ruleset_new
 	pango_ot_ruleset_shape