organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-06 14:05:05 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

[buffer] Hook up not-found-variation-selector-glyph

Browse source 
Fixes https://github.com/harfbuzz/harfbuzz/issues/4398
This commit is contained in:
Behdad Esfahbod 2023-12-15 10:24:03 -07:00
parent a003890e84
commit 287046f71a
8 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/harfbuzz-sections.txt
View file

@ -81,6 +81,8 @@ hb_buffer_set_invisible_glyph
hb_buffer_get_invisible_glyph
hb_buffer_set_not_found_glyph
hb_buffer_get_not_found_glyph
hb_buffer_set_not_found_variation_selector_glyph
hb_buffer_get_not_found_variation_selector_glyph
hb_buffer_set_replacement_codepoint
hb_buffer_get_replacement_codepoint
hb_buffer_set_random_state

6
src/hb-buffer.cc
View file

@ -1372,8 +1372,10 @@ hb_buffer_get_not_found_glyph (const hb_buffer_t *buffer)
* in the font during shaping.
*
* The not-found-variation-selector glyph defaults to #HB_CODEPOINT_INVALID,
* in which case it will be removed from the glyph string during shaping.
* This API allows for changing that and retaining the glyph.
* in which case an unresolved variation-selector will be removed from the glyph
* string during shaping. This API allows for changing that and retaining a glyph,
* such that the situation can be detected by the client and handled accordingly
* (e.g. by using a different font).
*
* XSince: REPLACEME
**/

5
src/hb-ot-layout.hh
View file

@ -311,6 +311,11 @@ _hb_glyph_info_is_default_ignorable (const hb_glyph_info_t *info)
return (info->unicode_props() & UPROPS_MASK_IGNORABLE) &&
!_hb_glyph_info_substituted (info);
}
static inline void
_hb_glyph_info_clear_default_ignorable (hb_glyph_info_t *info)
{
info->unicode_props() &= ~ UPROPS_MASK_IGNORABLE;
}
static inline bool
_hb_glyph_info_is_default_ignorable_and_not_hidden (const hb_glyph_info_t *info)
{

12
src/hb-ot-shape-normalize.cc
View file

@ -220,8 +220,16 @@ handle_variation_selector_cluster (const hb_ot_shape_normalize_context_t *c,
/* Just pass on the two characters separately, let GSUB do its magic. */
set_glyph (buffer->cur(), font);
(void) buffer->next_glyph ();
set_glyph (buffer->cur(), font);
(void) buffer->next_glyph ();
if (buffer->not_found_variation_selector != HB_CODEPOINT_INVALID)
{
_hb_glyph_info_clear_default_ignorable (&buffer->cur());
next_char (buffer, buffer->not_found_variation_selector);
}
else
{
set_glyph (buffer->cur(), font);
(void) buffer->next_glyph ();
}
}
/* Skip any further variation selectors. */
while (buffer->idx < end &&

BIN
test/shape/data/in-house/fonts/bbc24004e776f348a0f72287d24b0124867ee750.ttf Normal file
View file

Binary file not shown.

2
test/shape/data/in-house/meson.build
View file

@ -73,6 +73,8 @@ in_house_tests = [
'use-syllable.tests',
'use-vowel-letter-spoofing.tests',
'use.tests',
'use.tests',
'variation-selectors.tests',
'variations.tests',
'variations-rvrn.tests',
'vertical.tests',

2
test/shape/data/in-house/tests/variation-selectors.tests Normal file
View file

@ -0,0 +1,2 @@
../fonts/bbc24004e776f348a0f72287d24b0124867ee750.ttf;;U+0066,U+FE00,U+0069;[gid5=0+1134|gid1=0+0]
../fonts/bbc24004e776f348a0f72287d24b0124867ee750.ttf;--not-found-variation-selector-glyph=1000000;U+0066,U+FE00,U+0069;[gid2=0+711|gid1000000=0+0|gid3=2+497]

5
util/shape-options.hh
View file

@ -59,6 +59,7 @@ struct shape_options_t
0));
hb_buffer_set_invisible_glyph (buffer, invisible_glyph);
hb_buffer_set_not_found_glyph (buffer, not_found_glyph);
hb_buffer_set_not_found_variation_selector_glyph (buffer, not_found_variation_selector_glyph);
hb_buffer_set_cluster_level (buffer, cluster_level);
hb_buffer_guess_segment_properties (buffer);
}
@ -246,6 +247,7 @@ struct shape_options_t
hb_bool_t utf8_clusters = false;
hb_codepoint_t invisible_glyph = 0;
hb_codepoint_t not_found_glyph = 0;
hb_codepoint_t not_found_variation_selector_glyph = HB_CODEPOINT_INVALID;
hb_buffer_cluster_level_t cluster_level = HB_BUFFER_CLUSTER_LEVEL_DEFAULT;
hb_bool_t normalize_glyphs = false;
hb_bool_t glyphs = false;
@ -377,6 +379,9 @@ shape_options_t::add_options (option_parser_t *parser)
{"remove-default-ignorables",0, 0, G_OPTION_ARG_NONE, &this->remove_default_ignorables, "Remove Default-Ignorable characters", nullptr},
{"invisible-glyph", 0, 0, G_OPTION_ARG_INT, &this->invisible_glyph, "Glyph value to replace Default-Ignorables with", nullptr},
{"not-found-glyph", 0, 0, G_OPTION_ARG_INT, &this->not_found_glyph, "Glyph value to replace not-found characters with", nullptr},
{"not-found-variation-selector-glyph",
0, 0, G_OPTION_ARG_INT, &this->not_found_variation_selector_glyph,
"Glyph value to replace not-found variation-selector characters with", nullptr},
{"utf8-clusters", 0, 0, G_OPTION_ARG_NONE, &this->utf8_clusters, "Use UTF8 byte indices, not char indices", nullptr},
{"cluster-level", 0, 0, G_OPTION_ARG_INT, &this->cluster_level, "Cluster merging level (default: 0)", "0/1/2"},
{"normalize-glyphs",0, 0, G_OPTION_ARG_NONE, &this->normalize_glyphs, "Rearrange glyph clusters in nominal order", nullptr},