Updates.

2003-06-13  Tor Lillqvist  <tml@iki.fi>

	* README.win32: Updates.

	* pango-zip.sh.in (DLLDIR): libtool 1.5 installs DLLs in the bin
	directory, so look there, too. Include the gtk-doc directory.

	* pango/pangoft2.def: Add pango_ft2_font_map_new and
	pango_ot_info_get. Remove pango_ot_info_new.

8 files changed, 63 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index b5377eb8..e171ba2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-06-13  Tor Lillqvist  <tml@iki.fi>
+
+	* README.win32: Updates.
+
+	* pango-zip.sh.in (DLLDIR): libtool 1.5 installs DLLs in the bin
+	directory, so look there, too. Include the gtk-doc directory.
+
+	* pango/pangoft2.def: Add pango_ft2_font_map_new and
+	pango_ot_info_get. Remove pango_ot_info_new.
+
 Mon Jun  9 00:23:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.2.3 ===
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index b5377eb8..e171ba2e 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+2003-06-13  Tor Lillqvist  <tml@iki.fi>
+
+	* README.win32: Updates.
+
+	* pango-zip.sh.in (DLLDIR): libtool 1.5 installs DLLs in the bin
+	directory, so look there, too. Include the gtk-doc directory.
+
+	* pango/pangoft2.def: Add pango_ft2_font_map_new and
+	pango_ot_info_get. Remove pango_ot_info_new.
+
 Mon Jun  9 00:23:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.2.3 ===
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index b5377eb8..e171ba2e 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+2003-06-13  Tor Lillqvist  <tml@iki.fi>
+
+	* README.win32: Updates.
+
+	* pango-zip.sh.in (DLLDIR): libtool 1.5 installs DLLs in the bin
+	directory, so look there, too. Include the gtk-doc directory.
+
+	* pango/pangoft2.def: Add pango_ft2_font_map_new and
+	pango_ot_info_get. Remove pango_ot_info_new.
+
 Mon Jun  9 00:23:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.2.3 ===
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index b5377eb8..e171ba2e 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+2003-06-13  Tor Lillqvist  <tml@iki.fi>
+
+	* README.win32: Updates.
+
+	* pango-zip.sh.in (DLLDIR): libtool 1.5 installs DLLs in the bin
+	directory, so look there, too. Include the gtk-doc directory.
+
+	* pango/pangoft2.def: Add pango_ft2_font_map_new and
+	pango_ot_info_get. Remove pango_ot_info_new.
+
 Mon Jun  9 00:23:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.2.3 ===
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index b5377eb8..e171ba2e 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+2003-06-13  Tor Lillqvist  <tml@iki.fi>
+
+	* README.win32: Updates.
+
+	* pango-zip.sh.in (DLLDIR): libtool 1.5 installs DLLs in the bin
+	directory, so look there, too. Include the gtk-doc directory.
+
+	* pango/pangoft2.def: Add pango_ft2_font_map_new and
+	pango_ot_info_get. Remove pango_ot_info_new.
+
 Mon Jun  9 00:23:34 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* === Released 1.2.3 ===
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/pango-zip.sh.in b/pango-zip.sh.in
index 6f466468..cbb37a7e 100755
--- a/pango-zip.sh.in
+++ b/pango-zip.sh.in
@@ -6,14 +6,17 @@ ZIP=/tmp/pango-@PANGO_VERSION@-`date +%Y%m%d`.zip
 DEVZIP=/tmp/pango-dev-@PANGO_VERSION@-`date +%Y%m%d`.zip
 cd @prefix@
 
+DLLDIR=lib
+[ -f bin/libpango-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin
+
 rm $ZIP
 zip $ZIP -@ <<EOF
 bin/pango-querymodules.exe
 etc/pango/pango.aliases
 etc/pango/pango.modules
-lib/libpango-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-lib/libpangoft2-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-lib/libpangowin32-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libpango-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libpangoft2-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libpangowin32-@PANGO_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
 zip $ZIP lib/pango/@PANGO_MODULE_VERSION@/modules/*.dll
@@ -30,4 +33,5 @@ lib/pangowin32-@PANGO_API_VERSION@.lib
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangowin32.pc
 lib/pkgconfig/pangoft2.pc
+share/gtk-doc/html/pango
 EOF
diff --git a/pango/pangoft2.def b/pango/pangoft2.def
index e221a7df..b207773c 100644
--- a/pango/pangoft2.def
+++ b/pango/pangoft2.def
@@ -3,6 +3,7 @@ EXPORTS
 	pango_ft2_font_get_face
 	pango_ft2_font_get_kerning
 	pango_ft2_font_map_for_display
+	pango_ft2_font_map_new
 	pango_ft2_get_context
 	pango_ft2_get_unknown_glyph
 	pango_ft2_render
@@ -12,10 +13,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