svg2ttf - npm Package Compare versions

Comparing version 1.0.3 to 1.0.4

HISTORY.md

@@ -0,1 +1,6 @@
+1.0.4 / 2013-08-09
+------------------
+
+* Fixed importing into OSX Font Book
+
 1.0.3 / 2013-08-02
@@ -2,0 +7,0 @@ ------------------

index.js

@@ -25,3 +25,4 @@ /*
   font.sfntNames.push({ id: 4, value: options.fullname || svgFont.id }); // full name
-  font.sfntNames.push({ id: 5, value: '1.0' }); // version ID for TTF name table
+  font.sfntNames.push({ id: 5, value: 'Version 1.0' }); // version ID for TTF name table
+  font.sfntNames.push({ id: 6, value: options.fullname || svgFont.id }); // Postscript name for the font, required for OSX Font Book
   font.unitsPerEm = svgFont.unitsPerEm;
@@ -28,0 +29,0 @@ font.weightClass = svgFont.weightClass;

lib/ttf.js

@@ -21,12 +21,12 @@ 'use strict';
 var TABLES = [
-  { innerName: 0x4f532f32, create: createOS2Table }, //OS/2
-  { innerName: 0x636d6170, create: createCMapTable }, // cmap
-  { innerName: 0x676c7966, create: createGlyfTable }, // glyf
-  { innerName: 0x68656164, create: createHeadTable }, // head
-  { innerName: 0x68686561, create: createHHeadTable }, // hhea
-  { innerName: 0x686d7478, create: createHtmxTable }, // hmtx
-  { innerName: 0x6c6f6361, create: createLocaTable }, // loca
-  { innerName: 0x6d617870, create: createMaxpTable }, // maxp
-  { innerName: 0x6e616d65, create: createNameTable }, // name
-  { innerName: 0x706f7374, create: createPostTable } // post
+  { innerName: 0x4f532f32, create: createOS2Table, order: 4 }, //OS/2
+  { innerName: 0x636d6170, create: createCMapTable, order: 6 }, // cmap
+  { innerName: 0x676c7966, create: createGlyfTable, order: 8 }, // glyf
+  { innerName: 0x68656164, create: createHeadTable, order: 2 }, // head
+  { innerName: 0x68686561, create: createHHeadTable, order: 1 }, // hhea
+  { innerName: 0x686d7478, create: createHtmxTable, order: 5 }, // hmtx
+  { innerName: 0x6c6f6361, create: createLocaTable, order: 7 }, // loca
+  { innerName: 0x6d617870, create: createMaxpTable, order: 3 }, // maxp
+  { innerName: 0x6e616d65, create: createNameTable, order: 9 }, // name
+  { innerName: 0x706f7374, create: createPostTable, order: 10 } // post
 ];
@@ -101,3 +101,2 @@
     table.buffer = table.create(font);
-    table.offset = bufSize;
     table.length = table.buffer.byteLength;
@@ -109,2 +108,9 @@ table.corLength = table.length + (4 - table.length % 4) % 4; // table size should be divisible to 4
 
+  //calculate offsets
+  var offset = headerSize;
+  _.forEach(_.sortBy(TABLES, 'order'), function (table) {
+    table.offset = offset;
+    offset += table.corLength;
+  });
+
   //create TTF buffer
@@ -134,3 +140,3 @@
   var headOffset = 0;
-  _.forEach(TABLES, function (table) {
+  _.forEach(_.sortBy(TABLES, 'order'), function (table) {
     if (table.innerName === 0x68656164) { //we must store head offset to write font checksum
@@ -137,0 +143,0 @@ headOffset = buf.tell();

lib/ttf/tables/glyf.js

@@ -114,3 +114,2 @@ 'use strict';
   font.ttf_glyph_size = result; //sum of all glyph lengths
-  result += 4; // add table header
   return result;
@@ -117,0 +116,0 @@ }

package.json

 {
   "name"            : "svg2ttf",
 
-  "version"         : "1.0.3",
+  "version"         : "1.0.4",
 
@@ -6,0 +6,0 @@ "description"     : "Convert SVG graphics to TTF font",

No alert changes

Improved metrics

Total package byte prevSize

77537

0.58%

Lines of code

1863

0.27%

No dependency changes