Index: modules/arabic/arabic-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/arabic/arabic-fc.c,v
retrieving revision 1.16
diff -u -p -r1.16 arabic-fc.c
--- modules/arabic/arabic-fc.c	23 Jun 2004 20:33:34 -0000	1.16
+++ modules/arabic/arabic-fc.c	27 Jul 2004 11:13:42 -0000
@@ -315,9 +315,10 @@ arabic_engine_shape (PangoEngineShape *e
 	  /* 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;
 	  
