Merge branch 'master' into master

Author: Connum

src/font.js

@@ -175,16 +175,15 @@ Font.prototype.updateFeatures = function (options) {
 };
 
 /**
- * Convert the given text to a list of Glyph objects.
+ * Convert the given text to a list of Glyph indexes.
  * Note that there is no strict one-to-one mapping between characters and
- * glyphs, so the list of returned glyphs can be larger or smaller than the
+ * glyphs, so the list of returned glyph indexes can be larger or smaller than the
  * length of the given string.
  * @param  {string}
  * @param  {GlyphRenderOptions} [options]
- * @return {opentype.Glyph[]}
+ * @return {number[]}
  */
-Font.prototype.stringToGlyphs = function(s, options) {
-
+Font.prototype.stringToGlyphIndexes = function(s, options) {
     const bidi = new Bidi();
 
     // Create and register 'glyphIndex' state modifier
@@ -198,7 +197,20 @@ Font.prototype.stringToGlyphs = function(s, options) {
 
     bidi.applyFeatures(this, features);
 
-    const indexes = bidi.getTextGlyphs(s);
+    return bidi.getTextGlyphs(s);
+};
+
+/**
+ * Convert the given text to a list of Glyph objects.
+ * Note that there is no strict one-to-one mapping between characters and
+ * glyphs, so the list of returned glyphs can be larger or smaller than the
+ * length of the given string.
+ * @param  {string}
+ * @param  {GlyphRenderOptions} [options]
+ * @return {opentype.Glyph[]}
+ */
+Font.prototype.stringToGlyphs = function(s, options) {
+    const indexes = this.stringToGlyphIndexes(s, options);
 
     let length = indexes.length;
 

src/hintingtt.js

@@ -1950,7 +1950,7 @@ function ODD(state) {
 
     if (exports.DEBUG) console.log(state.step, 'ODD[]', n);
 
-    stack.push(Math.trunc(n) % 2 ? 1 : 0);
+    stack.push(Math.trunc(n) & 1 ? 1 : 0);
 }
 
 // EVEN[] EVEN
@@ -1961,7 +1961,7 @@ function EVEN(state) {
 
     if (exports.DEBUG) console.log(state.step, 'EVEN[]', n);
 
-    stack.push(Math.trunc(n) % 2 ? 0 : 1);
+    stack.push(Math.trunc(n) & 1 ? 0 : 1);
 }
 
 // IF[] IF test

src/tables/cff.js

@@ -527,7 +527,7 @@ function parseCFFCharstring(font, glyph, code) {
 
         // The number of stem operators on the stack is always even.
         // If the value is uneven, that means a width is specified.
-        hasWidthArg = stack.length % 2 !== 0;
+        hasWidthArg = (stack.length & 1) !== 0;
         if (hasWidthArg && !haveWidth) {
             width = stack.shift() + nominalWidthX;
         }
@@ -780,7 +780,7 @@ function parseCFFCharstring(font, glyph, code) {
                     p.curveTo(c1x, c1y, c2x, c2y, x, y);
                     break;
                 case 26: // vvcurveto
-                    if (stack.length % 2) {
+                    if (stack.length & 1) {
                         x += stack.shift();
                     }
 
@@ -796,7 +796,7 @@ function parseCFFCharstring(font, glyph, code) {
 
                     break;
                 case 27: // hhcurveto
-                    if (stack.length % 2) {
+                    if (stack.length & 1) {
                         y += stack.shift();
                     }
 

test/font.js

@@ -17,6 +17,8 @@ describe('font.js', function() {
         fGlyph, iGlyph, ffGlyph, fiGlyph, ffiGlyph
     ];
 
+    glyphs.forEach((glyph, index) => glyph.index = index);
+
     beforeEach(function() {
         font = new Font({
             familyName: 'MyFont',
@@ -49,6 +51,20 @@ describe('font.js', function() {
         });
     });
 
+    describe('stringToGlyphIndexes', function() {
+        it('must support standard ligatures', function() {
+            assert.deepEqual(font.stringToGlyphIndexes('fi'), [fGlyph.index, iGlyph.index]);
+            font.substitution.add('liga', { sub: [1, 1, 2], by: 5 });
+            font.substitution.add('liga', { sub: [1, 1], by: 3 });
+            font.substitution.add('liga', { sub: [1, 2], by: 4 });
+            assert.deepEqual(font.stringToGlyphIndexes('ff'), [ffGlyph.index]);
+            assert.deepEqual(font.stringToGlyphIndexes('fi'), [fiGlyph.index]);
+            assert.deepEqual(font.stringToGlyphIndexes('ffi'), [ffiGlyph.index]);
+            assert.deepEqual(font.stringToGlyphIndexes('fffiffif'),
+                [ffGlyph.index, fiGlyph.index, ffiGlyph.index, fGlyph.index]);
+        });
+    });
+
     describe('stringToGlyphs', function() {
         it('must support standard ligatures', function() {
             assert.deepEqual(font.stringToGlyphs('fi'), [fGlyph, iGlyph]);