Switch canvas font to work with pixels instead of points. This also fixes line spacing issues where fonts are specified in points but line heights are specified in pixels.

Remove extraneous "normal" string from definitions.
TODO: Place both declarations somewhere shared, like FontFace or FontUtils or perhaps make measureText have multiple methods (maybe renamed to TextUtils if that's not confusing)

Author: charlietuna

lib/CanvasUtils.js

@@ -136,7 +136,7 @@ function drawText (ctx, text, x, y, width, height, fontFace, options) {
   }
 
   ctx.fillStyle = options.color;
-  ctx.font = fontFace.attributes.style + ' normal ' + fontFace.attributes.weight + ' ' + options.fontSize + 'pt ' + fontFace.family;
+  ctx.font = fontFace.attributes.style + ' ' + fontFace.attributes.weight + ' ' + options.fontSize + 'px ' + fontFace.family;
 
   textMetrics.lines.forEach(function (line, index) {
     currText = line.text;

lib/measureText.js

@@ -50,7 +50,7 @@ module.exports = function measureText (text, width, fontFace, fontSize, lineHeig
   var tryLine;
   var currentLine;
 
-  ctx.font = fontFace.attributes.style + ' normal ' + fontFace.attributes.weight + ' ' + fontSize + 'pt ' + fontFace.family;
+  ctx.font = fontFace.attributes.style + ' ' + fontFace.attributes.weight + ' ' + fontSize + 'px ' + fontFace.family;
   textMetrics = ctx.measureText(text);
 
   measuredSize.width = textMetrics.width;