From 1f2bb172fe9a173ecfd61054f1fdd850943ef059 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 23 Aug 2012 16:10:37 -0400 Subject: [PATCH] Revert "[Indic/GSUB] Ignore context when matching would_apply()" This reverts commit 24dd4e56743c6ce5e01cb710ca9e01b3e527af58. Oops. My bad. The change _regressed_ Malayalam test suite, not improved it. I'll redo it, differentiating between old-spec and new-spec cases. --- src/hb-ot-layout-gsubgpos-private.hh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index 5b0276f..ba2a7e0 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -1066,11 +1066,9 @@ static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c const LookupRecord lookupRecord[], ChainContextApplyLookupContext &lookup_context) { - /* The MS Indic specs say "...all classifications are determined ... using context-free substitutions." - * However, testing shows that MS's Malayalam shapers (both old and new), "match" even if there is no - * zero-context rule. We follow. Hence the commented out line. */ - return /* !backtrackCount && !lookaheadCount && */ - would_match_input (c, + return !backtrackCount + && !lookaheadCount + && would_match_input (c, inputCount, input, lookup_context.funcs.match, lookup_context.match_data[1]); } -- 2.7.4