Skip to content

Fix getting the fd index for OTF/CFF CID fonts #207

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
merged 1 commit into from
Nov 17, 2019
Merged

Fix getting the fd index for OTF/CFF CID fonts #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/cff/CFFFont.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class CFFFont {

if (gid < ranges[mid].first) {
high = mid - 1;
} else if (mid < high && gid > ranges[mid + 1].first) {
} else if (mid < high && gid >= ranges[mid + 1].first) {
low = mid + 1;
} else {
return ranges[mid].fd;
Expand Down
43 changes: 43 additions & 0 deletions test/glyphs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,49 @@ describe('glyphs', function() {
});
});

describe('CFF glyphs (CID font)', function() {
let font = fontkit.openSync(__dirname + '/data/NotoSansCJK/NotoSansCJKkr-Regular.otf');

it('should get a CFFGlyph', function() {
let glyph = font.getGlyph(27); // :
return assert.equal(glyph.constructor.name, 'CFFGlyph');
});

it('should get a path for the glyph', function() {
let glyph = font.getGlyph(27);
return assert.equal(glyph.path.toSVG(), 'M139 390C175 390 205 419 205 459C205 501 175 530 139 530C103 530 73 501 73 459C73 419 103 390 139 390ZM139 -13C175 -13 205 15 205 56C205 97 175 127 139 127C103 127 73 97 73 56C73 15 103 -13 139 -13Z');
});

it('should get the glyph cbox', function() {
let glyph = font.getGlyph(27);
return assert.deepEqual(glyph.cbox, new BBox(73, -13, 205, 530));
});

it('should get the glyph bbox', function() {
let glyph = font.getGlyph(27);
return assert.deepEqual(glyph.bbox, new BBox(73, -13, 205, 530));
});

it('should get the correct fd index', function() {
let cff = font['CFF '];
// FDSelect ranges
// {first: 0, fd: 5 }
// {first: 1, fd: 15 }
// {first: 17, fd: 17 }
// {first: 27, fd: 15 }
// {first: 102, fd: 3 }
assert.equal(cff.fdForGlyph(0), 5);
assert.equal(cff.fdForGlyph(1), 15);
assert.equal(cff.fdForGlyph(10), 15);
assert.equal(cff.fdForGlyph(16), 15);
assert.equal(cff.fdForGlyph(17), 17);
assert.equal(cff.fdForGlyph(26), 17);
assert.equal(cff.fdForGlyph(27), 15);
assert.equal(cff.fdForGlyph(28), 15);
assert.equal(cff.fdForGlyph(102), 3);
});
});

describe('SBIX glyphs', function() {
let font = fontkit.openSync(__dirname + '/data/ss-emoji/ss-emoji-apple.ttf');

Expand Down