summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@src.gnome.org>2004-07-27 18:09:39 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2004-07-27 18:09:39 +0000
commit09b3cdc09541485f8938e26b6863df825f305047 (patch)
treea8e17198f628bb7f415f601c7d03406aa091acef
parent6cb208b12e181275274bb87d736db658100e74f3 (diff)
downloadpango-09b3cdc09541485f8938e26b6863df825f305047.tar.gz
Don't substitute FARSI YEH with ARABIC YEH if the font does not have any
* modules/arabic/arabic-fc.c: Don't substitute FARSI YEH with ARABIC YEH if the font does not have any ARABIC YEH.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--modules/arabic/arabic-fc.c5
5 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0036441b..f4a66692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 27 14:07:44 2004 Behdad Esfahbod <pango@behdad.org>
+
+ * modules/arabic/arabic-fc.c: Don't substitute FARSI YEH
+ with ARABIC YEH if the font does not have any ARABIC YEH.
+
Tue Jul 27 12:38:05 2004 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxopen.[ch] pango/opentype/ftxgsub.c
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 0036441b..f4a66692 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Tue Jul 27 14:07:44 2004 Behdad Esfahbod <pango@behdad.org>
+
+ * modules/arabic/arabic-fc.c: Don't substitute FARSI YEH
+ with ARABIC YEH if the font does not have any ARABIC YEH.
+
Tue Jul 27 12:38:05 2004 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxopen.[ch] pango/opentype/ftxgsub.c
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 0036441b..f4a66692 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Tue Jul 27 14:07:44 2004 Behdad Esfahbod <pango@behdad.org>
+
+ * modules/arabic/arabic-fc.c: Don't substitute FARSI YEH
+ with ARABIC YEH if the font does not have any ARABIC YEH.
+
Tue Jul 27 12:38:05 2004 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxopen.[ch] pango/opentype/ftxgsub.c
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 0036441b..f4a66692 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Tue Jul 27 14:07:44 2004 Behdad Esfahbod <pango@behdad.org>
+
+ * modules/arabic/arabic-fc.c: Don't substitute FARSI YEH
+ with ARABIC YEH if the font does not have any ARABIC YEH.
+
Tue Jul 27 12:38:05 2004 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxopen.[ch] pango/opentype/ftxgsub.c
diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index 01841c33..e037a609 100644
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -315,9 +315,10 @@ arabic_engine_shape (PangoEngineShape *engine,
/* Hack - Microsoft fonts are strange and don't contain the
* correct rules to shape ARABIC LETTER FARSI YEH in
* medial/initial position. It looks identical to ARABIC LETTER
- * YEH in these positions, so we substitute
+ * YEH in these positions, so we substitute if the font contains
+ * ARABIC LETTER YEH
*/
- if (wc == 0x6cc && ruleset &&
+ if (wc == 0x6cc && ruleset && pango_fc_font_get_glyph (fc_font, 0x64a) &&
((properties[i] & (initial | medial)) != (initial | medial)))
wc = 0x64a;