summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-12-01 21:22:35 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-12-01 21:22:35 +0000
commit7d016a12a43bdb6ae82c94efa7812ad04b3e4a0a (patch)
tree07c10a7f34be2c1c1c5e7549db532c07037b635e
parent4827da2e70b12b7316874ee947745b1247239880 (diff)
downloadpango-7d016a12a43bdb6ae82c94efa7812ad04b3e4a0a.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 12ce4275..66ebea2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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-11-28 Behdad Esfahbod <behdad@gnome.org>
* pango/pangocairo-font.c (_pango_cairo_font_install),
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)