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

[>64k:layout:PairPos] Templatize & implement format 4 

Implements part of https://github.com/be-fonts/boring-expansion-spec/issues/38

Subset does NOT lower format.
This commit is contained in:
Behdad Esfahbod 2022-07-07 13:55:26 -06:00
parent ecd8bc5a9c
commit e9f8010fd0
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/OT/Layout/GPOS/PairPos.hh
View File

@ -12,9 +12,12 @@ struct PairPos
{ {
protected: protected:
union { union {
HBUINT16 format; /* Format identifier */ HBUINT16 format; /* Format identifier */
PairPosFormat1 format1; PairPosFormat1 format1;
PairPosFormat2 format2; PairPosFormat2_4<SmallTypes> format2;
#ifndef HB_NO_BORING_EXPANSION
PairPosFormat2_4<MediumTypes> format4;
#endif
} u; } u;
public: public:
@ -26,6 +29,9 @@ struct PairPos
switch (u.format) { switch (u.format) {
case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...)); case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...)); case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
#ifndef HB_NO_BORING_EXPANSION
case 4: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
#endif
default:return_trace (c->default_return_value ()); default:return_trace (c->default_return_value ());
} }
} }

11
src/OT/Layout/GPOS/PairPosFormat2.hh
View File

@ -7,11 +7,12 @@ namespace OT {
namespace Layout { namespace Layout {
namespace GPOS_impl { namespace GPOS_impl {
struct PairPosFormat2 template <typename Types>
struct PairPosFormat2_4
{ {
protected: protected:
HBUINT16 format; /* Format identifier--format = 2 */ HBUINT16 format; /* Format identifier--format = 2 */
Offset16To<Coverage> typename Types::template OffsetTo<Coverage>
coverage; /* Offset to Coverage table--from coverage; /* Offset to Coverage table--from
* beginning of subtable */ * beginning of subtable */
ValueFormat valueFormat1; /* ValueRecord definition--for the ValueFormat valueFormat1; /* ValueRecord definition--for the
@ -20,11 +21,11 @@ struct PairPosFormat2
ValueFormat valueFormat2; /* ValueRecord definition--for the ValueFormat valueFormat2; /* ValueRecord definition--for the
* second glyph of the pair--may be * second glyph of the pair--may be
* zero (0) */ * zero (0) */
Offset16To<ClassDef> typename Types::template OffsetTo<ClassDef>
classDef1; /* Offset to ClassDef table--from classDef1; /* Offset to ClassDef table--from
* beginning of PairPos subtable--for * beginning of PairPos subtable--for
* the first glyph of the pair */ * the first glyph of the pair */
Offset16To<ClassDef> typename Types::template OffsetTo<ClassDef>
classDef2; /* Offset to ClassDef table--from classDef2; /* Offset to ClassDef table--from
* beginning of PairPos subtable--for * beginning of PairPos subtable--for
* the second glyph of the pair */ * the second glyph of the pair */
@ -36,7 +37,7 @@ struct PairPosFormat2
* class1-major, class2-minor, * class1-major, class2-minor,
* Each entry has value1 and value2 */ * Each entry has value1 and value2 */
public: public:
DEFINE_SIZE_ARRAY (16, values); DEFINE_SIZE_ARRAY (10 + 3 * Types::size, values);
bool sanitize (hb_sanitize_context_t *c) const bool sanitize (hb_sanitize_context_t *c) const
{ {