diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2018-01-11 12:00:28 +0100 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2018-01-11 15:15:36 +0100 |
| commit | 62348f647f7b1604e008dbed46a54eff245fc106 (patch) | |
| tree | 369c2d859a19375c361f0250968531310dfeafc0 | |
| parent | fc405b7ca77088135cb7de11cb32c254b85272fd (diff) | |
[aat] Implement end-of-text in state machine
Passes MORX-10 test now.
| -rw-r--r-- | src/hb-aat-layout-morx-table.hh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index 520ae752..86e78b54 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -65,12 +65,14 @@ struct RearrangementSubtable hb_glyph_info_t *info = c->buffer->info; unsigned int count = c->buffer->len; - for (unsigned int i = 0; i < count; i++) + for (unsigned int i = 0; i <= count; i++) { if (!state) last_zero = i; - unsigned int klass = machine.get_class (info[i].codepoint, num_glyphs); + unsigned int klass = i < count ? + machine.get_class (info[i].codepoint, num_glyphs) : + 0 /* End of text */; const Entry<void> *entry = machine.get_entry (state, klass); if (unlikely (!entry)) break; @@ -83,7 +85,7 @@ struct RearrangementSubtable last_zero_before_start = last_zero; } - if (flags & MarkLast) + if (flags & MarkLast && i < count) end = i + 1; if ((flags & Verb) && start < end) @@ -120,7 +122,7 @@ struct RearrangementSubtable if (end - start >= l + r) { - c->buffer->unsafe_to_break (last_zero_before_start, i + 1); + c->buffer->unsafe_to_break (last_zero_before_start, MIN (i + 1, count)); c->buffer->merge_clusters (start, end); hb_glyph_info_t buf[4]; |