Replace fallback shaper with a call to pango_x_fallback_shape, this sets

Mon Nov 13 02:39:44 2000  Robert Brady  <robert@suse.co.uk>

	* pango/modules/hangul/hangul.c: Replace fallback shaper
	with a call to pango_x_fallback_shape, this sets the
	cluster array properly.
-------------------------------------------------------------------

9 files changed, 44 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index abec0efd..02cf93ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 13 02:39:44 2000  Robert Brady  <robert@suse.co.uk>
+
+	* pango/modules/hangul/hangul.c: Replace fallback shaper
+	with a call to pango_x_fallback_shape, this sets the
+	cluster array properly.
+
 Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (included_modules): Remove checks
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index abec0efd..02cf93ae 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,9 @@
+Mon Nov 13 02:39:44 2000  Robert Brady  <robert@suse.co.uk>
+
+	* pango/modules/hangul/hangul.c: Replace fallback shaper
+	with a call to pango_x_fallback_shape, this sets the
+	cluster array properly.
+
 Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (included_modules): Remove checks
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index abec0efd..02cf93ae 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Mon Nov 13 02:39:44 2000  Robert Brady  <robert@suse.co.uk>
+
+	* pango/modules/hangul/hangul.c: Replace fallback shaper
+	with a call to pango_x_fallback_shape, this sets the
+	cluster array properly.
+
 Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (included_modules): Remove checks
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index abec0efd..02cf93ae 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+Mon Nov 13 02:39:44 2000  Robert Brady  <robert@suse.co.uk>
+
+	* pango/modules/hangul/hangul.c: Replace fallback shaper
+	with a call to pango_x_fallback_shape, this sets the
+	cluster array properly.
+
 Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (included_modules): Remove checks
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index abec0efd..02cf93ae 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Mon Nov 13 02:39:44 2000  Robert Brady  <robert@suse.co.uk>
+
+	* pango/modules/hangul/hangul.c: Replace fallback shaper
+	with a call to pango_x_fallback_shape, this sets the
+	cluster array properly.
+
 Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (included_modules): Remove checks
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index abec0efd..02cf93ae 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Mon Nov 13 02:39:44 2000  Robert Brady  <robert@suse.co.uk>
+
+	* pango/modules/hangul/hangul.c: Replace fallback shaper
+	with a call to pango_x_fallback_shape, this sets the
+	cluster array properly.
+
 Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (included_modules): Remove checks
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index abec0efd..02cf93ae 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Mon Nov 13 02:39:44 2000  Robert Brady  <robert@suse.co.uk>
+
+	* pango/modules/hangul/hangul.c: Replace fallback shaper
+	with a call to pango_x_fallback_shape, this sets the
+	cluster array properly.
+
 Sun Nov 12 18:36:38 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (included_modules): Remove checks
diff --git a/modules/hangul/hangul-x.c b/modules/hangul/hangul-x.c
index 8df658ed..43a6827e 100644
--- a/modules/hangul/hangul-x.c
+++ b/modules/hangul/hangul-x.c
@@ -604,16 +604,8 @@ hangul_engine_shape (PangoFont        *font,
     if (!find_subfont (font, secondary_charset, G_N_ELEMENTS (secondary_charset), &subfont, &render_func))
       if (!find_subfont (font, fallback_charsets, G_N_ELEMENTS (fallback_charsets), &subfont, &render_func))
 	{
-	  PangoGlyph unknown_glyph = pango_x_get_unknown_glyph (font);
-	  
 	  n_chars = g_utf8_strlen (text, length);
-	  pango_glyph_string_set_size (glyphs, n_chars);
-
-	  for (i=0; i<n_chars; i++)
-	    set_glyph (glyphs, i, font,
-		       PANGO_X_GLYPH_SUBFONT (unknown_glyph), 
-		       PANGO_X_GLYPH_INDEX (unknown_glyph));
-
+	  pango_x_fallback_shape (font, glyphs, text, n_chars);
 	  return;
 	}
 
diff --git a/modules/hangul/hangul.c b/modules/hangul/hangul.c
index 8df658ed..43a6827e 100644
--- a/modules/hangul/hangul.c
+++ b/modules/hangul/hangul.c
@@ -604,16 +604,8 @@ hangul_engine_shape (PangoFont        *font,
     if (!find_subfont (font, secondary_charset, G_N_ELEMENTS (secondary_charset), &subfont, &render_func))
       if (!find_subfont (font, fallback_charsets, G_N_ELEMENTS (fallback_charsets), &subfont, &render_func))
 	{
-	  PangoGlyph unknown_glyph = pango_x_get_unknown_glyph (font);
-	  
 	  n_chars = g_utf8_strlen (text, length);
-	  pango_glyph_string_set_size (glyphs, n_chars);
-
-	  for (i=0; i<n_chars; i++)
-	    set_glyph (glyphs, i, font,
-		       PANGO_X_GLYPH_SUBFONT (unknown_glyph), 
-		       PANGO_X_GLYPH_INDEX (unknown_glyph));
-
+	  pango_x_fallback_shape (font, glyphs, text, n_chars);
 	  return;
 	}