summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos.hh
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-07-25 10:48:52 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-07-25 10:48:52 +0000
commit120fbb4ff2102335d09b937b3b63a9eed6ab66bb (patch)
tree536783132e9340733acf05aa2086936b22066771 /Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos.hh
parent838bc80097f80371675cb700320a76c6a0ea6ab6 (diff)
harfbuzz-2.7.0
git-svn-id: svn://tug.org/texlive/trunk@55937 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos.hh')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos.hh26
1 files changed, 15 insertions, 11 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos.hh
index 8b0e4323cec..5877933729b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsubgpos.hh
@@ -335,7 +335,7 @@ struct hb_ot_apply_context_t :
void set_mask (hb_mask_t mask_) { mask = mask_; }
void set_syllable (uint8_t syllable_) { syllable = syllable_; }
void set_match_func (match_func_t match_func_,
- const void *match_data_)
+ const void *match_data_)
{ match_func = match_func_; match_data = match_data_; }
enum may_match_t {
@@ -540,8 +540,8 @@ struct hb_ot_apply_context_t :
hb_ot_apply_context_t (unsigned int table_index_,
- hb_font_t *font_,
- hb_buffer_t *buffer_) :
+ hb_font_t *font_,
+ hb_buffer_t *buffer_) :
iter_input (), iter_context (),
font (font_), face (font->face), buffer (buffer_),
recurse_func (nullptr),
@@ -1753,10 +1753,12 @@ struct ContextFormat2
};
return
- + hb_enumerate (ruleSet)
- | hb_map ([&] (const hb_pair_t<unsigned, const OffsetTo<RuleSet> &> p)
+ + hb_iter (ruleSet)
+ | hb_map (hb_add (this))
+ | hb_enumerate
+ | hb_map ([&] (const hb_pair_t<unsigned, const RuleSet &> p)
{ return class_def.intersects_class (glyphs, p.first) &&
- (this+p.second).intersects (glyphs, lookup_context); })
+ p.second.intersects (glyphs, lookup_context); })
| hb_any
;
}
@@ -2001,7 +2003,7 @@ struct ContextFormat3
out->glyphCount = glyphCount;
out->lookupCount = lookupCount;
- const hb_array_t<const OffsetTo<Coverage>> coverages = coverageZ.as_array (glyphCount);
+ auto coverages = coverageZ.as_array (glyphCount);
for (const OffsetTo<Coverage>& offset : coverages)
{
@@ -2658,10 +2660,12 @@ struct ChainContextFormat2
};
return
- + hb_enumerate (ruleSet)
- | hb_map ([&] (const hb_pair_t<unsigned, const OffsetTo<ChainRuleSet> &> p)
+ + hb_iter (ruleSet)
+ | hb_map (hb_add (this))
+ | hb_enumerate
+ | hb_map ([&] (const hb_pair_t<unsigned, const ChainRuleSet &> p)
{ return input_class_def.intersects_class (glyphs, p.first) &&
- (this+p.second).intersects (glyphs, lookup_context); })
+ p.second.intersects (glyphs, lookup_context); })
| hb_any
;
}
@@ -3009,7 +3013,7 @@ struct ChainContextFormat3
const hb_map_t *lookup_map = c->table_tag == HB_OT_TAG_GSUB ? c->plan->gsub_lookups : c->plan->gpos_lookups;
for (unsigned i = 0; i < (unsigned) lookupCount; i++)
if (!c->serializer->copy (lookupRecord[i], lookup_map)) return_trace (false);
-
+
return_trace (true);
}