Merge remote-tracking branch 'upstream/master'
diff --git a/test/api/fonts/NotoColorEmoji.cmap.38,AE,2049.ttf b/test/api/fonts/NotoColorEmoji.cmap.38,AE,2049.ttf new file mode 100644 index 0000000..94efc6a --- /dev/null +++ b/test/api/fonts/NotoColorEmoji.cmap.38,AE,2049.ttf Binary files differ
diff --git a/test/api/fonts/NotoColorEmoji.cmap.ttf b/test/api/fonts/NotoColorEmoji.cmap.ttf new file mode 100644 index 0000000..c1dd869 --- /dev/null +++ b/test/api/fonts/NotoColorEmoji.cmap.ttf Binary files differ
diff --git a/test/api/test-subset-cmap.c b/test/api/test-subset-cmap.c index a6c24fc..e16400e 100644 --- a/test/api/test-subset-cmap.c +++ b/test/api/test-subset-cmap.c
@@ -133,6 +133,48 @@ hb_face_destroy (face_empty); } +static void +test_subset_cmap_noto_color_emoji_noop (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/NotoColorEmoji.cmap.ttf"); + + hb_set_t *codepoints = hb_set_create (); + hb_face_t *face_subset; + hb_set_add (codepoints, 0x38); + hb_set_add (codepoints, 0x39); + hb_set_add (codepoints, 0xAE); + hb_set_add (codepoints, 0x2049); + hb_set_add (codepoints, 0x20E3); + face_subset = hb_subset_test_create_subset (face, hb_subset_test_create_input (codepoints)); + hb_set_destroy (codepoints); + + hb_subset_test_check (face, face_subset, HB_TAG ('c','m','a','p')); + + hb_face_destroy (face_subset); + hb_face_destroy (face); +} + +static void +test_subset_cmap_noto_color_emoji_non_consecutive_glyphs (void) +{ + hb_face_t *face = hb_test_open_font_file ("fonts/NotoColorEmoji.cmap.ttf"); + hb_face_t *face_expected = hb_test_open_font_file ("fonts/NotoColorEmoji.cmap.38,AE,2049.ttf"); + + hb_set_t *codepoints = hb_set_create (); + hb_face_t *face_subset; + hb_set_add (codepoints, 0x38); + hb_set_add (codepoints, 0xAE); + hb_set_add (codepoints, 0x2049); + face_subset = hb_subset_test_create_subset (face, hb_subset_test_create_input (codepoints)); + hb_set_destroy (codepoints); + + hb_subset_test_check (face_expected, face_subset, HB_TAG ('c','m','a','p')); + + hb_face_destroy (face_subset); + hb_face_destroy (face_expected); + hb_face_destroy (face); +} + // TODO(rsheeter) test cmap to no codepoints int @@ -145,6 +187,8 @@ hb_test_add (test_subset_cmap_non_consecutive_glyphs); hb_test_add (test_subset_cmap4_no_exceeding_maximum_codepoint); hb_test_add (test_subset_cmap_empty_tables); + hb_test_add (test_subset_cmap_noto_color_emoji_noop); + hb_test_add (test_subset_cmap_noto_color_emoji_non_consecutive_glyphs); return hb_test_run(); }
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E02,4E03.otf new file mode 100644 index 0000000..460e81b --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E02,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E03.otf new file mode 100644 index 0000000..f6df4cf --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E05,4E07.otf new file mode 100644 index 0000000..5d15cd7 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E05,4E07.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E02,4E03,4E08.otf new file mode 100644 index 0000000..71bc4d6 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.4E02,4E03,4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E02.otf new file mode 100644 index 0000000..f28bd1d --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.4E02.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E03.otf new file mode 100644 index 0000000..d4401c7 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E05,4E07,4E08,4E09.otf new file mode 100644 index 0000000..65c74c4 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.4E05,4E07,4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E08,4E09.otf new file mode 100644 index 0000000..9794277 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E08.otf new file mode 100644 index 0000000..dea9124 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.retain-all-codepoint.otf new file mode 100644 index 0000000..12365f4 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.default.retain-all-codepoint.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E02,4E03.otf new file mode 100644 index 0000000..f7679f5 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E02,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E03.otf new file mode 100644 index 0000000..327f83f --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E05,4E07.otf new file mode 100644 index 0000000..a3289fd --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E05,4E07.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02,4E03,4E08.otf new file mode 100644 index 0000000..d0ba860 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02,4E03,4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02.otf new file mode 100644 index 0000000..9707490 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E03.otf new file mode 100644 index 0000000..f5de519 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf new file mode 100644 index 0000000..9203411 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08,4E09.otf new file mode 100644 index 0000000..d7b13af --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08.otf new file mode 100644 index 0000000..ae141a6 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.retain-all-codepoint.otf new file mode 100644 index 0000000..646ed6f --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.retain-all-codepoint.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E02,4E03.otf new file mode 100644 index 0000000..0493452 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E02,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E03.otf new file mode 100644 index 0000000..2322e5d --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E05,4E07.otf new file mode 100644 index 0000000..6b9edac --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E05,4E07.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02,4E03,4E08.otf new file mode 100644 index 0000000..9f243b8 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02,4E03,4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02.otf new file mode 100644 index 0000000..8954cd7 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E03.otf new file mode 100644 index 0000000..e623928 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E05,4E07,4E08,4E09.otf new file mode 100644 index 0000000..51237ad --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E05,4E07,4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08,4E09.otf new file mode 100644 index 0000000..e219c39 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08.otf new file mode 100644 index 0000000..9fc0bda --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.retain-all-codepoint.otf new file mode 100644 index 0000000..02232ea --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.retain-all-codepoint.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E02,4E03.otf new file mode 100644 index 0000000..021c980 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E02,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E03.otf new file mode 100644 index 0000000..cf3a5b3 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E05,4E07.otf new file mode 100644 index 0000000..7c537c1 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E05,4E07.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02,4E03,4E08.otf new file mode 100644 index 0000000..f24488b --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02,4E03,4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02.otf new file mode 100644 index 0000000..8d9e65a --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E03.otf new file mode 100644 index 0000000..f2f5ba0 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E05,4E07,4E08,4E09.otf new file mode 100644 index 0000000..aef4bd3 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E05,4E07,4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08,4E09.otf new file mode 100644 index 0000000..f24ad1f --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08.otf new file mode 100644 index 0000000..00c466f --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.retain-all-codepoint.otf new file mode 100644 index 0000000..86fe67b --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.retain-all-codepoint.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E02,4E03.otf new file mode 100644 index 0000000..0bc930a --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E02,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E03.otf new file mode 100644 index 0000000..9746b45 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E05,4E07.otf new file mode 100644 index 0000000..2d378d8 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E05,4E07.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02,4E03,4E08.otf new file mode 100644 index 0000000..42ada2e --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02,4E03,4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02.otf new file mode 100644 index 0000000..7e4cf58 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E03.otf new file mode 100644 index 0000000..846fee5 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E03.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E05,4E07,4E08,4E09.otf new file mode 100644 index 0000000..018805c --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E05,4E07,4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08,4E09.otf new file mode 100644 index 0000000..1945b0b --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08,4E09.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08.otf new file mode 100644 index 0000000..f45fda1 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08.otf Binary files differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.retain-all-codepoint.otf new file mode 100644 index 0000000..ac622b6 --- /dev/null +++ b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.retain-all-codepoint.otf Binary files differ
diff --git a/test/subset/data/fonts/cmap14_font2.otf b/test/subset/data/fonts/cmap14_font2.otf new file mode 100644 index 0000000..4a7da80 --- /dev/null +++ b/test/subset/data/fonts/cmap14_font2.otf Binary files differ
diff --git a/test/subset/data/tests/cmap14.tests b/test/subset/data/tests/cmap14.tests index 6575870..abb22cf 100644 --- a/test/subset/data/tests/cmap14.tests +++ b/test/subset/data/tests/cmap14.tests
@@ -1,5 +1,6 @@ FONTS: cmap14_font1.otf +cmap14_font2.otf PROFILES: default.txt