Skip to content

Rework how table keyed entries are ordered in the compiled patch map. #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garretrieger merged 3 commits into from
Jul 22, 2026
Merged

Rework how table keyed entries are ordered in the compiled patch map. #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4be6c0
Update EntryGraph to preserve input condition ordering where possible.
garretrieger Jul 15, 2026
8e09e8c
In IFT font compilation order table keyed patch map entries by patch …
garretrieger Jul 17, 2026
331f03b
Keep patch ids sequential with the sorted edges + jumps.
garretrieger Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 34 additions & 32 deletions ift/encoder/activation_condition_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,35 +34,35 @@ TEST(ActivationConditionTest, ActivationConditionsToEncoderConditions) {
};

// Entry generation optimizes the entries, by combining segments
// where possible.
// where possible. Entry order tries to match input order where possible
std::vector<PatchMap::Entry> expected;

// Entry 0: s1 OR s3 -> 5
// Entry 0: s2 -> 2
{
PatchMap::Entry entry({'a', 'b', 'd', 'e', 'f'}, 5,
PatchEncoding::GLYPH_KEYED);
PatchMap::Entry entry({'c'}, 2, PatchEncoding::GLYPH_KEYED);
expected.push_back(entry);
}

// Entry 1: (s1 OR s3) AND (s2 OR s4) -> 6
// Entry 1: s3 -> 4
{
PatchMap::Entry entry;
entry.coverage.codepoints = {'c', 'g'};
entry.coverage.child_indices = {0};
entry.coverage.conjunctive = true;
entry.patch_indices = {6};
PatchMap::Entry entry({'d', 'e', 'f'}, 4, PatchEncoding::GLYPH_KEYED);
expected.push_back(entry);
}

// Entry 2: s3 -> 4
// Entry 2: s1 OR s3 -> 5
{
PatchMap::Entry entry({'d', 'e', 'f'}, 4, PatchEncoding::GLYPH_KEYED);
PatchMap::Entry entry({'a', 'b', 'd', 'e', 'f'}, 5,
PatchEncoding::GLYPH_KEYED);
expected.push_back(entry);
}

// Entry 3: s2 -> 2
// Entry 3: (s1 OR s3) AND (s2 OR s4) -> 6
{
PatchMap::Entry entry({'c'}, 2, PatchEncoding::GLYPH_KEYED);
PatchMap::Entry entry;
entry.coverage.codepoints = {'c', 'g'};
entry.coverage.child_indices = {2};
entry.coverage.conjunctive = true;
entry.patch_indices = {6};
expected.push_back(entry);
}

Expand Down Expand Up @@ -98,33 +98,33 @@ TEST(ActivationConditionTest,

std::vector<PatchMap::Entry> expected;

// Entry 0: s1 OR s3 -> 5
// Entry 0: s2 -> 2
{
PatchMap::Entry entry({'a', 'b', 'd', 'e', 'f'}, 5,
PatchEncoding::GLYPH_KEYED);
PatchMap::Entry entry({'c'}, 2, PatchEncoding::GLYPH_KEYED);
expected.push_back(entry);
}

// Entry 1: (s1 OR s3) AND (s2 OR s4) -> 6
// Entry 1: s3 -> 4
{
PatchMap::Entry entry;
entry.coverage.codepoints = {'c', 'g'};
entry.coverage.child_indices = {0};
entry.coverage.conjunctive = true;
entry.patch_indices = {6};
PatchMap::Entry entry({'d', 'e', 'f'}, {4, 13, 12},
proto::PatchEncoding::TABLE_KEYED_FULL);
expected.push_back(entry);
}

// Entry 2: s3 -> 4
// Entry 2: s1 OR s3 -> 5
{
PatchMap::Entry entry({'d', 'e', 'f'}, {4, 13, 12},
proto::PatchEncoding::TABLE_KEYED_FULL);
PatchMap::Entry entry({'a', 'b', 'd', 'e', 'f'}, 5,
PatchEncoding::GLYPH_KEYED);
expected.push_back(entry);
}

// Entry 3: s2 -> 2
// Entry 1: (s1 OR s3) AND (s2 OR s4) -> 6
{
PatchMap::Entry entry({'c'}, 2, PatchEncoding::GLYPH_KEYED);
PatchMap::Entry entry;
entry.coverage.codepoints = {'c', 'g'};
entry.coverage.child_indices = {2};
entry.coverage.conjunctive = true;
entry.patch_indices = {6};
expected.push_back(entry);
}

Expand Down Expand Up @@ -153,20 +153,22 @@ TEST(ActivationConditionTest,

std::vector<PatchMap::Entry> expected;

// Entry 0: dlig (ignored)


// Entry 0: {d, e, f} (ignored)
{
PatchMap::Entry condition;
condition.coverage.features = {HB_TAG('d', 'l', 'i', 'g')};
condition.coverage.codepoints = {'d', 'e', 'f'};
condition.ignored = true;
condition.patch_indices = {1};
condition.encoding = PatchEncoding::GLYPH_KEYED;
expected.push_back(condition);
}

// Entry 1: {d, e, f} (ignored)
// Entry 1: dlig (ignored)
{
PatchMap::Entry condition;
condition.coverage.codepoints = {'d', 'e', 'f'};
condition.coverage.features = {HB_TAG('d', 'l', 'i', 'g')};
condition.ignored = true;
condition.patch_indices = {2};
condition.encoding = PatchEncoding::GLYPH_KEYED;
Expand Down
Loading
Loading