walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[MATH] Fixups for math constants commit

This commit is contained in:
Behdad Esfahbod 2016-09-26 11:15:59 +01:00
parent 319ff59161
commit 1a381153a2
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hb-ot-layout-math-table.hh
View File

@ -36,13 +36,10 @@ namespace OT {
struct MathValueRecord struct MathValueRecord
{ {
inline hb_position_t get_value (hb_font_t *font, bool horizontal, inline hb_position_t get_x_value (hb_font_t *font, const void *base) const
const void *base) const { return font->em_scale_x (value) + (base+deviceTable).get_x_delta (font); }
{ inline hb_position_t get_y_value (hb_font_t *font, const void *base) const
return horizontal ? { return font->em_scale_y (value) + (base+deviceTable).get_y_delta (font); }
font->em_scale_x (value) + (base+deviceTable).get_x_delta (font) :
font->em_scale_y (value) + (base+deviceTable).get_y_delta (font);
}
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{ {
@ -57,7 +54,7 @@ protected:
Suggested format for device table is 1. */ Suggested format for device table is 1. */
public: public:
DEFINE_SIZE_STATIC (2 * 2); DEFINE_SIZE_STATIC (4);
}; };
struct MathConstants struct MathConstants
@ -90,7 +87,7 @@ struct MathConstants
case HB_OT_MATH_CONSTANT_RADICAL_KERN_BEFORE_DEGREE: case HB_OT_MATH_CONSTANT_RADICAL_KERN_BEFORE_DEGREE:
case HB_OT_MATH_CONSTANT_SKEWED_FRACTION_HORIZONTAL_GAP: case HB_OT_MATH_CONSTANT_SKEWED_FRACTION_HORIZONTAL_GAP:
case HB_OT_MATH_CONSTANT_SPACE_AFTER_SCRIPT: case HB_OT_MATH_CONSTANT_SPACE_AFTER_SCRIPT:
return mathValueRecords[constant - HB_OT_MATH_CONSTANT_MATH_LEADING].get_value(font, true, this); return mathValueRecords[constant - HB_OT_MATH_CONSTANT_MATH_LEADING].get_x_value(font, this);
case HB_OT_MATH_CONSTANT_ACCENT_BASE_HEIGHT: case HB_OT_MATH_CONSTANT_ACCENT_BASE_HEIGHT:
case HB_OT_MATH_CONSTANT_AXIS_HEIGHT: case HB_OT_MATH_CONSTANT_AXIS_HEIGHT:
@ -139,7 +136,7 @@ struct MathConstants
case HB_OT_MATH_CONSTANT_UNDERBAR_VERTICAL_GAP: case HB_OT_MATH_CONSTANT_UNDERBAR_VERTICAL_GAP:
case HB_OT_MATH_CONSTANT_UPPER_LIMIT_BASELINE_RISE_MIN: case HB_OT_MATH_CONSTANT_UPPER_LIMIT_BASELINE_RISE_MIN:
case HB_OT_MATH_CONSTANT_UPPER_LIMIT_GAP_MIN: case HB_OT_MATH_CONSTANT_UPPER_LIMIT_GAP_MIN:
return mathValueRecords[constant - HB_OT_MATH_CONSTANT_MATH_LEADING].get_value(font, false, this); return mathValueRecords[constant - HB_OT_MATH_CONSTANT_MATH_LEADING].get_y_value(font, this);
case HB_OT_MATH_CONSTANT_SCRIPT_PERCENT_SCALE_DOWN: case HB_OT_MATH_CONSTANT_SCRIPT_PERCENT_SCALE_DOWN:
case HB_OT_MATH_CONSTANT_SCRIPT_SCRIPT_PERCENT_SCALE_DOWN: case HB_OT_MATH_CONSTANT_SCRIPT_SCRIPT_PERCENT_SCALE_DOWN:
@ -147,6 +144,8 @@ struct MathConstants
case HB_OT_MATH_CONSTANT_RADICAL_DEGREE_BOTTOM_RAISE_PERCENT: case HB_OT_MATH_CONSTANT_RADICAL_DEGREE_BOTTOM_RAISE_PERCENT:
return radicalDegreeBottomRaisePercent; return radicalDegreeBottomRaisePercent;
default:
return 0;
} }
} }