[kern] Remove Override business
Not used in any fonts. Not well-specified when mixing kerning with Cross-Stream positioning.
This commit is contained in:
parent
59e04e4231
commit
befac337ca
|
@ -588,8 +588,6 @@ struct KernTable
|
||||||
(st->u.header.Variation | st->u.header.CrossStream | st->u.header.Direction)) !=
|
(st->u.header.Variation | st->u.header.CrossStream | st->u.header.Direction)) !=
|
||||||
st->u.header.DirectionHorizontal)
|
st->u.header.DirectionHorizontal)
|
||||||
continue;
|
continue;
|
||||||
if (st->u.header.coverage & st->u.header.Override)
|
|
||||||
v = 0;
|
|
||||||
v += st->get_kerning (left, right);
|
v += st->get_kerning (left, right);
|
||||||
st = &StructAfter<SubTable> (*st);
|
st = &StructAfter<SubTable> (*st);
|
||||||
}
|
}
|
||||||
|
@ -603,15 +601,6 @@ struct KernTable
|
||||||
c->set_lookup_index (0);
|
c->set_lookup_index (0);
|
||||||
const SubTable *st = CastP<SubTable> (&thiz()->dataZ);
|
const SubTable *st = CastP<SubTable> (&thiz()->dataZ);
|
||||||
unsigned int count = thiz()->nTables;
|
unsigned int count = thiz()->nTables;
|
||||||
/* If there's an override subtable, skip subtables before that. */
|
|
||||||
unsigned int last_override = 0;
|
|
||||||
for (unsigned int i = 0; i < count; i++)
|
|
||||||
{
|
|
||||||
if (!(st->u.header.coverage & (st->u.header.Variation | st->u.header.CrossStream)) &&
|
|
||||||
(st->u.header.coverage & st->u.header.Override))
|
|
||||||
last_override = i;
|
|
||||||
st = &StructAfter<SubTable> (*st);
|
|
||||||
}
|
|
||||||
st = CastP<SubTable> (&thiz()->dataZ);
|
st = CastP<SubTable> (&thiz()->dataZ);
|
||||||
for (unsigned int i = 0; i < count; i++)
|
for (unsigned int i = 0; i < count; i++)
|
||||||
{
|
{
|
||||||
|
@ -622,9 +611,6 @@ struct KernTable
|
||||||
((st->u.header.coverage & st->u.header.Direction) == st->u.header.DirectionHorizontal))
|
((st->u.header.coverage & st->u.header.Direction) == st->u.header.DirectionHorizontal))
|
||||||
goto skip;
|
goto skip;
|
||||||
|
|
||||||
if (i < last_override)
|
|
||||||
goto skip;
|
|
||||||
|
|
||||||
if (!c->buffer->message (c->font, "start kern subtable %d", c->lookup_index))
|
if (!c->buffer->message (c->font, "start kern subtable %d", c->lookup_index))
|
||||||
goto skip;
|
goto skip;
|
||||||
|
|
||||||
|
@ -719,8 +705,6 @@ struct KernAAT : KernTable<KernAAT>
|
||||||
CrossStream = 0x40u,
|
CrossStream = 0x40u,
|
||||||
Variation = 0x20u,
|
Variation = 0x20u,
|
||||||
|
|
||||||
Override = 0x00u, /* Not supported. */
|
|
||||||
|
|
||||||
DirectionHorizontal= 0x00u
|
DirectionHorizontal= 0x00u
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue