mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-19 14:01:10 +01:00
* [subset] Reuse sanitized tables cached on the face Use the face table list and SFINAE to borrow sanitized tables from the source face. Add borrow_sanitized_table() to suitable accelerators and reuse the COLR accelerator during closure. Keep fallback tables in the subset cache without taking references for each access. Cache full GSUB/GPOS sanitization separately from shaping's lazy sanitization. Inline their no-op blocklist hooks so the subset library can instantiate the accelerators. Add regressions for repeated subsets and GPOS data that passes lazy sanitization but fails full validation. Tested with meson test -C build: 299 passed, 1 skipped. Also ran reduced-feature syntax checks and ASan/UBSan with failing malloc. Assisted-by: Codex * [ot-layout] Remove unused GSUB/GPOS blocklist hooks Both hooks always return false. Remove the hooks and their dead conditional from accelerator initialization. Tested with meson test -C build: 299 passed, 1 skipped. Assisted-by: Codex * [subset] Borrow GDEF before shaping's blocklist Keep ownership of the unfiltered sanitized GDEF table in the face accelerator, alongside the potentially blocklisted shaping view. Subsetting can borrow it without repeating sanitization or taking references for each access. Allow static borrowing accessors to initialize accelerators inside libharfbuzz. GDEF uses this to keep its hidden blocklist implementation out of the subset library's initialization path. Other accelerators retain their instance accessors. Add a synthetic blocklisted-font regression checking that shaping still ignores GDEF while repeated subsets preserve its glyph classes without rereading it. Tested with meson test -C build: 299 passed, 1 skipped. Also ran GCC and reduced-feature syntax checks, plus ASan/UBSan with failing malloc. Assisted-by: Codex
181 lines
6.4 KiB
C
181 lines
6.4 KiB
C
/*
|
|
* Copyright © 2020 Adobe 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.
|
|
*
|
|
* Adobe Author(s): Michiharu Ariza
|
|
*/
|
|
|
|
#include "hb-test.h"
|
|
#include "hb-subset-test.h"
|
|
|
|
/* Unit tests for GPOS subsetting */
|
|
|
|
static void
|
|
test_subset_gpos_lookup_subtable (void)
|
|
{
|
|
hb_face_t *face_pwa = hb_test_open_font_file ("fonts/Roboto-Regular-gpos-.aw.ttf");
|
|
hb_face_t *face_wa = hb_test_open_font_file ("fonts/Roboto-Regular-gpos-aw.ttf");
|
|
|
|
hb_set_t *codepoints = hb_set_create ();
|
|
hb_face_t *face_pwa_subset;
|
|
hb_set_add (codepoints, 'a');
|
|
hb_set_add (codepoints, 'w');
|
|
|
|
hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
|
|
|
|
hb_set_del (hb_subset_input_set (input, HB_SUBSET_SETS_DROP_TABLE_TAG),
|
|
HB_TAG ('G', 'P', 'O', 'S'));
|
|
|
|
face_pwa_subset = hb_subset_test_create_subset (face_pwa, input);
|
|
hb_set_destroy (codepoints);
|
|
|
|
hb_subset_test_check (face_wa, face_pwa_subset, HB_TAG ('G','P','O','S'));
|
|
|
|
hb_face_destroy (face_pwa_subset);
|
|
hb_face_destroy (face_pwa);
|
|
hb_face_destroy (face_wa);
|
|
}
|
|
|
|
static void
|
|
test_subset_gpos_pairpos1_vf (void)
|
|
{
|
|
hb_face_t *face_wav = hb_test_open_font_file ("fonts/AdobeVFPrototype.WAV.gpos.otf");
|
|
hb_face_t *face_wa = hb_test_open_font_file ("fonts/AdobeVFPrototype.WA.gpos.otf");
|
|
|
|
hb_set_t *codepoints = hb_set_create ();
|
|
hb_face_t *face_wav_subset;
|
|
hb_set_add (codepoints, 'W');
|
|
hb_set_add (codepoints, 'A');
|
|
|
|
hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
|
|
|
|
hb_set_del (hb_subset_input_set (input, HB_SUBSET_SETS_DROP_TABLE_TAG),
|
|
HB_TAG ('G', 'P', 'O', 'S'));
|
|
|
|
face_wav_subset = hb_subset_test_create_subset (face_wav, input);
|
|
hb_set_destroy (codepoints);
|
|
|
|
hb_subset_test_check (face_wa, face_wav_subset, HB_TAG ('G','P','O','S'));
|
|
|
|
hb_face_destroy (face_wav_subset);
|
|
hb_face_destroy (face_wav);
|
|
hb_face_destroy (face_wa);
|
|
}
|
|
|
|
static void
|
|
test_subset_gpos_device_only_pairpos (void)
|
|
{
|
|
const char *filenames[] = {"fonts/device-only-pairpos1.ttf",
|
|
"fonts/device-only-pairpos2.ttf"};
|
|
for (unsigned f = 0; f < G_N_ELEMENTS (filenames); f++)
|
|
{
|
|
hb_face_t *face = hb_test_open_font_file (filenames[f]);
|
|
hb_subset_input_t *input = hb_subset_input_create_or_fail ();
|
|
hb_subset_input_set_flags (input, HB_SUBSET_FLAGS_RETAIN_GIDS);
|
|
hb_set_add_range (hb_subset_input_unicode_set (input), 'A', 'D');
|
|
g_assert_true (hb_subset_input_pin_axis_location (
|
|
input, face, HB_TAG ('T', 'E', 'S', 'T'), .25f));
|
|
hb_face_t *subset = hb_subset_or_fail (face, input);
|
|
g_assert_nonnull (subset);
|
|
const int remaining[] = {0, 8192, 16384};
|
|
for (unsigned j = 0; j < G_N_ELEMENTS (remaining); j++)
|
|
{
|
|
hb_font_t *fonts[] = {hb_font_create (face), hb_font_create (subset)};
|
|
const int coords[] = {4096, remaining[j]};
|
|
hb_font_set_var_coords_normalized (fonts[0], coords, 2);
|
|
hb_font_set_var_coords_normalized (fonts[1], &remaining[j], 1);
|
|
hb_buffer_t *buffers[] = {hb_buffer_create (), hb_buffer_create ()};
|
|
for (unsigned i = 0; i < 2; i++)
|
|
{
|
|
hb_buffer_add_utf8 (buffers[i], "ABCD", -1, 0, -1);
|
|
hb_buffer_guess_segment_properties (buffers[i]);
|
|
hb_shape (fonts[i], buffers[i], NULL, 0);
|
|
}
|
|
unsigned length, subset_length;
|
|
const hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffers[0], &length);
|
|
const hb_glyph_position_t *subset_pos = hb_buffer_get_glyph_positions (buffers[1], &subset_length);
|
|
g_assert_cmpuint (length, ==, 4);
|
|
g_assert_cmpuint (subset_length, ==, length);
|
|
for (unsigned i = 0; i < length; i++)
|
|
{
|
|
g_assert_cmpint (subset_pos[i].x_advance, ==, pos[i].x_advance);
|
|
g_assert_cmpint (subset_pos[i].x_offset, ==, pos[i].x_offset);
|
|
}
|
|
for (unsigned i = 0; i < 2; i++)
|
|
{
|
|
hb_buffer_destroy (buffers[i]);
|
|
hb_font_destroy (fonts[i]);
|
|
}
|
|
}
|
|
hb_face_destroy (subset);
|
|
hb_subset_input_destroy (input);
|
|
hb_face_destroy (face);
|
|
}
|
|
}
|
|
|
|
#ifndef HB_NO_OT_LAYOUT
|
|
static void
|
|
test_subset_gpos_full_sanitization (void)
|
|
{
|
|
hb_face_t *source = hb_test_open_font_file ("fonts/device-only-pairpos1.ttf");
|
|
hb_face_t *face = hb_face_builder_create ();
|
|
hb_blob_t *gpos = hb_face_reference_table (source, HB_TAG ('G','P','O','S'));
|
|
/* Truncate the final Device table. Lazy shaping sanitization skips it. */
|
|
hb_blob_t *truncated = hb_blob_create_sub_blob (gpos, 0, hb_blob_get_length (gpos) - 1);
|
|
g_assert_true (hb_face_builder_add_table (face, HB_TAG ('G','P','O','S'), truncated));
|
|
hb_blob_t *maxp = hb_face_reference_table (source, HB_TAG ('m','a','x','p'));
|
|
g_assert_true (hb_face_builder_add_table (face, HB_TAG ('m','a','x','p'), maxp));
|
|
hb_blob_destroy (maxp);
|
|
hb_blob_destroy (truncated);
|
|
hb_blob_destroy (gpos);
|
|
|
|
g_assert_true (hb_ot_layout_has_positioning (face));
|
|
hb_subset_input_t *input = hb_subset_input_create_or_fail ();
|
|
hb_set_invert (hb_subset_input_glyph_set (input));
|
|
for (unsigned i = 0; i < 2; i++)
|
|
{
|
|
hb_face_t *subset = hb_subset_or_fail (face, input);
|
|
g_assert_null (subset);
|
|
g_assert_true (hb_ot_layout_has_positioning (face));
|
|
}
|
|
|
|
hb_subset_input_destroy (input);
|
|
hb_face_destroy (face);
|
|
hb_face_destroy (source);
|
|
}
|
|
#endif
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
hb_test_init (&argc, &argv);
|
|
|
|
hb_test_add (test_subset_gpos_lookup_subtable);
|
|
hb_test_add (test_subset_gpos_pairpos1_vf);
|
|
hb_test_add (test_subset_gpos_device_only_pairpos);
|
|
#ifndef HB_NO_OT_LAYOUT
|
|
hb_test_add (test_subset_gpos_full_sanitization);
|
|
#endif
|
|
|
|
return hb_test_run ();
|
|
}
|