Merge ot-metrics-internal.cc with ot-metrics now that isn't needed in subset
diff --git a/src/hb-ot-metrics.cc b/src/hb-ot-metrics.cc
index bec4c56..a25e2e6 100644
--- a/src/hb-ot-metrics.cc
+++ b/src/hb-ot-metrics.cc
@@ -26,10 +26,79 @@
#ifndef HB_NO_METRICS
-#include "hb-ot-metrics.hh"
#include "hb-ot-var-mvar-table.hh"
+#include "hb-ot-gasp-table.hh" // Just so we compile it; unused otherwise.
+#include "hb-ot-os2-table.hh"
+#include "hb-ot-post-table.hh"
+#include "hb-ot-hmtx-table.hh"
+#include "hb-ot-metrics.hh"
#include "hb-ot-face.hh"
+#if 0
+static bool
+_get_gasp (hb_face_t *face, float *result, hb_ot_metrics_t metrics_tag)
+{
+ const OT::GaspRange& range = face->table.gasp->get_gasp_range (metrics_tag - HB_TAG ('g','s','p','0'));
+ if (&range == &Null (OT::GaspRange)) return false;
+ if (result) *result = range.rangeMaxPPEM + face->table.MVAR->get_var (metrics_tag, nullptr, 0);
+ return true;
+}
+#endif
+
+bool
+hb_ot_metrics_get_position_internal (hb_face_t *face,
+ hb_ot_metrics_t metrics_tag,
+ float *position /* OUT. May be NULL. */)
+{
+ switch (metrics_tag)
+ {
+#ifndef HB_NO_VAR
+#define GET_VAR hb_ot_metrics_get_variation (face, metrics_tag)
+#else
+#define GET_VAR 0
+#endif
+#define GET_METRIC(TABLE, ATTR) \
+ (face->table.TABLE->has_data () && \
+ (position && (*position = face->table.TABLE->ATTR + GET_VAR), true))
+ case HB_OT_METRICS_HORIZONTAL_ASCENDER:
+ return (!face->table.OS2->use_typo_metrics () && GET_METRIC (hhea, ascender)) ||
+ GET_METRIC (OS2, sTypoAscender);
+ case HB_OT_METRICS_HORIZONTAL_DESCENDER:
+ return (!face->table.OS2->use_typo_metrics () && GET_METRIC (hhea, descender)) ||
+ GET_METRIC (OS2, sTypoDescender);
+ case HB_OT_METRICS_HORIZONTAL_LINE_GAP:
+ return (!face->table.OS2->use_typo_metrics () && GET_METRIC (hhea, lineGap)) ||
+ GET_METRIC (OS2, sTypoLineGap);
+ case HB_OT_METRICS_HORIZONTAL_CLIPPING_ASCENT: return GET_METRIC (OS2, usWinAscent);
+ case HB_OT_METRICS_HORIZONTAL_CLIPPING_DESCENT: return GET_METRIC (OS2, usWinDescent);
+ case HB_OT_METRICS_VERTICAL_ASCENDER: return GET_METRIC (vhea, ascender);
+ case HB_OT_METRICS_VERTICAL_DESCENDER: return GET_METRIC (vhea, descender);
+ case HB_OT_METRICS_VERTICAL_LINE_GAP: return GET_METRIC (vhea, lineGap);
+ case HB_OT_METRICS_HORIZONTAL_CARET_RISE: return GET_METRIC (hhea, caretSlopeRise);
+ case HB_OT_METRICS_HORIZONTAL_CARET_RUN: return GET_METRIC (hhea, caretSlopeRun);
+ case HB_OT_METRICS_HORIZONTAL_CARET_OFFSET: return GET_METRIC (hhea, caretOffset);
+ case HB_OT_METRICS_VERTICAL_CARET_RISE: return GET_METRIC (vhea, caretSlopeRise);
+ case HB_OT_METRICS_VERTICAL_CARET_RUN: return GET_METRIC (vhea, caretSlopeRun);
+ case HB_OT_METRICS_VERTICAL_CARET_OFFSET: return GET_METRIC (vhea, caretOffset);
+ case HB_OT_METRICS_X_HEIGHT: return GET_METRIC (OS2->v2 (), sxHeight);
+ case HB_OT_METRICS_CAP_HEIGHT: return GET_METRIC (OS2->v2 (), sCapHeight);
+ case HB_OT_METRICS_SUBSCRIPT_EM_X_SIZE: return GET_METRIC (OS2, ySubscriptXSize);
+ case HB_OT_METRICS_SUBSCRIPT_EM_Y_SIZE: return GET_METRIC (OS2, ySubscriptYSize);
+ case HB_OT_METRICS_SUBSCRIPT_EM_X_OFFSET: return GET_METRIC (OS2, ySubscriptXOffset);
+ case HB_OT_METRICS_SUBSCRIPT_EM_Y_OFFSET: return GET_METRIC (OS2, ySubscriptYOffset);
+ case HB_OT_METRICS_SUPERSCRIPT_EM_X_SIZE: return GET_METRIC (OS2, ySuperscriptXSize);
+ case HB_OT_METRICS_SUPERSCRIPT_EM_Y_SIZE: return GET_METRIC (OS2, ySuperscriptYSize);
+ case HB_OT_METRICS_SUPERSCRIPT_EM_X_OFFSET: return GET_METRIC (OS2, ySuperscriptXOffset);
+ case HB_OT_METRICS_SUPERSCRIPT_EM_Y_OFFSET: return GET_METRIC (OS2, ySuperscriptYOffset);
+ case HB_OT_METRICS_STRIKEOUT_SIZE: return GET_METRIC (OS2, yStrikeoutSize);
+ case HB_OT_METRICS_STRIKEOUT_OFFSET: return GET_METRIC (OS2, yStrikeoutPosition);
+ case HB_OT_METRICS_UNDERLINE_SIZE: return GET_METRIC (post->table, underlineThickness);
+ case HB_OT_METRICS_UNDERLINE_OFFSET: return GET_METRIC (post->table, underlinePosition);
+#undef GET_METRIC
+#undef GET_VAR
+ default: return false;
+ }
+}
/**
* hb_ot_metrics_get_position:
