-/* Return nonzero if OTF_Glyph *G should be ignored according to
- LookupFlag FLAG. */
-#define IGNORED_GLYPH(g, flag) \
- ((g)->glyph_id == 0 \
- || ((flag) & (1 << (g)->GlyphClass)) \
- || (((flag) & OTF_MarkAttachmentType) \
- && (g)->GlyphClass == 3 \
- && ((flag) >> 8) != (g)->MarkAttachClass))
+/* Return nonzero (-1 if ID is zero, 1 otherwise) if OTF_Glyph *G
+ should be ignored according to LookupFlag FLAG. */
+#define IGNORED_GLYPH(g, flag) \
+ ((g)->glyph_id == 0 ? -1 \
+ : (((flag) & (1 << (g)->GlyphClass)) \
+ || (((flag) & OTF_MarkAttachmentType) \
+ && (g)->GlyphClass == OTF_GlyphClassMark \
+ && ((flag) >> 8) != (g)->MarkAttachClass)))