diff --git a/src/hb-subset-input.cc b/src/hb-subset-input.cc index d92f33ffe..df5333bf9 100644 --- a/src/hb-subset-input.cc +++ b/src/hb-subset-input.cc @@ -77,8 +77,6 @@ hb_subset_input_create_or_fail () HB_TAG ('G', 'l', 'o', 'c'), HB_TAG ('S', 'i', 'l', 'f'), HB_TAG ('S', 'i', 'l', 'l'), - // Colour - HB_TAG ('s', 'b', 'i', 'x') }; input->drop_tables->add_array (default_drop_tables, ARRAY_LENGTH (default_drop_tables)); diff --git a/test/api/Makefile.am b/test/api/Makefile.am index 0daced5be..08df2a50d 100644 --- a/test/api/Makefile.am +++ b/test/api/Makefile.am @@ -55,6 +55,7 @@ TEST_PROGS = \ test-subset-gvar \ test-subset-hvar \ test-subset-vvar \ + test-subset-sbix \ test-unicode \ test-version \ test-subset-nameids \ @@ -74,6 +75,7 @@ test_subset_cff2_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la test_subset_gvar_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la test_subset_hvar_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la test_subset_vvar_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la +test_subset_sbix_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la test_subset_nameids_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-subset.la test_unicode_CPPFLAGS = \ diff --git a/test/api/fonts/sbix.ttf b/test/api/fonts/sbix.ttf new file mode 100644 index 000000000..575af900a Binary files /dev/null and b/test/api/fonts/sbix.ttf differ diff --git a/test/api/fonts/sbix_X.ttf b/test/api/fonts/sbix_X.ttf new file mode 100644 index 000000000..6960f8f98 Binary files /dev/null and b/test/api/fonts/sbix_X.ttf differ diff --git a/test/api/test-subset-sbix.c b/test/api/test-subset-sbix.c new file mode 100644 index 000000000..16ac66632 --- /dev/null +++ b/test/api/test-subset-sbix.c @@ -0,0 +1,81 @@ +/* + * Copyright © 2020 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Calder Kitagawa + */ + +#include "hb-test.h" +#include "hb-subset-test.h" + +/* Unit tests for sbix subsetting */ + +static void +test_subset_sbix_noop (void) +{ + hb_face_t *face_XY = hb_test_open_font_file ("fonts/sbix.ttf"); + + hb_set_t *codepoints = hb_set_create (); + hb_face_t *face_XY_subset; + hb_set_add (codepoints, 88); + hb_set_add (codepoints, 89); + face_XY_subset = hb_subset_test_create_subset (face_XY, hb_subset_test_create_input (codepoints)); + hb_set_destroy (codepoints); + + hb_subset_test_check (face_XY, face_XY_subset, HB_TAG ('s','b','i','x')); + + hb_face_destroy (face_XY_subset); + hb_face_destroy (face_XY); +} + +static void +test_subset_sbix_keep_one (void) +{ + hb_face_t *face_XY = hb_test_open_font_file ("fonts/sbix.ttf"); + hb_face_t *face_X = hb_test_open_font_file ("fonts/sbix_X.ttf"); + + hb_set_t *codepoints = hb_set_create (); + hb_face_t *face_X_subset; + hb_set_add (codepoints, 88); + face_X_subset = hb_subset_test_create_subset (face_XY, hb_subset_test_create_input (codepoints)); + hb_set_destroy (codepoints); + + hb_subset_test_check (face_X, face_X_subset, HB_TAG ('s','b','i','x')); + + hb_face_destroy (face_X_subset); + hb_face_destroy (face_XY); + hb_face_destroy (face_X); +} + +// TODO: add a test that doesn't use contiguous codepoints. +// TODO: add a test that keeps no codepoints. + +int +main (int argc, char **argv) +{ + hb_test_init (&argc, &argv); + + hb_test_add (test_subset_sbix_noop); + hb_test_add (test_subset_sbix_keep_one); + + return hb_test_run(); +} diff --git a/test/subset/data/expected/sbix/sbix.default.58,59.ttf b/test/subset/data/expected/sbix/sbix.default.58,59.ttf index 4c1da611b..d99bfc97a 100644 Binary files a/test/subset/data/expected/sbix/sbix.default.58,59.ttf and b/test/subset/data/expected/sbix/sbix.default.58,59.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.default.58.ttf b/test/subset/data/expected/sbix/sbix.default.58.ttf index ed75ed46c..6960f8f98 100644 Binary files a/test/subset/data/expected/sbix/sbix.default.58.ttf and b/test/subset/data/expected/sbix/sbix.default.58.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.default.59.ttf b/test/subset/data/expected/sbix/sbix.default.59.ttf index d5df5ae2b..1a4ac9725 100644 Binary files a/test/subset/data/expected/sbix/sbix.default.59.ttf and b/test/subset/data/expected/sbix/sbix.default.59.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58,59.ttf b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58,59.ttf index 02a9c1ce7..96f03e63d 100644 Binary files a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58,59.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58,59.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58.ttf b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58.ttf index 38a688c25..d88e416df 100644 Binary files a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.59.ttf b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.59.ttf index ff5838d3b..0de61a856 100644 Binary files a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.59.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.59.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.drop-hints.58,59.ttf b/test/subset/data/expected/sbix/sbix.drop-hints.58,59.ttf index 02a9c1ce7..96f03e63d 100644 Binary files a/test/subset/data/expected/sbix/sbix.drop-hints.58,59.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints.58,59.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.drop-hints.58.ttf b/test/subset/data/expected/sbix/sbix.drop-hints.58.ttf index 38a688c25..d88e416df 100644 Binary files a/test/subset/data/expected/sbix/sbix.drop-hints.58.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints.58.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.drop-hints.59.ttf b/test/subset/data/expected/sbix/sbix.drop-hints.59.ttf index 6b7cedf18..a3c09e99a 100644 Binary files a/test/subset/data/expected/sbix/sbix.drop-hints.59.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints.59.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.retain-gids.58,59.ttf b/test/subset/data/expected/sbix/sbix.retain-gids.58,59.ttf index 4c1da611b..d99bfc97a 100644 Binary files a/test/subset/data/expected/sbix/sbix.retain-gids.58,59.ttf and b/test/subset/data/expected/sbix/sbix.retain-gids.58,59.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.retain-gids.58.ttf b/test/subset/data/expected/sbix/sbix.retain-gids.58.ttf index ed75ed46c..6960f8f98 100644 Binary files a/test/subset/data/expected/sbix/sbix.retain-gids.58.ttf and b/test/subset/data/expected/sbix/sbix.retain-gids.58.ttf differ diff --git a/test/subset/data/expected/sbix/sbix.retain-gids.59.ttf b/test/subset/data/expected/sbix/sbix.retain-gids.59.ttf index f6957c367..21d014bd1 100644 Binary files a/test/subset/data/expected/sbix/sbix.retain-gids.59.ttf and b/test/subset/data/expected/sbix/sbix.retain-gids.59.ttf differ diff --git a/test/subset/data/fonts/sbix.ttf b/test/subset/data/fonts/sbix.ttf index e3da30a2e..575af900a 100644 Binary files a/test/subset/data/fonts/sbix.ttf and b/test/subset/data/fonts/sbix.ttf differ