=== Released 1.1.4 ===

Mon Dec  2 17:22:34 2002  Owen Taylor  <otaylor@redhat.com>

        * === Released 1.1.4 ===

        * configure.in: Up version to 1.1.4, interface age 0.

        * NEWS: Updated.

        * pango/pangoxft-fontmap.c (pango_fc_do_finalize)
        * pango/pangoft2-fontmap.c (pango_fc_do_finalize): Fix
        leaks of fontmap->substitute_data. (#99850)

        * pango/Makefile.am (INCLUDES): Fix accidental reference
        to pango-script-table.h.

11 files changed, 113 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 50a8df2c..2b7459b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Mon Dec  2 17:22:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.4 ===
+
+	* configure.in: Up version to 1.1.4, interface age 0.
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-fontmap.c (pango_fc_do_finalize)
+	* pango/pangoft2-fontmap.c (pango_fc_do_finalize): Fix
+	leaks of fontmap->substitute_data. (#99850)
+
+	* pango/Makefile.am (INCLUDES): Fix accidental reference
+	to pango-script-table.h.
+
 Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-glyph-item.[ch] pango/pango-layout.h:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 50a8df2c..2b7459b4 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,18 @@
+Mon Dec  2 17:22:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.4 ===
+
+	* configure.in: Up version to 1.1.4, interface age 0.
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-fontmap.c (pango_fc_do_finalize)
+	* pango/pangoft2-fontmap.c (pango_fc_do_finalize): Fix
+	leaks of fontmap->substitute_data. (#99850)
+
+	* pango/Makefile.am (INCLUDES): Fix accidental reference
+	to pango-script-table.h.
+
 Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-glyph-item.[ch] pango/pango-layout.h:
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 50a8df2c..2b7459b4 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,18 @@
+Mon Dec  2 17:22:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.4 ===
+
+	* configure.in: Up version to 1.1.4, interface age 0.
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-fontmap.c (pango_fc_do_finalize)
+	* pango/pangoft2-fontmap.c (pango_fc_do_finalize): Fix
+	leaks of fontmap->substitute_data. (#99850)
+
+	* pango/Makefile.am (INCLUDES): Fix accidental reference
+	to pango-script-table.h.
+
 Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-glyph-item.[ch] pango/pango-layout.h:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 50a8df2c..2b7459b4 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,18 @@
+Mon Dec  2 17:22:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.4 ===
+
+	* configure.in: Up version to 1.1.4, interface age 0.
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-fontmap.c (pango_fc_do_finalize)
+	* pango/pangoft2-fontmap.c (pango_fc_do_finalize): Fix
+	leaks of fontmap->substitute_data. (#99850)
+
+	* pango/Makefile.am (INCLUDES): Fix accidental reference
+	to pango-script-table.h.
+
 Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-glyph-item.[ch] pango/pango-layout.h:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 50a8df2c..2b7459b4 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,18 @@
+Mon Dec  2 17:22:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.4 ===
+
+	* configure.in: Up version to 1.1.4, interface age 0.
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-fontmap.c (pango_fc_do_finalize)
+	* pango/pangoft2-fontmap.c (pango_fc_do_finalize): Fix
+	leaks of fontmap->substitute_data. (#99850)
+
+	* pango/Makefile.am (INCLUDES): Fix accidental reference
+	to pango-script-table.h.
+
 Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-glyph-item.[ch] pango/pango-layout.h:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 50a8df2c..2b7459b4 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,18 @@
+Mon Dec  2 17:22:34 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.1.4 ===
+
+	* configure.in: Up version to 1.1.4, interface age 0.
+
+	* NEWS: Updated.
+
+	* pango/pangoxft-fontmap.c (pango_fc_do_finalize)
+	* pango/pangoft2-fontmap.c (pango_fc_do_finalize): Fix
+	leaks of fontmap->substitute_data. (#99850)
+
+	* pango/Makefile.am (INCLUDES): Fix accidental reference
+	to pango-script-table.h.
+
 Sun Nov 17 23:28:26 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-glyph-item.[ch] pango/pango-layout.h:
diff --git a/NEWS b/NEWS
index 15a33503..ba0ed824 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+Changes between 1.1.3 and 1.1.4
+
+* Fix the Arabic-words-broken-by-underlines problem by
+  stripping out non-shape affecting attributes then adding them
+  back after shaping.
+* Hangul shaper fixes [Changwoo Ryu, Jungshik Shin]
+* Handle compatability ideographs in basic-x shaper [Federic Zhang]
+* Rename function parameters to avoid shadowing system headres
+  [Soeren Sandmann]
+* Fix memory leak in Win32 backend [Tor Lillqvist]
+* Fix crasher problem with non-BMP characters [He Qiangqiang]
+* Implement pango_ft2_font_map_set_default_substitute() [Matthias Clasen]
+* Doc improvements [Matthias Clasen, Michael R. Walton, Jungshik Shin]
+* Misc bug and build fixes [Dagfinn I. Mannsåker, Tony Graham,
+  Dan Mills, Sebastian Wilhelmi]
+
 Changes between 1.1.2 and 1.1.3
 
 * Hangul module bug fixes and improvements [Changwoo Ryu, Jungshik Shin]
diff --git a/configure.in b/configure.in
index 1fa8edb3..ffc2e400 100644
--- a/configure.in
+++ b/configure.in
@@ -17,14 +17,14 @@ dnl set PANGO_BINARY_AGE _and_ PANGO_INTERFACE_AGE to 0.
 dnl The triplet 
 PANGO_MAJOR_VERSION=1
 PANGO_MINOR_VERSION=1
-PANGO_MICRO_VERSION=3
+PANGO_MICRO_VERSION=4
 PANGO_VERSION=$PANGO_MAJOR_VERSION.$PANGO_MINOR_VERSION.$PANGO_MICRO_VERSION
 
 dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2.
 PANGO_API_VERSION=1.0
 
 dnl Number of releases since we've added interfaces
-PANGO_INTERFACE_AGE=1
+PANGO_INTERFACE_AGE=0
 
 dnl Number of releases since we've broken binary compatibility.
 # PANGO_BINARY_AGE=0
diff --git a/pango/Makefile.am b/pango/Makefile.am
index cc7ef4ec..27183dd2 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -138,7 +138,6 @@ libpango_1_0_la_SOURCES =  \
 	pango-item.c	   \
 	pango-layout.c	   \
 	pango-markup.c	   \
-	pango-script-table.h   \
 	pango-tabs.c	   \
 	pango-utils.c	   \
 	reorder-items.c    \
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index 5edb890b..bcbdf438 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -326,6 +326,9 @@ _pango_ft2_font_map_get_library (PangoFontMap *fontmap)
 static void
 pango_fc_do_finalize (PangoFT2FontMap    *fontmap)
 {
+  if (fontmap->substitute_destroy)
+    fontmap->substitute_destroy (fontmap->substitute_data);
+
   FT_Done_FreeType (fontmap->library);
 }
 
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c
index 9e3f0ca5..e8dd78f0 100644
--- a/pango/pangoxft-fontmap.c
+++ b/pango/pangoxft-fontmap.c
@@ -357,6 +357,8 @@ pango_xft_get_context (Display *display,
 static void
 pango_fc_do_finalize (PangoXftFontMap *fontmap)
 {
+  if (fontmap->substitute_destroy)
+    fontmap->substitute_destroy (fontmap->substitute_data);
 }
 
 static void