(lookup_gsub): Fix handling of Extension lookup.

(lookup_gpos): Support Extension lookup.
(gstring_subst): Fix previous change.

diff --git a/src/otfdrive.c b/src/otfdrive.c
index cd50897..b2122ce 100644 (file)
--- a/src/otfdrive.c
+++ b/src/otfdrive.c
@@ -68,7 +68,8 @@ gstring_subst (OTF_GlyphString *gstring, int from, int to, int flag,
   int non_ignored_idx;
 
   for (i = non_ignored_idx = to - 1; i >= from; i--)
-    if (flag & (1 << gstring->glyphs[i].GlyphClass))
+    if (! gstring->glyphs[i].glyph_id
+       || (flag & (1 << gstring->glyphs[i].GlyphClass)))
       {
        OTF_Glyph temp = gstring->glyphs[i];