From b6ea4976edd5c42542fc7b32b6e120563acf85a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luiz=20Am=C3=A9rico?= <luizamericop@gmail.com>
Date: Sat, 5 Oct 2019 15:08:02 -0300
Subject: [PATCH] Fix getting the fd index for OTF/CFF CID fonts

---
 src/cff/CFFFont.js |  2 +-
 test/glyphs.js     | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/cff/CFFFont.js b/src/cff/CFFFont.js
index 60d9e5f1..6f0cc39f 100644
--- a/src/cff/CFFFont.js
+++ b/src/cff/CFFFont.js
@@ -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;
diff --git a/test/glyphs.js b/test/glyphs.js
index d078c27f..fc689e26 100644
--- a/test/glyphs.js
+++ b/test/glyphs.js
@@ -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');