@cantoo/fontkit 2.0.4 → 2.0.5

package/src/tables/head.js

@@ -2,24 +2,24 @@ import * as r from 'restructure';
 
 // font header
 export default new r.Struct({
-  version:            r.int32,                   // 0x00010000 (version 1.0)
-  revision:           r.int32,                   // set by font manufacturer
+  version: r.int32, // 0x00010000 (version 1.0)
+  revision: r.int32, // set by font manufacturer
   checkSumAdjustment: r.uint32,
-  magicNumber:        r.uint32,                  // set to 0x5F0F3CF5
-  flags:              r.uint16,
-  unitsPerEm:         r.uint16,                  // range from 64 to 16384
-  created:            new r.Array(r.int32, 2),
-  modified:           new r.Array(r.int32, 2),
-  xMin:               r.int16,                   // for all glyph bounding boxes
-  yMin:               r.int16,                   // for all glyph bounding boxes
-  xMax:               r.int16,                   // for all glyph bounding boxes
-  yMax:               r.int16,                   // for all glyph bounding boxes
-  macStyle:           new r.Bitfield(r.uint16, [
+  magicNumber: r.uint32, // set to 0x5F0F3CF5
+  flags: r.uint16,
+  unitsPerEm: r.uint16, // range from 64 to 16384
+  created: new r.Array(r.int32, 2),
+  modified: new r.Array(r.int32, 2),
+  xMin: r.int16, // for all glyph bounding boxes
+  yMin: r.int16, // for all glyph bounding boxes
+  xMax: r.int16, // for all glyph bounding boxes
+  yMax: r.int16, // for all glyph bounding boxes
+  macStyle: new r.Bitfield(r.uint16, [
     'bold', 'italic', 'underline', 'outline',
     'shadow', 'condensed', 'extended'
   ]),
-  lowestRecPPEM:      r.uint16,                  // smallest readable size in pixels
-  fontDirectionHint:  r.int16,
-  indexToLocFormat:   r.int16,                   // 0 for short offsets, 1 for long
-  glyphDataFormat:    r.int16                    // 0 for current format
+  lowestRecPPEM: r.uint16, // smallest readable size in pixels
+  fontDirectionHint: r.int16,
+  indexToLocFormat: r.int16, // 0 for short offsets, 1 for long
+  glyphDataFormat: r.int16 // 0 for current format
 });

package/src/tables/hhea.js

@@ -2,18 +2,18 @@ import * as r from 'restructure';
 
 // horizontal header
 export default new r.Struct({
-  version:              r.int32,
-  ascent:               r.int16,   // Distance from baseline of highest ascender
-  descent:              r.int16,   // Distance from baseline of lowest descender
-  lineGap:              r.int16,   // Typographic line gap
-  advanceWidthMax:      r.uint16,  // Maximum advance width value in 'hmtx' table
-  minLeftSideBearing:   r.int16,   // Maximum advance width value in 'hmtx' table
-  minRightSideBearing:  r.int16,   // Minimum right sidebearing value
-  xMaxExtent:           r.int16,
-  caretSlopeRise:       r.int16,   // Used to calculate the slope of the cursor (rise/run); 1 for vertical
-  caretSlopeRun:        r.int16,   // 0 for vertical
-  caretOffset:          r.int16,   // Set to 0 for non-slanted fonts
-  reserved:             new r.Reserved(r.int16, 4),
-  metricDataFormat:     r.int16,   // 0 for current format
-  numberOfMetrics:      r.uint16   // Number of advance widths in 'hmtx' table
+  version: r.int32,
+  ascent: r.int16, // Distance from baseline of highest ascender
+  descent: r.int16, // Distance from baseline of lowest descender
+  lineGap: r.int16, // Typographic line gap
+  advanceWidthMax: r.uint16, // Maximum advance width value in 'hmtx' table
+  minLeftSideBearing: r.int16, // Maximum advance width value in 'hmtx' table
+  minRightSideBearing: r.int16, // Minimum right sidebearing value
+  xMaxExtent: r.int16,
+  caretSlopeRise: r.int16, // Used to calculate the slope of the cursor (rise/run); 1 for vertical
+  caretSlopeRun: r.int16, // 0 for vertical
+  caretOffset: r.int16, // Set to 0 for non-slanted fonts
+  reserved: new r.Reserved(r.int16, 4),
+  metricDataFormat: r.int16, // 0 for current format
+  numberOfMetrics: r.uint16 // Number of advance widths in 'hmtx' table
 });

package/src/tables/hmtx.js

@@ -6,6 +6,6 @@ let HmtxEntry = new r.Struct({
 });
 
 export default new r.Struct({
-  metrics:    new r.LazyArray(HmtxEntry, t => t.parent.hhea.numberOfMetrics),
-  bearings:   new r.LazyArray(r.int16, t => t.parent.maxp.numGlyphs - t.parent.hhea.numberOfMetrics)
+  metrics: new r.LazyArray(HmtxEntry, t => t.parent.hhea.numberOfMetrics),
+  bearings: new r.LazyArray(r.int16, t => t.parent.maxp.numGlyphs - t.parent.hhea.numberOfMetrics)
 });

package/src/tables/index.js

@@ -20,7 +20,6 @@ tables.name = name;
 tables['OS/2'] = OS2;
 tables.post = post;
 
-
 // TrueType Outlines
 import cvt from './cvt';
 import fpgm from './fpgm';
@@ -34,7 +33,6 @@ tables.prep = prep;
 tables['cvt '] = cvt;
 tables.glyf = glyf;
 
-
 // PostScript Outlines
 import CFFFont from '../cff/CFFFont';
 import VORG from './VORG';
@@ -43,7 +41,6 @@ tables['CFF '] = CFFFont;
 tables['CFF2'] = CFFFont;
 tables.VORG = VORG;
 
-
 // Bitmap Glyphs
 import EBLC from './EBLC';
 import sbix from './sbix';
@@ -56,7 +53,6 @@ tables.sbix = sbix;
 tables.COLR = COLR;
 tables.CPAL = CPAL;
 
-
 // Advanced OpenType Tables
 import BASE from './BASE';
 import GDEF from './GDEF';
@@ -98,7 +94,6 @@ tables.VDMX = VDMX;
 tables.vhea = vhea;
 tables.vmtx = vmtx;
 
-
 // Apple Advanced Typography Tables
 import avar from './avar';
 import bsln from './bsln';

package/src/tables/just.js

@@ -5,7 +5,7 @@ let ClassTable = new r.Struct({
   length: r.uint16,
   coverage: r.uint16,
   subFeatureFlags: r.uint32,
-  stateTable: new StateTable1
+  stateTable: new StateTable1()
 });
 
 let WidthDeltaRecord = new r.Struct({

package/src/tables/kern.js

@@ -1,9 +1,9 @@
 import * as r from 'restructure';
 
 let KernPair = new r.Struct({
-  left:   r.uint16,
-  right:  r.uint16,
-  value:  r.int16
+  left: r.uint16,
+  right: r.uint16,
+  value: r.int16
 });
 
 let ClassTable = new r.Struct({
@@ -21,71 +21,71 @@ let Kern2Array = new r.Struct({
 
 let KernSubtable = new r.VersionedStruct('format', {
   0: {
-    nPairs:         r.uint16,
-    searchRange:    r.uint16,
-    entrySelector:  r.uint16,
-    rangeShift:     r.uint16,
-    pairs:          new r.Array(KernPair, 'nPairs')
+    nPairs: r.uint16,
+    searchRange: r.uint16,
+    entrySelector: r.uint16,
+    rangeShift: r.uint16,
+    pairs: new r.Array(KernPair, 'nPairs')
   },
 
   2: {
-    rowWidth:   r.uint16,
-    leftTable:  new r.Pointer(r.uint16, ClassTable, {type: 'parent'}),
-    rightTable: new r.Pointer(r.uint16, ClassTable, {type: 'parent'}),
-    array:      new r.Pointer(r.uint16, Kern2Array, {type: 'parent'})
+    rowWidth: r.uint16,
+    leftTable: new r.Pointer(r.uint16, ClassTable, { type: 'parent' }),
+    rightTable: new r.Pointer(r.uint16, ClassTable, { type: 'parent' }),
+    array: new r.Pointer(r.uint16, Kern2Array, { type: 'parent' })
   },
 
   3: {
-    glyphCount:       r.uint16,
-    kernValueCount:   r.uint8,
-    leftClassCount:   r.uint8,
-    rightClassCount:  r.uint8,
-    flags:            r.uint8,
-    kernValue:        new r.Array(r.int16, 'kernValueCount'),
-    leftClass:        new r.Array(r.uint8, 'glyphCount'),
-    rightClass:       new r.Array(r.uint8, 'glyphCount'),
-    kernIndex:        new r.Array(r.uint8, t => t.leftClassCount * t.rightClassCount)
+    glyphCount: r.uint16,
+    kernValueCount: r.uint8,
+    leftClassCount: r.uint8,
+    rightClassCount: r.uint8,
+    flags: r.uint8,
+    kernValue: new r.Array(r.int16, 'kernValueCount'),
+    leftClass: new r.Array(r.uint8, 'glyphCount'),
+    rightClass: new r.Array(r.uint8, 'glyphCount'),
+    kernIndex: new r.Array(r.uint8, t => t.leftClassCount * t.rightClassCount)
   }
 });
 
 let KernTable = new r.VersionedStruct('version', {
   0: { // Microsoft uses this format
-    subVersion: r.uint16,  // Microsoft has an extra sub-table version number
-    length:     r.uint16,  // Length of the subtable, in bytes
-    format:     r.uint8,   // Format of subtable
-    coverage:   new r.Bitfield(r.uint8, [
-      'horizontal',    // 1 if table has horizontal data, 0 if vertical
-      'minimum',       // If set to 1, the table has minimum values. If set to 0, the table has kerning values.
-      'crossStream',   // If set to 1, kerning is perpendicular to the flow of the text
-      'override'      // If set to 1 the value in this table replaces the accumulated value
+    subVersion: r.uint16, // Microsoft has an extra sub-table version number
+    length: r.uint16, // Length of the subtable, in bytes
+    format: r.uint8, // Format of subtable
+    coverage: new r.Bitfield(r.uint8, [
+      'horizontal', // 1 if table has horizontal data, 0 if vertical
+      'minimum', // If set to 1, the table has minimum values. If set to 0, the table has kerning values.
+      'crossStream', // If set to 1, kerning is perpendicular to the flow of the text
+      'override' // If set to 1 the value in this table replaces the accumulated value
     ]),
-    subtable:   KernSubtable,
+    subtable: KernSubtable,
     padding: new r.Reserved(r.uint8, t => t.length - t._currentOffset)
   },
   1: { // Apple uses this format
-    length:     r.uint32,
-    coverage:   new r.Bitfield(r.uint8, [
+    length: r.uint32,
+    coverage: new r.Bitfield(r.uint8, [
       null, null, null, null, null,
-      'variation',     // Set if table has variation kerning values
-      'crossStream',   // Set if table has cross-stream kerning values
-      'vertical'      // Set if table has vertical kerning values
+      'variation', // Set if table has variation kerning values
+      'crossStream', // Set if table has cross-stream kerning values
+      'vertical' // Set if table has vertical kerning values
     ]),
-    format:     r.uint8,
+    format: r.uint8,
     tupleIndex: r.uint16,
-    subtable:   KernSubtable,
+    subtable: KernSubtable,
     padding: new r.Reserved(r.uint8, t => t.length - t._currentOffset)
   }
 });
 
 export default new r.VersionedStruct(r.uint16, {
   0: { // Microsoft Version
-    nTables:    r.uint16,
-    tables:     new r.Array(KernTable, 'nTables')
+    nTables: r.uint16,
+    tables: new r.Array(KernTable, 'nTables')
   },
 
   1: { // Apple Version
-    reserved:   new r.Reserved(r.uint16), // the other half of the version number
-    nTables:    r.uint32,
-    tables:     new r.Array(KernTable, 'nTables')
+    reserved: new r.Reserved(r.uint16), // the other half of the version number
+    nTables: r.uint32,
+    tables: new r.Array(KernTable, 'nTables')
   }
 });

package/src/tables/loca.js

@@ -9,7 +9,7 @@ let loca = new r.VersionedStruct('head.indexToLocFormat', {
   }
 });
 
-loca.process = function() {
+loca.process = function () {
   if (this.version === 0 && !this._processed) {
     for (let i = 0; i < this.offsets.length; i++) {
       this.offsets[i] <<= 1;
@@ -18,7 +18,7 @@ loca.process = function() {
   }
 };
 
-loca.preEncode = function() {
+loca.preEncode = function () {
   if (this.version === 0 && this._processed !== false) {
     for (let i = 0; i < this.offsets.length; i++) {
       this.offsets[i] >>>= 1;

package/src/tables/maxp.js

@@ -2,19 +2,19 @@ import * as r from 'restructure';
 
 // maxiumum profile
 export default new r.Struct({
-  version:                r.int32,
-  numGlyphs:              r.uint16,  // The number of glyphs in the font
-  maxPoints:              r.uint16,  // Maximum points in a non-composite glyph
-  maxContours:            r.uint16,  // Maximum contours in a non-composite glyph
-  maxComponentPoints:     r.uint16,  // Maximum points in a composite glyph
-  maxComponentContours:   r.uint16,  // Maximum contours in a composite glyph
-  maxZones:               r.uint16,  // 1 if instructions do not use the twilight zone, 2 otherwise
-  maxTwilightPoints:      r.uint16,  // Maximum points used in Z0
-  maxStorage:             r.uint16,  // Number of Storage Area locations
-  maxFunctionDefs:        r.uint16,  // Number of FDEFs
-  maxInstructionDefs:     r.uint16,  // Number of IDEFs
-  maxStackElements:       r.uint16,  // Maximum stack depth
-  maxSizeOfInstructions:  r.uint16,  // Maximum byte count for glyph instructions
-  maxComponentElements:   r.uint16,  // Maximum number of components referenced at “top level” for any composite glyph
-  maxComponentDepth:      r.uint16   // Maximum levels of recursion; 1 for simple components
+  version: r.int32,
+  numGlyphs: r.uint16, // The number of glyphs in the font
+  maxPoints: r.uint16, // Maximum points in a non-composite glyph
+  maxContours: r.uint16, // Maximum contours in a non-composite glyph
+  maxComponentPoints: r.uint16, // Maximum points in a composite glyph
+  maxComponentContours: r.uint16, // Maximum contours in a composite glyph
+  maxZones: r.uint16, // 1 if instructions do not use the twilight zone, 2 otherwise
+  maxTwilightPoints: r.uint16, // Maximum points used in Z0
+  maxStorage: r.uint16, // Number of Storage Area locations
+  maxFunctionDefs: r.uint16, // Number of FDEFs
+  maxInstructionDefs: r.uint16, // Number of IDEFs
+  maxStackElements: r.uint16, // Maximum stack depth
+  maxSizeOfInstructions: r.uint16, // Maximum byte count for glyph instructions
+  maxComponentElements: r.uint16, // Maximum number of components referenced at “top level” for any composite glyph
+  maxComponentDepth: r.uint16 // Maximum levels of recursion; 1 for simple components
 });

package/src/tables/morx.js

@@ -16,12 +16,12 @@ let InsertionData = {
 };
 
 let SubstitutionTable = new r.Struct({
-  items: new UnboundedArray(new r.Pointer(r.uint32, new LookupTable))
+  items: new UnboundedArray(new r.Pointer(r.uint32, new LookupTable()))
 });
 
 let SubtableData = new r.VersionedStruct('type', {
   0: { // Indic Rearrangement Subtable
-    stateTable: new StateTable
+    stateTable: new StateTable()
   },
 
   1: { // Contextual Glyph Substitution Subtable
@@ -37,7 +37,7 @@ let SubtableData = new r.VersionedStruct('type', {
   },
 
   4: { // Non-contextual Glyph Substitution Subtable
-    lookupTable: new LookupTable
+    lookupTable: new LookupTable()
   },
 
   5: { // Glyph Insertion Subtable
@@ -56,24 +56,24 @@ let Subtable = new r.Struct({
 });
 
 let FeatureEntry = new r.Struct({
-  featureType:    r.uint16,
+  featureType: r.uint16,
   featureSetting: r.uint16,
-  enableFlags:    r.uint32,
-  disableFlags:   r.uint32
+  enableFlags: r.uint32,
+  disableFlags: r.uint32
 });
 
 let MorxChain = new r.Struct({
-  defaultFlags:     r.uint32,
-  chainLength:      r.uint32,
-  nFeatureEntries:  r.uint32,
-  nSubtables:       r.uint32,
-  features:         new r.Array(FeatureEntry, 'nFeatureEntries'),
-  subtables:        new r.Array(Subtable, 'nSubtables')
+  defaultFlags: r.uint32,
+  chainLength: r.uint32,
+  nFeatureEntries: r.uint32,
+  nSubtables: r.uint32,
+  features: new r.Array(FeatureEntry, 'nFeatureEntries'),
+  subtables: new r.Array(Subtable, 'nSubtables')
 });
 
 export default new r.Struct({
-  version:  r.uint16,
-  unused:   new r.Reserved(r.uint16),
-  nChains:  r.uint32,
-  chains:   new r.Array(MorxChain, 'nChains')
+  version: r.uint16,
+  unused: new r.Reserved(r.uint16),
+  nChains: r.uint32,
+  chains: new r.Array(MorxChain, 'nChains')
 });

package/src/tables/name.js

@@ -1,35 +1,35 @@
 import * as r from 'restructure';
-import {getEncoding, LANGUAGES} from '../encodings';
+import { getEncoding, LANGUAGES } from '../encodings';
 
 let NameRecord = new r.Struct({
   platformID: r.uint16,
   encodingID: r.uint16,
   languageID: r.uint16,
-  nameID:     r.uint16,
-  length:     r.uint16,
-  string:     new r.Pointer(r.uint16,
+  nameID: r.uint16,
+  length: r.uint16,
+  string: new r.Pointer(r.uint16,
     new r.String('length', t => getEncoding(t.platformID, t.encodingID, t.languageID)),
     { type: 'parent', relativeTo: ctx => ctx.parent.stringOffset, allowNull: false }
   )
 });
 
 let LangTagRecord = new r.Struct({
-  length:  r.uint16,
-  tag:     new r.Pointer(r.uint16, new r.String('length', 'utf16be'), {type: 'parent', relativeTo: ctx => ctx.stringOffset})
+  length: r.uint16,
+  tag: new r.Pointer(r.uint16, new r.String('length', 'utf16be'), { type: 'parent', relativeTo: ctx => ctx.stringOffset })
 });
 
 var NameTable = new r.VersionedStruct(r.uint16, {
   0: {
-    count:          r.uint16,
-    stringOffset:   r.uint16,
-    records:        new r.Array(NameRecord, 'count')
+    count: r.uint16,
+    stringOffset: r.uint16,
+    records: new r.Array(NameRecord, 'count')
   },
   1: {
-    count:          r.uint16,
-    stringOffset:   r.uint16,
-    records:        new r.Array(NameRecord, 'count'),
-    langTagCount:   r.uint16,
-    langTags:       new r.Array(LangTagRecord, 'langTagCount')
+    count: r.uint16,
+    stringOffset: r.uint16,
+    records: new r.Array(NameRecord, 'count'),
+    langTagCount: r.uint16,
+    langTags: new r.Array(LangTagRecord, 'langTagCount')
   }
 });
 
@@ -61,7 +61,7 @@ const NAMES = [
   'wwsSubfamilyName',
   'lightBackgroundPalette',
   'darkBackgroundPalette',
-  'variationsPostScriptNamePrefix',
+  'variationsPostScriptNamePrefix'
 ];
 
 function pushEnRecord(out, nameID, string) {
@@ -77,8 +77,8 @@ function pushEnRecord(out, nameID, string) {
   });
 }
 
-NameTable.process = function(_stream) {
-  let records = {fontFeatures: {}};
+NameTable.process = function (_stream) {
+  let records = { fontFeatures: {} };
 
   for (let record of this.records) {
     let language = LANGUAGES[record.platformID][record.languageID];
@@ -112,7 +112,7 @@ NameTable.process = function(_stream) {
   this.records = records;
 };
 
-NameTable.preEncode = function() {
+NameTable.preEncode = function () {
   if (Array.isArray(this.records)) return;
   this.version = 0;