summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-12-01 21:22:19 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-12-01 21:22:19 +0000
commit8f6e390f2f8e4216e1337a830a51cbed6434a0de (patch)
treefbbb6ba9848e6f0a0c613ba3b0734632c1e8c631
parentc8473e49abf5557f55b5c095be4c15c52dd4aa9c (diff)
downloadpango-8f6e390f2f8e4216e1337a830a51cbed6434a0de.tar.gz
Red Hat Bug 213632: ZWJ (200d) and ZWNJ (200c) showing same output Patch
2006-12-01 Behdad Esfahbod <behdad@gnome.org> Red Hat Bug 213632: ZWJ (200d) and ZWNJ (200c) showing same output Patch from LingNing Zhang * modules/indic/indic-ot.c (indic_ot_reorder): Handle ZWNJ.
-rw-r--r--ChangeLog7
-rw-r--r--modules/indic/indic-ot.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0117183a..1e19706f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2006-12-01 Behdad Esfahbod <behdad@gnome.org>
+ Red Hat Bug 213632: ZWJ (200d) and ZWNJ (200c) showing same output
+ Patch from LingNing Zhang
+
+ * modules/indic/indic-ot.c (indic_ot_reorder): Handle ZWNJ.
+
+2006-12-01 Behdad Esfahbod <behdad@gnome.org>
+
* pango/pango-layout.c (pango_layout_run_get_width), (update_run),
(pango_layout_iter_copy), (pango_layout_iter_get_run_extents):
Don't cache run_logical_rect in PangoLayoutIter. Just cache run_width
diff --git a/modules/indic/indic-ot.c b/modules/indic/indic-ot.c
index a03e0141..3af5e119 100644
--- a/modules/indic/indic-ot.c
+++ b/modules/indic/indic-ot.c
@@ -410,6 +410,9 @@ glong indic_ot_reorder(const gunichar *chars, const glong *utf8_offsets, glong c
if (IS_VATTU(charClass) && supressVattu) {
tag = nukt_p;
}
+ else if ((i + 2 < baseConsonant) && (chars[i + 2] == C_SIGN_ZWNJ)) {
+ tag = nukt_p;
+ }
supressVattu = IS_VATTU(charClass);
} else if (IS_VIRAMA(charClass) && chars[i + 1] == C_SIGN_ZWNJ)