Merge ot-metrics-internal.cc with ot-metrics now that isn't needed in subset
This commit is contained in:
Ebrahim Byagowi
Behdad Esfahbod
parent
29444d7e9f
commit
471f798ace
|
|
@ -88,7 +88,6 @@ HB_BASE_sources = \
|
||||||
hb-ot-math-table.hh \
|
hb-ot-math-table.hh \
|
||||||
hb-ot-math.cc \
|
hb-ot-math.cc \
|
||||||
hb-ot-maxp-table.hh \
|
hb-ot-maxp-table.hh \
|
||||||
hb-ot-metrics-internal.cc \
|
|
||||||
hb-ot-metrics.cc \
|
hb-ot-metrics.cc \
|
||||||
hb-ot-metrics.hh \
|
hb-ot-metrics.hh \
|
||||||
hb-ot-name-language-static.hh \
|
hb-ot-name-language-static.hh \
|
||||||
|
|
@ -237,8 +236,6 @@ HB_ICU_headers = hb-icu.h
|
||||||
HB_SUBSET_sources = \
|
HB_SUBSET_sources = \
|
||||||
hb-ot-cff1-table.cc \
|
hb-ot-cff1-table.cc \
|
||||||
hb-ot-cff2-table.cc \
|
hb-ot-cff2-table.cc \
|
||||||
hb-ot-metrics-internal.cc \
|
|
||||||
hb-ot-metrics.hh \
|
|
||||||
hb-static.cc \
|
hb-static.cc \
|
||||||
hb-subset-cff-common.cc \
|
hb-subset-cff-common.cc \
|
||||||
hb-subset-cff-common.hh \
|
hb-subset-cff-common.hh \
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
#include "hb-ot-layout.cc"
|
#include "hb-ot-layout.cc"
|
||||||
#include "hb-ot-map.cc"
|
#include "hb-ot-map.cc"
|
||||||
#include "hb-ot-math.cc"
|
#include "hb-ot-math.cc"
|
||||||
#include "hb-ot-metrics-internal.cc"
|
|
||||||
#include "hb-ot-metrics.cc"
|
#include "hb-ot-metrics.cc"
|
||||||
#include "hb-ot-name.cc"
|
#include "hb-ot-name.cc"
|
||||||
#include "hb-ot-shape-complex-arabic.cc"
|
#include "hb-ot-shape-complex-arabic.cc"
|
||||||
|
|
|
||||||
|
|
@ -1,100 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright © 2018 Ebrahim Byagowi
|
|
||||||
*
|
|
||||||
* This is part of HarfBuzz, a text shaping library.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, without written agreement and without
|
|
||||||
* license or royalty fees, to use, copy, modify, and distribute this
|
|
||||||
* software and its documentation for any purpose, provided that the
|
|
||||||
* above copyright notice and the following two paragraphs appear in
|
|
||||||
* all copies of this software.
|
|
||||||
*
|
|
||||||
* IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
|
|
||||||
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
|
|
||||||
* IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
|
||||||
* DAMAGE.
|
|
||||||
*
|
|
||||||
* THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
|
||||||
* ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
|
|
||||||
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "hb.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-var-mvar-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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -26,10 +26,79 @@
|
||||||
|
|
||||||
#ifndef HB_NO_METRICS
|
#ifndef HB_NO_METRICS
|
||||||
|
|
||||||
#include "hb-ot-metrics.hh"
|
|
||||||
#include "hb-ot-var-mvar-table.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"
|
#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:
|
* hb_ot_metrics_get_position:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue