diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc index 7f9ec40ff..964ce5835 100644 --- a/src/hb-graphite2.cc +++ b/src/hb-graphite2.cc @@ -295,6 +295,7 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED, if (feats) gr_featureval_destroy (feats); gr_seg_destroy (seg); buffer->len = 0; + buffer->clear_positions (); return true; } diff --git a/test/api/test-graphite2.c b/test/api/test-graphite2.c index a06bd9235..f4461cd3b 100644 --- a/test/api/test-graphite2.c +++ b/test/api/test-graphite2.c @@ -112,6 +112,87 @@ test_graphite2_inserted_glyph_masks (void) hb_font_destroy (font); } +/* Three glyphs, cmap for 'a' and 'b', and a Silf table with a single + * substitution rule that deletes the glyph of 'a'. */ +static const unsigned char deletes_a_font[] = { + 0x00,0x01,0x00,0x00,0x00,0x08,0x00,0x80,0x00,0x03,0x00,0x00, + 0x47,0x6C,0x61,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x8C, + 0x00,0x00,0x00,0x10,0x47,0x6C,0x6F,0x63,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x9C,0x00,0x00,0x00,0x10,0x53,0x69,0x6C,0x66, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xAC,0x00,0x00,0x00,0x94, + 0x63,0x6D,0x61,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x40, + 0x00,0x00,0x00,0x2C,0x68,0x65,0x61,0x64,0x00,0x00,0x00,0x00, + 0x00,0x00,0x01,0x6C,0x00,0x00,0x00,0x36,0x68,0x68,0x65,0x61, + 0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xA4,0x00,0x00,0x00,0x24, + 0x68,0x6D,0x74,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xC8, + 0x00,0x00,0x00,0x0C,0x6D,0x61,0x78,0x70,0x00,0x00,0x00,0x00, + 0x00,0x00,0x01,0xD4,0x00,0x00,0x00,0x20,0x00,0x01,0x00,0x00, + 0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00, + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x04,0x00,0x08, + 0x00,0x0C,0x00,0x10,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00, + 0x00,0x00,0x00,0x0C,0x00,0x02,0x00,0x00,0x00,0x00,0x01,0x00, + 0x01,0x01,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xFF,0xFF,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x88,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x08, + 0x00,0x0A,0x00,0x02,0x00,0x01,0x01,0x00,0x00,0x01,0x00,0x00, + 0x00,0x00,0x00,0x85,0x00,0x00,0x00,0x85,0x00,0x00,0x00,0x85, + 0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x01,0x00,0x01,0x00,0x01, + 0x00,0x01,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01, + 0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x03,0x00,0x01,0x00,0x20,0x19,0x31,0x00,0x00,0x00,0x01, + 0x00,0x03,0x00,0x01,0x00,0x00,0x00,0x0C,0x00,0x04,0x00,0x20, + 0x00,0x00,0x00,0x04,0x00,0x04,0x00,0x01,0x00,0x00,0x00,0x62, + 0xFF,0xFF,0x00,0x00,0x00,0x61,0xFF,0xFF,0xFF,0xA0,0x00,0x01, + 0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x5F,0x0F,0x3C,0xF5,0x00,0x00,0x03,0xE8, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x08,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x01,0x00,0x00,0x03,0x20,0xFF,0x38,0x00,0x00,0x01,0xF4, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03, + 0x01,0xF4,0x00,0x00,0x01,0xF4,0x00,0x00,0x01,0xF4,0x00,0x00, + 0x00,0x01,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +}; + +static void +test_graphite2_all_glyphs_deleted (void) +{ + const char *shapers[] = {"graphite2", NULL}; + hb_blob_t *blob; + hb_face_t *face; + hb_font_t *font; + hb_buffer_t *buffer; + + blob = hb_blob_create ((const char *) deletes_a_font, sizeof (deletes_a_font), + HB_MEMORY_MODE_READONLY, NULL, NULL); + face = hb_face_create (blob, 0); + hb_blob_destroy (blob); + font = hb_font_create (face); + hb_face_destroy (face); + + buffer = hb_buffer_create (); + hb_buffer_add_utf8 (buffer, "aba", -1, 0, -1); + hb_buffer_guess_segment_properties (buffer); + g_assert_true (hb_shape_full (font, buffer, NULL, 0, shapers)); + g_assert_cmpuint (hb_buffer_get_length (buffer), ==, 1); + g_assert_true (hb_buffer_has_positions (buffer)); + + hb_buffer_clear_contents (buffer); + hb_buffer_add_utf8 (buffer, "aaa", -1, 0, -1); + hb_buffer_guess_segment_properties (buffer); + g_assert_true (hb_shape_full (font, buffer, NULL, 0, shapers)); + g_assert_cmpuint (hb_buffer_get_length (buffer), ==, 0); + g_assert_true (hb_buffer_has_positions (buffer)); + + hb_buffer_destroy (buffer); + hb_font_destroy (font); +} + int main (int argc, char **argv) { @@ -119,6 +200,7 @@ main (int argc, char **argv) hb_test_add (test_graphite2_repeated_clusters); hb_test_add (test_graphite2_inserted_glyph_masks); + hb_test_add (test_graphite2_all_glyphs_deleted); return hb_test_run (); }