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

[mort] Some Ligature work

This commit is contained in:
Behdad Esfahbod 2018-10-31 00:15:00 -07:00
parent 28b68cffe4
commit 431c6e496b
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/hb-aat-layout-morx-table.hh
View File

@ -359,19 +359,43 @@ struct ContextualSubtable
DEFINE_SIZE_STATIC (20); DEFINE_SIZE_STATIC (20);
}; };
template <typename Types>
struct LigatureSubtable
{
typedef typename Types::HBUINT HBUINT;
struct EntryData template <bool extended>
struct LigatureEntry;
template <>
struct LigatureEntry<true>
{
typedef struct
{ {
HBUINT16 ligActionIndex; /* Index to the first ligActionTable entry HBUINT16 ligActionIndex; /* Index to the first ligActionTable entry
* for processing this group, if indicated * for processing this group, if indicated
* by the flags. */ * by the flags. */
public: public:
DEFINE_SIZE_STATIC (2); DEFINE_SIZE_STATIC (2);
}; } EntryData;
template <typename Entry, typename Flags>
static inline unsigned int ligActionIndex (Entry &entry, Flags flags)
{ return entry->data.ligActionIndex; };
};
template <>
struct LigatureEntry<false>
{
typedef void EntryData;
template <typename Entry, typename Flags>
static inline unsigned int ligActionIndex (Entry &entry, Flags flags)
{ return flags & 0x3FFF; };
};
template <typename Types>
struct LigatureSubtable
{
typedef typename Types::HBUINT HBUINT;
typedef typename LigatureEntry<Types::extended>::EntryData EntryData;
struct driver_context_t struct driver_context_t
{ {
@ -436,7 +460,7 @@ struct LigatureSubtable
{ {
DEBUG_MSG (APPLY, nullptr, "Perform action with %d", match_length); DEBUG_MSG (APPLY, nullptr, "Perform action with %d", match_length);
unsigned int end = buffer->out_len; unsigned int end = buffer->out_len;
unsigned int action_idx = entry->data.ligActionIndex; unsigned int action_idx = LigatureEntry<Types::extended>::ligActionIndex (entry, flags);
unsigned int action; unsigned int action;
unsigned int ligature_idx = 0; unsigned int ligature_idx = 0;