Pango: Really fix the check for zero-width chars.

The value of 0x0FFFFFFF is assigned to a PangoGlyph if the current
character has zero width, so skip the glyph lookup stage for these
characters.

Note that 0xFFFFFFFF is used for invalid characters, so the error
messages for these cases are accurate.

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index f4a4922f240d7e98c224d31e5eb4979430cc85e1..1275e91dfb50459b6b6030da7df19d9d30545d65 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -172,6 +172,13 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item,
       PangoGlyph pg = pgi->glyph;
       PangoGlyphGeometry ggeo = pgi->geometry;
 
+      /*
+       Zero-width characters are valid Unicode characters,
+       but glyph lookups need to be skipped.
+      */
+      if (!(pg ^ PANGO_GLYPH_EMPTY))
+       continue;
+
       glyph_name[0] = '\0';
       if (has_glyph_names)
        {