Skip to content

Fix the Variation Selector handling #278

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

Open
KojiAndoJC wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix the Variation Selector handling #278

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f78847
Fix the Variation Selector handling
KojiAndoJC May 25, 2022
344f4dd
Better fix so as not to override a variable
KojiAndoJC May 29, 2022
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
7 changes: 5 additions & 2 deletions src/CmapProcessor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,16 @@ export default class CmapProcessor {
let sel = selectors[i];

if (i !== -1 && sel.defaultUVS) {
i = binarySearch(sel.defaultUVS, x =>
let i = binarySearch(sel.defaultUVS, x =>
codepoint < x.startUnicodeValue ? -1 : codepoint > x.startUnicodeValue + x.additionalCount ? +1 : 0
);
if (i !== -1) {
Copy link
Member

@devongovett devongovett May 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be the opposite, i.e. i === -1?

Copy link
Author

@KojiAndoJC KojiAndoJC May 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry I didn't make it clear enough. My pull request fixes two problems.

  1. When the default UVS table exists and its entry not exists (i === -1), the variable i was overwriten and the non-default UVS isn't used.
  2. When the default entry exists ( i !== -1 ), it means "the default glyph (the same glyph as base character) should be used" and checking the non-default UVS is unnecessary. By returning 0, the Variation Selector is ignored correctly here.

Copy link
Member

@blikblum blikblum May 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A test would help understanding the issue and ensuring the fix is correct

return 0;
}
}

if (i !== -1 && sel.nonDefaultUVS) {
i = binarySearch(sel.nonDefaultUVS, x => codepoint - x.unicodeValue);
let i = binarySearch(sel.nonDefaultUVS, x => codepoint - x.unicodeValue);
if (i !== -1) {
return sel.nonDefaultUVS[i].glyphID;
}
Expand Down