From 4550ffe14ed1e75d3209d0398f445521b0f8b4b0 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Wed, 29 Aug 2012 10:31:59 -0500
Subject: [PATCH 1/3] Fixes fonts on linux

---
 src/fonts.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/fonts.js b/src/fonts.js
index 4aef0962a..97fb63be2 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -2938,6 +2938,7 @@ var Font = (function FontClosure() {
         }
         this.toFontChar = toFontChar;
       }
+      var unitsPerEm = properties.unitsPerEm || 1000; // defaulting to 1000
 
       var fields = {
         // PostScript Font Program
@@ -2958,7 +2959,7 @@ var Font = (function FontClosure() {
               '\x00\x00\x00\x00' + // checksumAdjustement
               '\x5F\x0F\x3C\xF5' + // magicNumber
               '\x00\x00' + // Flags
-              '\x03\xE8' + // unitsPerEM (defaulting to 1000)
+              safeString16(unitsPerEm) + // unitsPerEM
               '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // creation date
               '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // modifification date
               '\x00\x00' + // xMin
@@ -4413,6 +4414,12 @@ var CFFParser = (function CFFParserClosure() {
       var charStringOffset = topDict.getByName('CharStrings');
       cff.charStrings = this.parseCharStrings(charStringOffset);
 
+      var fontMatrix = topDict.getByName('FontMatrix');
+      if (fontMatrix) {
+        // estimating unitsPerEM for the font
+        properties.unitsPerEm = 1 / fontMatrix[0];
+      }
+
       var charset, encoding;
       if (cff.isCIDFont) {
         var fdArrayIndex = this.parseIndex(topDict.getByName('FDArray')).obj;

From 93f9efde390a9811482480cb740ba660a8217419 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Wed, 29 Aug 2012 12:19:09 -0500
Subject: [PATCH 2/3] Fixes ascent and descent values for windows gdi

---
 src/fonts.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/fonts.js b/src/fonts.js
index 97fb63be2..0b6a58aba 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -4420,6 +4420,13 @@ var CFFParser = (function CFFParserClosure() {
         properties.unitsPerEm = 1 / fontMatrix[0];
       }
 
+      var fontBBox = topDict.getByName('FontBBox');
+      if (fontBBox) {
+        // adjusting ascent/descent
+        properties.ascent = fontBBox[3];
+        properties.descent = fontBBox[1];
+      }
+
       var charset, encoding;
       if (cff.isCIDFont) {
         var fdArrayIndex = this.parseIndex(topDict.getByName('FDArray')).obj;

From e32ecc44d38c2bcba70e6955beca37042a0c07b4 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Wed, 29 Aug 2012 12:58:12 -0500
Subject: [PATCH 3/3] Fixes CFF test and CFF int16 parsing

---
 src/fonts.js           | 2 +-
 test/unit/font_spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fonts.js b/src/fonts.js
index 0b6a58aba..1b20e771d 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -4500,7 +4500,7 @@ var CFFParser = (function CFFParserClosure() {
           return parseFloatOperand(pos);
         } else if (value === 28) {
           value = dict[pos++];
-          value = (value << 8) | dict[pos++];
+          value = ((value << 24) | (dict[pos++] << 16)) >> 16;
           return value;
         } else if (value === 29) {
           value = dict[pos++];
diff --git a/test/unit/font_spec.js b/test/unit/font_spec.js
index 9f0969324..b2436778d 100644
--- a/test/unit/font_spec.js
+++ b/test/unit/font_spec.js
@@ -42,7 +42,7 @@ describe('font', function() {
   }
 
   describe('CFFParser', function() {
-    var parser = new CFFParser(fontData);
+    var parser = new CFFParser(fontData, {});
     var cff = parser.parse();
 
     it('parses header', function() {