Index: modules/indic/indic-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/indic-fc.c,v
retrieving revision 1.13
diff -u -p -r1.13 indic-fc.c
--- modules/indic/indic-fc.c	15 Dec 2004 02:03:53 -0000	1.13
+++ modules/indic/indic-fc.c	16 Dec 2004 00:08:08 -0000
@@ -248,6 +248,7 @@ get_gpos_ruleset (FT_Face face, PangoInd
 
   return ruleset;
 }
+
 static void
 set_glyphs (PangoFont *font, FT_Face face, const gunichar *wcs, gulong *tags, glong n_glyphs, PangoOTBuffer *buffer)
 {
@@ -257,10 +258,14 @@ set_glyphs (PangoFont *font, FT_Face fac
 
   for (i = 0; i < n_glyphs; i += 1)
     {
-      pango_ot_buffer_add_glyph (buffer,
-				 FT_Get_Char_Index (face, wcs[i]),
-				 tags[i],
-				 i);
+      guint glyph;
+
+      if (ZERO_WIDTH_CHAR (wcs[i]))
+	glyph = 0;
+      else
+	glyph = FT_Get_Char_Index (face, wcs[i]);
+      
+      pango_ot_buffer_add_glyph (buffer, glyph, tags[i], i);
     }
 }
 
Index: modules/indic/indic-ot.h
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/indic-ot.h,v
retrieving revision 1.10
diff -u -p -r1.10 indic-ot.h
--- modules/indic/indic-ot.h	15 Dec 2004 02:03:53 -0000	1.10
+++ modules/indic/indic-ot.h	16 Dec 2004 00:08:08 -0000
@@ -175,6 +175,25 @@ enum indic_glyph_property_
 
 #define HAS_BELOW_BASE_FORM(charClass) ((charClass & CF_BELOW_BASE) != 0)
 
+/* This macro definition is shared with basic-common.h
+ *
+ * Zero Width characters:
+ *
+ *  200B  ZERO WIDTH SPACE
+ *  200C  ZERO WIDTH NON-JOINER
+ *  200D  ZERO WIDTH JOINER
+ *  200E  LEFT-TO-RIGHT MARK
+ *  200F  RIGHT-TO-LEFT MARK
+ *  202A  LEFT-TO-RIGHT EMBEDDING
+ *  202B  RIGHT-TO-LEFT EMBEDDING
+ *  202C  POP DIRECTIONAL FORMATTING
+ *  202D  LEFT-TO-RIGHT OVERRIDE
+ *  202E  RIGHT-TO-LEFT OVERRIDE
+ *  FEFF  ZERO WIDTH NO-BREAK SPACE
+ */
+#define ZERO_WIDTH_CHAR(wc) \
+   (((wc) >= 0x200B && (wc) <= 0x200F) || ((wc) >= 0x202A && (wc) <= 0x202E) || ((wc) == 0xFEFF))
+
 struct _IndicOTClassTable
 {
   gunichar	      firstChar;
