From 94644d7ea4cf217e4d6c6ff57d65e1e20866ea6d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 11 Jan 2018 11:49:07 +0100 Subject: [PATCH] [aat] Generate finegrained unsafe-to-break in state-machine! Neato. --- src/hb-aat-layout-morx-table.hh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index cbc69d26e..8c62b1747 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -57,16 +57,19 @@ struct RearrangementSubtable unsigned int num_glyphs = c->face->get_num_glyphs (); unsigned int state = 0; + unsigned int last_zero = 0; + unsigned int last_zero_before_start = 0; unsigned int start = 0; unsigned int end = 0; hb_glyph_info_t *info = c->buffer->info; unsigned int count = c->buffer->len; - c->buffer->unsafe_to_break (0, count); /* TODO Improve. */ - for (unsigned int i = 0; i < count; i++) { + if (!state) + last_zero = i; + unsigned int klass = machine.get_class (info[i].codepoint, num_glyphs); const Entry *entry = machine.get_entry (state, klass); if (unlikely (!entry)) @@ -75,7 +78,10 @@ struct RearrangementSubtable unsigned int flags = entry->flags; if (flags & MarkFirst) + { start = i; + last_zero_before_start = last_zero; + } if (flags & MarkLast) end = i + 1; @@ -114,6 +120,7 @@ struct RearrangementSubtable if (end - start >= l + r) { + c->buffer->unsafe_to_break (last_zero_before_start, i + 1); c->buffer->merge_clusters (start, end); hb_glyph_info_t buf[4];