walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[buffer] Consolidate glyph-flags implementation

This commit is contained in:
Behdad Esfahbod 2021-12-04 20:43:27 -08:00
parent f91ce56e08
commit d98a0fc88e
2 changed files with 62 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hb-buffer.cc
View File

@ -572,31 +572,6 @@ done:
skip_glyph (); skip_glyph ();
} }
void
hb_buffer_t::unsafe_to_break_impl (unsigned int start, unsigned int end, hb_mask_t mask)
{
unsigned cluster = _infos_find_min_cluster (info, start, end);
_infos_set_glyph_flags (info, start, end, cluster, mask);
}
void
hb_buffer_t::unsafe_to_break_from_outbuffer (unsigned int start, unsigned int end, hb_mask_t mask)
{
if (!have_output)
{
unsafe_to_break_impl (start, end);
return;
}
assert (start <= out_len);
assert (idx <= end);
unsigned cluster = _infos_find_min_cluster (info, idx, end);
cluster = _infos_find_min_cluster (out_info, start, out_len, cluster);
_infos_set_glyph_flags (out_info, start, out_len, cluster, mask);
_infos_set_glyph_flags (info, idx, end, cluster, mask);
}
void void
hb_buffer_t::guess_segment_properties () hb_buffer_t::guess_segment_properties ()
{ {

76
src/hb-buffer.hh
View File

@ -385,26 +385,74 @@ struct hb_buffer_t
/* Merge clusters for deleting current glyph, and skip it. */ /* Merge clusters for deleting current glyph, and skip it. */
HB_INTERNAL void delete_glyph (); HB_INTERNAL void delete_glyph ();
void unsafe_to_break (unsigned int start,
unsigned int end) void set_glyph_flags (unsigned start,
unsigned end,
hb_mask_t mask,
bool interior = false,
bool from_out_buffer = false)
{ {
if (end - start < 2) if (interior && !from_out_buffer && end - start < 2)
return; return;
unsafe_to_break_impl (start, end);
scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS;
if (!from_out_buffer || !have_output)
{
if (!interior)
{
for (unsigned i = start; i < end; i++)
info[i].mask |= mask;
}
else
{
unsigned cluster = _infos_find_min_cluster (info, start, end);
_infos_set_glyph_flags (info, start, end, cluster, mask);
}
}
else
{
assert (start <= out_len);
assert (idx <= end);
if (!interior)
{
for (unsigned i = start; i < out_len; i++)
out_info[i].mask |= mask;
for (unsigned i = idx; i < end; i++)
info[i].mask |= mask;
}
else
{
unsigned cluster = _infos_find_min_cluster (info, idx, end);
cluster = _infos_find_min_cluster (out_info, start, out_len, cluster);
_infos_set_glyph_flags (out_info, start, out_len, cluster, mask);
_infos_set_glyph_flags (info, idx, end, cluster, mask);
}
}
} }
void unsafe_to_concat (unsigned int start,
unsigned int end) void unsafe_to_break (unsigned int start, unsigned int end)
{ {
if (end - start < 2) set_glyph_flags (start, end, HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT,
return; true);
unsafe_to_break_impl (start, end, HB_GLYPH_FLAG_UNSAFE_TO_CONCAT); }
void unsafe_to_concat (unsigned int start, unsigned int end)
{
set_glyph_flags (start, end, HB_GLYPH_FLAG_UNSAFE_TO_CONCAT,
true);
}
void unsafe_to_break_from_outbuffer (unsigned int start, unsigned int end)
{
set_glyph_flags (start, end, HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT,
true, true);
} }
HB_INTERNAL void unsafe_to_break_impl (unsigned int start, unsigned int end,
hb_mask_t mask = HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT);
HB_INTERNAL void unsafe_to_break_from_outbuffer (unsigned int start, unsigned int end,
hb_mask_t mask = HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT);
void unsafe_to_concat_from_outbuffer (unsigned int start, unsigned int end) void unsafe_to_concat_from_outbuffer (unsigned int start, unsigned int end)
{ unsafe_to_break_from_outbuffer (start, end, HB_GLYPH_FLAG_UNSAFE_TO_CONCAT); } {
set_glyph_flags (start, end, HB_GLYPH_FLAG_UNSAFE_TO_CONCAT,
true, true);
}
/* Internal methods */ /* Internal methods */