[HB] Minor
This commit is contained in:
parent
8533bb985e
commit
d79cae0b4e
|
@ -46,7 +46,7 @@ struct SingleSubstFormat1 {
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
inline bool single_substitute (hb_codepoint_t &glyph_id) const {
|
inline bool get_substitute (hb_codepoint_t &glyph_id) const {
|
||||||
|
|
||||||
unsigned int index = (this+coverage) (glyph_id);
|
unsigned int index = (this+coverage) (glyph_id);
|
||||||
if (HB_LIKELY (index == NOT_COVERED))
|
if (HB_LIKELY (index == NOT_COVERED))
|
||||||
|
@ -73,7 +73,7 @@ struct SingleSubstFormat2 {
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
inline bool single_substitute (hb_codepoint_t &glyph_id) const {
|
inline bool get_substitute (hb_codepoint_t &glyph_id) const {
|
||||||
|
|
||||||
unsigned int index = (this+coverage) (glyph_id);
|
unsigned int index = (this+coverage) (glyph_id);
|
||||||
if (HB_LIKELY (index == NOT_COVERED))
|
if (HB_LIKELY (index == NOT_COVERED))
|
||||||
|
@ -103,10 +103,10 @@ struct SingleSubst {
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
inline bool single_substitute (hb_codepoint_t &glyph_id) const {
|
inline bool get_substitute (hb_codepoint_t &glyph_id) const {
|
||||||
switch (u.format) {
|
switch (u.format) {
|
||||||
case 1: return u.format1->single_substitute (glyph_id);
|
case 1: return u.format1->get_substitute (glyph_id);
|
||||||
case 2: return u.format2->single_substitute (glyph_id);
|
case 2: return u.format2->get_substitute (glyph_id);
|
||||||
default:return false;
|
default:return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -115,7 +115,7 @@ struct SingleSubst {
|
||||||
|
|
||||||
hb_codepoint_t glyph_id = IN_CURGLYPH ();
|
hb_codepoint_t glyph_id = IN_CURGLYPH ();
|
||||||
|
|
||||||
if (!single_substitute (glyph_id))
|
if (!get_substitute (glyph_id))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
_hb_buffer_replace_glyph (buffer, glyph_id);
|
_hb_buffer_replace_glyph (buffer, glyph_id);
|
||||||
|
@ -314,7 +314,7 @@ struct Ligature {
|
||||||
friend struct LigatureSet;
|
friend struct LigatureSet;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
inline bool substitute_ligature (LOOKUP_ARGS_DEF, bool is_mark) const {
|
inline bool substitute (LOOKUP_ARGS_DEF, bool is_mark) const {
|
||||||
|
|
||||||
unsigned int i, j;
|
unsigned int i, j;
|
||||||
unsigned int count = component.len;
|
unsigned int count = component.len;
|
||||||
|
@ -393,12 +393,12 @@ struct LigatureSet {
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
inline bool substitute_ligature (LOOKUP_ARGS_DEF, bool is_mark) const {
|
inline bool substitute (LOOKUP_ARGS_DEF, bool is_mark) const {
|
||||||
|
|
||||||
unsigned int num_ligs = ligature.len;
|
unsigned int num_ligs = ligature.len;
|
||||||
for (unsigned int i = 0; i < num_ligs; i++) {
|
for (unsigned int i = 0; i < num_ligs; i++) {
|
||||||
const Ligature &lig = this+ligature[i];
|
const Ligature &lig = this+ligature[i];
|
||||||
if (lig.substitute_ligature (LOOKUP_ARGS, is_mark))
|
if (lig.substitute (LOOKUP_ARGS, is_mark))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -430,7 +430,7 @@ struct LigatureSubstFormat1 {
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
const LigatureSet &lig_set = this+ligatureSet[index];
|
const LigatureSet &lig_set = this+ligatureSet[index];
|
||||||
return lig_set.substitute_ligature (LOOKUP_ARGS, first_is_mark);
|
return lig_set.substitute (LOOKUP_ARGS, first_is_mark);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -438,7 +438,7 @@ struct LigatureSubstFormat1 {
|
||||||
OffsetTo<Coverage>
|
OffsetTo<Coverage>
|
||||||
coverage; /* Offset to Coverage table--from
|
coverage; /* Offset to Coverage table--from
|
||||||
* beginning of Substitution table */
|
* beginning of Substitution table */
|
||||||
OffsetArrayOf<LigatureSet>\
|
OffsetArrayOf<LigatureSet>
|
||||||
ligatureSet; /* Array LigatureSet tables
|
ligatureSet; /* Array LigatureSet tables
|
||||||
* ordered by Coverage Index */
|
* ordered by Coverage Index */
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue