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

Whitespace

This commit is contained in:
Behdad Esfahbod 2018-10-09 14:38:23 -04:00
parent 30c114ffec
commit 8008bca83b
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-font.hh
View File

@ -213,7 +213,7 @@ struct hb_font_t
unicode, glyph, unicode, glyph,
klass->user_data.nominal_glyph); klass->user_data.nominal_glyph);
} }
inline unsigned int get_nominal_glyphs ( unsigned int count, inline unsigned int get_nominal_glyphs (unsigned int count,
const hb_codepoint_t *first_unicode, const hb_codepoint_t *first_unicode,
unsigned int unicode_stride, unsigned int unicode_stride,
hb_codepoint_t *first_glyph, hb_codepoint_t *first_glyph,

52
src/hb-ot-shape-normalize.cc
View File

@ -320,40 +320,44 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
/* First round, decompose */ /* First round, decompose */
bool all_simple = true; bool all_simple = true;
buffer->clear_output ();
count = buffer->len;
buffer->idx = 0;
do
{ {
unsigned int end; buffer->clear_output ();
for (end = buffer->idx + 1; end < count; end++) count = buffer->len;
if (unlikely (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[end])))) buffer->idx = 0;
break; do
{
unsigned int end;
for (end = buffer->idx + 1; end < count; end++)
if (unlikely (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[end]))))
break;
if (end < count) if (end < count)
end--; /* Leave one base for the marks to cluster with. */ end--; /* Leave one base for the marks to cluster with. */
/* From idx to end are simple clusters. */ /* From idx to end are simple clusters. */
while (buffer->idx < end && buffer->successful) while (buffer->idx < end && buffer->successful)
decompose_current_character (&c, might_short_circuit); decompose_current_character (&c, might_short_circuit);
if (buffer->idx == count || !buffer->successful) if (buffer->idx == count || !buffer->successful)
break; break;
all_simple = false; all_simple = false;
/* Find all the marks now. */ /* Find all the marks now. */
for (end = buffer->idx + 1; end < count; end++) for (end = buffer->idx + 1; end < count; end++)
if (!HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[end]))) if (!HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[end])))
break; break;
/* idx to end is one non-simple cluster. */ /* idx to end is one non-simple cluster. */
decompose_multi_char_cluster (&c, end, always_short_circuit); decompose_multi_char_cluster (&c, end, always_short_circuit);
}
while (buffer->idx < count && buffer->successful);
buffer->swap_buffers ();
} }
while (buffer->idx < count && buffer->successful);
buffer->swap_buffers ();
/* Second round, reorder (inplace) */ /* Second round, reorder (inplace) */
if (!all_simple) if (!all_simple)
{ {
count = buffer->len; count = buffer->len;