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

[buffer] Add HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_KASHIDA

This commit is contained in:
Behdad Esfahbod 2022-07-30 10:10:21 -06:00
parent 915e12ccbb
commit d277addb2f
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-buffer.h
View File

@ -389,8 +389,9 @@ typedef enum { /*< flags >*/
HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE = 0x00000010u, HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE = 0x00000010u,
HB_BUFFER_FLAG_VERIFY = 0x00000020u, HB_BUFFER_FLAG_VERIFY = 0x00000020u,
HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT = 0x00000040u, HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT = 0x00000040u,
HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_KASHIDA = 0x00000070u,
HB_BUFFER_FLAG_DEFINED = 0x0000007Fu HB_BUFFER_FLAG_DEFINED = 0x000000FFu
} hb_buffer_flags_t; } hb_buffer_flags_t;
HB_EXTERN void HB_EXTERN void

5
src/hb-buffer.hh
View File

@ -464,6 +464,11 @@ struct hb_buffer_t
} }
void safe_to_insert_kashida (unsigned int start = 0, unsigned int end = -1) void safe_to_insert_kashida (unsigned int start = 0, unsigned int end = -1)
{ {
if ((flags & HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_KASHIDA) == 0)
{
unsafe_to_break (start, end);
return;
}
_set_glyph_flags (HB_GLYPH_FLAG_SAFE_TO_INSERT_KASHIDA, _set_glyph_flags (HB_GLYPH_FLAG_SAFE_TO_INSERT_KASHIDA,
start, end, start, end,
true); true);

13
src/hb-ot-shape.cc
View File

@ -1141,6 +1141,16 @@ hb_propagate_flags (hb_buffer_t *buffer)
if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS)) if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS))
return; return;
/* If we are producing SAFE_TO_INSERT_KASHIDA, then do two things:
*
* - If the places that the Arabic shaper marked as SAFE_TO_INSERT_KASHIDA,
* are UNSAFE_TO_BREAK, then clear the SAFE_TO_INSERT_KASHIDA,
* - Any place that is SAFE_TO_INSERT_KASHIDA, is also now UNSAFE_TO_BREAK.
*
* We couldn't make this interaction earlier. It has to be done here.
*/
bool flip_kashida = buffer->flags & HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_KASHIDA;
hb_glyph_info_t *info = buffer->info; hb_glyph_info_t *info = buffer->info;
foreach_cluster (buffer, start, end) foreach_cluster (buffer, start, end)
@ -1149,10 +1159,13 @@ hb_propagate_flags (hb_buffer_t *buffer)
for (unsigned int i = start; i < end; i++) for (unsigned int i = start; i < end; i++)
mask |= info[i].mask & HB_GLYPH_FLAG_DEFINED; mask |= info[i].mask & HB_GLYPH_FLAG_DEFINED;
if (flip_kashida)
{
if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK) if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
mask &= ~HB_GLYPH_FLAG_SAFE_TO_INSERT_KASHIDA; mask &= ~HB_GLYPH_FLAG_SAFE_TO_INSERT_KASHIDA;
if (mask & HB_GLYPH_FLAG_SAFE_TO_INSERT_KASHIDA) if (mask & HB_GLYPH_FLAG_SAFE_TO_INSERT_KASHIDA)
mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT; mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT;
}
if (mask) if (mask)
for (unsigned int i = start; i < end; i++) for (unsigned int i = start; i < end; i++)