mirror of
https://github.com/harfbuzz/harfbuzz.git
synced 2025-04-04 21:15:06 +00:00
Merge pull request #5223 from harfbuzz/trak-back
Revert "[ot-font/trak] Move trak application to ot-font instead of ot…
This commit is contained in:
Behdad Esfahbod
GitHub
commit
c50c0a39e5
8 changed files with 80 additions and 83 deletions
|
|
@ -31,6 +31,7 @@
|
|||
#include "hb-aat-layout-common.hh"
|
||||
#include "hb-ot-layout.hh"
|
||||
#include "hb-open-type.hh"
|
||||
#include "hb-ot-stat-table.hh"
|
||||
|
||||
/*
|
||||
* trak -- Tracking
|
||||
|
|
@ -115,7 +116,7 @@ struct TrackTableEntry
|
|||
|
||||
protected:
|
||||
F16DOT16 track; /* Track value for this record. */
|
||||
NameID trackNameID; /* The 'name' table index for this track.
|
||||
OT::NameID trackNameID; /* The 'name' table index for this track.
|
||||
* (a short word or phrase like "loose"
|
||||
* or "very tight") */
|
||||
NNOffset16To<UnsizedArrayOf<FWORD>>
|
||||
|
|
@ -200,6 +201,46 @@ struct trak
|
|||
float ptem = font->ptem > 0.f ? font->ptem : HB_CORETEXT_DEFAULT_FONT_SIZE;
|
||||
return font->em_scalef_y ((this+vertData).get_tracking (this, ptem, track));
|
||||
}
|
||||
hb_position_t get_tracking (hb_font_t *font, hb_direction_t dir, float track = 0.f) const
|
||||
{
|
||||
#ifndef HB_NO_STYLE
|
||||
if (!font->face->table.STAT->has_data ())
|
||||
return 0;
|
||||
return HB_DIRECTION_IS_HORIZONTAL (dir) ?
|
||||
get_h_tracking (font, track) :
|
||||
get_v_tracking (font, track);
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool apply (hb_aat_apply_context_t *c, float track = 0.f) const
|
||||
{
|
||||
TRACE_APPLY (this);
|
||||
|
||||
float ptem = c->font->ptem;
|
||||
if (unlikely (ptem <= 0.f))
|
||||
{
|
||||
/* https://developer.apple.com/documentation/coretext/1508745-ctfontcreatewithgraphicsfont */
|
||||
ptem = HB_CORETEXT_DEFAULT_FONT_SIZE;
|
||||
}
|
||||
|
||||
hb_buffer_t *buffer = c->buffer;
|
||||
if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction))
|
||||
{
|
||||
hb_position_t advance_to_add = get_h_tracking (c->font, track);
|
||||
foreach_grapheme (buffer, start, end)
|
||||
buffer->pos[start].x_advance += advance_to_add;
|
||||
}
|
||||
else
|
||||
{
|
||||
hb_position_t advance_to_add = get_v_tracking (c->font, track);
|
||||
foreach_grapheme (buffer, start, end)
|
||||
buffer->pos[start].y_advance += advance_to_add;
|
||||
}
|
||||
|
||||
return_trace (true);
|
||||
}
|
||||
|
||||
bool sanitize (hb_sanitize_context_t *c) const
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include "hb-aat-layout-just-table.hh" // Just so we compile it; unused otherwise.
|
||||
#include "hb-aat-layout-kerx-table.hh"
|
||||
#include "hb-aat-layout-morx-table.hh"
|
||||
#include "hb-aat-layout-trak-table.hh" // Just so we compile it; unused otherwise.
|
||||
#include "hb-aat-layout-trak-table.hh"
|
||||
#include "hb-aat-ltag-table.hh"
|
||||
|
||||
#include "hb-ot-layout-gsub-table.hh"
|
||||
|
|
@ -394,6 +394,17 @@ hb_aat_layout_has_tracking (hb_face_t *face)
|
|||
return face->table.trak->has_data ();
|
||||
}
|
||||
|
||||
void
|
||||
hb_aat_layout_track (const hb_ot_shape_plan_t *plan,
|
||||
hb_font_t *font,
|
||||
hb_buffer_t *buffer)
|
||||
{
|
||||
const AAT::trak& trak = *font->face->table.trak;
|
||||
|
||||
AAT::hb_aat_apply_context_t c (plan, font, buffer);
|
||||
trak.apply (&c);
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_aat_layout_get_feature_types:
|
||||
* @face: #hb_face_t to work upon
|
||||
|
|
|
|||
|
|
@ -68,5 +68,10 @@ hb_aat_layout_position (const hb_ot_shape_plan_t *plan,
|
|||
hb_font_t *font,
|
||||
hb_buffer_t *buffer);
|
||||
|
||||
HB_INTERNAL void
|
||||
hb_aat_layout_track (const hb_ot_shape_plan_t *plan,
|
||||
hb_font_t *font,
|
||||
hb_buffer_t *buffer);
|
||||
|
||||
|
||||
#endif /* HB_AAT_LAYOUT_HH */
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
#ifdef HAVE_CORETEXT
|
||||
|
||||
#include "hb-coretext.hh"
|
||||
#include "hb-aat-layout-trak-table.hh"
|
||||
|
||||
#include "hb-draw.hh"
|
||||
#include "hb-font.hh"
|
||||
|
|
@ -209,6 +210,7 @@ hb_coretext_get_glyph_h_advances (hb_font_t* font,
|
|||
|
||||
CGFloat ct_font_size = CTFontGetSize (ct_font);
|
||||
CGFloat x_mult = (CGFloat) font->x_scale / ct_font_size;
|
||||
hb_position_t tracking = font->face->table.trak->get_tracking (font, HB_DIRECTION_LTR, 0.f);
|
||||
|
||||
CGGlyph cg_glyph[MAX_GLYPHS];
|
||||
CGSize advances[MAX_GLYPHS];
|
||||
|
|
@ -223,7 +225,7 @@ hb_coretext_get_glyph_h_advances (hb_font_t* font,
|
|||
CTFontGetAdvancesForGlyphs (ct_font, kCTFontOrientationHorizontal, cg_glyph, advances, c);
|
||||
for (unsigned j = 0; j < c; j++)
|
||||
{
|
||||
*first_advance = round (advances[j].width * x_mult);
|
||||
*first_advance = round (advances[j].width * x_mult) - tracking;
|
||||
first_advance = &StructAtOffset<hb_position_t> (first_advance, advance_stride);
|
||||
}
|
||||
}
|
||||
|
|
@ -244,6 +246,7 @@ hb_coretext_get_glyph_v_advances (hb_font_t* font,
|
|||
|
||||
CGFloat ct_font_size = CTFontGetSize (ct_font);
|
||||
CGFloat y_mult = (CGFloat) -font->y_scale / ct_font_size;
|
||||
hb_position_t tracking = font->face->table.trak->get_tracking (font, HB_DIRECTION_TTB, 0.f);
|
||||
|
||||
CGGlyph cg_glyph[MAX_GLYPHS];
|
||||
CGSize advances[MAX_GLYPHS];
|
||||
|
|
@ -258,7 +261,7 @@ hb_coretext_get_glyph_v_advances (hb_font_t* font,
|
|||
CTFontGetAdvancesForGlyphs (ct_font, kCTFontOrientationVertical, cg_glyph, advances, c);
|
||||
for (unsigned j = 0; j < c; j++)
|
||||
{
|
||||
*first_advance = round (advances[j].width * y_mult);
|
||||
*first_advance = round (advances[j].width * y_mult) - tracking;
|
||||
first_advance = &StructAtOffset<hb_position_t> (first_advance, advance_stride);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
35
src/hb-ft.cc
35
src/hb-ft.cc
|
|
@ -37,11 +37,7 @@
|
|||
#include "hb-draw.hh"
|
||||
#include "hb-font.hh"
|
||||
#include "hb-machinery.hh"
|
||||
#ifndef HB_NO_AAT
|
||||
#include "hb-aat-layout-trak-table.hh"
|
||||
#endif
|
||||
#include "hb-ot-os2-table.hh"
|
||||
#include "hb-ot-stat-table.hh"
|
||||
#include "hb-ot-shaper-arabic-pua.hh"
|
||||
#include "hb-paint.hh"
|
||||
|
||||
|
|
@ -534,26 +530,6 @@ hb_ft_get_glyph_h_advances (hb_font_t* font, void* font_data,
|
|||
first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef HB_NO_AAT
|
||||
/* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
|
||||
#ifndef HB_NO_STYLE
|
||||
bool apply_trak = font->face->table.STAT->has_data () && font->face->table.trak->has_data ();
|
||||
#else
|
||||
bool apply_trak = false;
|
||||
#endif
|
||||
if (apply_trak)
|
||||
{
|
||||
hb_position_t tracking = font->face->table.trak->get_h_tracking (font);
|
||||
first_advance = orig_first_advance;
|
||||
for (unsigned int i = 0; i < count; i++)
|
||||
{
|
||||
*first_advance += tracking;
|
||||
first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
|
||||
first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef HB_NO_VERTICAL
|
||||
|
|
@ -594,17 +570,6 @@ hb_ft_get_glyph_v_advance (hb_font_t *font,
|
|||
hb_position_t y_strength = font->y_scale >= 0 ? font->y_strength : -font->y_strength;
|
||||
v = ((-v + (1<<9)) >> 10) + (font->embolden_in_place ? 0 : y_strength);
|
||||
|
||||
#ifndef HB_NO_AAT
|
||||
/* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
|
||||
#ifndef HB_NO_STYLE
|
||||
bool apply_trak = font->face->table.STAT->has_data () && font->face->table.trak->has_data ();
|
||||
#else
|
||||
bool apply_trak = false;
|
||||
#endif
|
||||
if (apply_trak)
|
||||
v += font->face->table.trak->get_v_tracking (font);
|
||||
#endif
|
||||
|
||||
return v;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -36,9 +36,6 @@
|
|||
#include "hb-ot-face.hh"
|
||||
#include "hb-outline.hh"
|
||||
|
||||
#ifndef HB_NO_AAT
|
||||
#include "hb-aat-layout-trak-table.hh"
|
||||
#endif
|
||||
#include "hb-ot-cmap-table.hh"
|
||||
#include "hb-ot-glyf-table.hh"
|
||||
#include "hb-ot-cff2-table.hh"
|
||||
|
|
@ -76,10 +73,6 @@ struct hb_ot_font_t
|
|||
{
|
||||
const hb_ot_face_t *ot_face;
|
||||
|
||||
#ifndef HB_NO_AAT
|
||||
bool apply_trak;
|
||||
#endif
|
||||
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
hb_ot_font_cmap_cache_t *cmap_cache;
|
||||
#endif
|
||||
|
|
@ -98,15 +91,6 @@ _hb_ot_font_create (hb_font_t *font)
|
|||
|
||||
ot_font->ot_face = &font->face->table;
|
||||
|
||||
#ifndef HB_NO_AAT
|
||||
/* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
|
||||
#ifndef HB_NO_STYLE
|
||||
ot_font->apply_trak = font->face->table.STAT->has_data () && font->face->table.trak->has_data ();
|
||||
#else
|
||||
ot_font->apply_trak = false;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
// retry:
|
||||
auto *cmap_cache = (hb_ot_font_cmap_cache_t *) hb_face_get_user_data (font->face,
|
||||
|
|
@ -216,6 +200,7 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
|
|||
unsigned advance_stride,
|
||||
void *user_data HB_UNUSED)
|
||||
{
|
||||
|
||||
const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
|
||||
const hb_ot_face_t *ot_face = ot_font->ot_face;
|
||||
const OT::hmtx_accelerator_t &hmtx = *ot_face->hmtx;
|
||||
|
|
@ -307,20 +292,6 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
|
|||
first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef HB_NO_AAT
|
||||
if (ot_font->apply_trak)
|
||||
{
|
||||
hb_position_t tracking = font->face->table.trak->get_h_tracking (font);
|
||||
first_advance = orig_first_advance;
|
||||
for (unsigned int i = 0; i < count; i++)
|
||||
{
|
||||
*first_advance += tracking;
|
||||
first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
|
||||
first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef HB_NO_VERTICAL
|
||||
|
|
@ -385,20 +356,6 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data,
|
|||
first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef HB_NO_AAT
|
||||
if (ot_font->apply_trak)
|
||||
{
|
||||
hb_position_t tracking = font->face->table.trak->get_v_tracking (font);
|
||||
first_advance = orig_first_advance;
|
||||
for (unsigned int i = 0; i < count; i++)
|
||||
{
|
||||
*first_advance += tracking;
|
||||
first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
|
||||
first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -210,6 +210,14 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t &plan,
|
|||
https://github.com/harfbuzz/harfbuzz/issues/2967. */
|
||||
if (plan.apply_morx)
|
||||
plan.adjust_mark_positioning_when_zeroing = false;
|
||||
|
||||
/* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
|
||||
#ifndef HB_NO_STYLE
|
||||
plan.apply_trak = hb_aat_layout_has_tracking (face) && face->table.STAT->has_data ();
|
||||
#else
|
||||
plan.apply_trak = false;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -274,6 +282,11 @@ hb_ot_shape_plan_t::position (hb_font_t *font,
|
|||
#endif
|
||||
else if (this->apply_fallback_kern)
|
||||
_hb_ot_shape_fallback_kern (this, font, buffer);
|
||||
|
||||
#ifndef HB_NO_AAT_SHAPE
|
||||
if (this->apply_trak)
|
||||
hb_aat_layout_track (this, font, buffer);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -109,9 +109,11 @@ struct hb_ot_shape_plan_t
|
|||
#ifndef HB_NO_AAT_SHAPE
|
||||
bool apply_kerx : 1;
|
||||
bool apply_morx : 1;
|
||||
bool apply_trak : 1;
|
||||
#else
|
||||
static constexpr bool apply_kerx = false;
|
||||
static constexpr bool apply_morx = false;
|
||||
static constexpr bool apply_trak = false;
|
||||
#endif
|
||||
|
||||
void collect_lookups (hb_tag_t table_tag, hb_set_t *lookups) const
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue