src/hb-aat-layout-common.hh | 3 ++- src/hb-aat-layout-morx-table.hh | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 5fd8bce945e7efaa48d0c29eb8b2700027bd3c0b Author: Behdad Esfahbod <[email protected]> Date: Wed Sep 19 22:34:09 2018 -0400 [morx] Fix mark_set check diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index 0a2d62b5..a8b287fd 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -608,7 +608,7 @@ struct InsertionSubtable hb_buffer_t *buffer = driver->buffer; unsigned int flags = entry->flags; - if (entry->data.markedInsertIndex != 0xFFFF) + if (entry->data.markedInsertIndex != 0xFFFF && mark_set) { unsigned int count = (flags & MarkedInsertCount); unsigned int start = entry->data.markedInsertIndex; @@ -617,8 +617,6 @@ struct InsertionSubtable bool before = flags & MarkedInsertBefore; - if (unlikely (!mark_set)) return false; - unsigned int end = buffer->out_len; buffer->move_to (mark); commit 0739b28169eb63332b31420deb5bf58b5446f154 Author: Behdad Esfahbod <[email protected]> Date: Wed Sep 19 17:32:21 2018 -0400 [aat] Minor diff --git a/src/hb-aat-layout-common.hh b/src/hb-aat-layout-common.hh index 57374b0b..052aad7f 100644 --- a/src/hb-aat-layout-common.hh +++ b/src/hb-aat-layout-common.hh @@ -569,7 +569,8 @@ struct StateTableDriver /* If there's no action and we're just epsilon-transitioning to state 0, * safe to break. */ if (c->is_actionable (this, entry) || - !(entry->newState == 0 && entry->flags == context_t::DontAdvance)) + !(entry->newState == StateTable<EntryData>::STATE_START_OF_TEXT && + entry->flags == context_t::DontAdvance)) buffer->unsafe_to_break (buffer->idx - 1, buffer->idx + 1); } _______________________________________________ HarfBuzz mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/harfbuzz
