Add XObjects fonts to the list of page fonts and has a forEach method to the Dict...

diff --git a/PDFFont.js b/PDFFont.js
index 9c6c620bb7d1a486ebd2234c6137dd2a33def0d7..56e93c19a766d1c92eaa256f5b92bd088bca3f7b 100644 (file)
--- a/PDFFont.js
+++ b/PDFFont.js
@@ -580,9 +580,22 @@ var FontsUtils = {
  * and valid in the point of view of the sanitizer.
  */
 var TrueType = function(aFile) {
+  var header = this._readOpenTypeHeader(aFile);
   this.data = aFile;
 };
 
+TrueType.prototype = {
+  _readOpenTypeHeader: function(aFile) {
+    return {
+      version: aFile.getBytes(4),
+      numTables: FontsUtils.bytesToInteger(aFile.getBytes(2)),
+      searchRange: FontsUtils.bytesToInteger(aFile.getBytes(2)),
+      entrySelector: FontsUtils.bytesToInteger(aFile.getBytes(2)),
+      rangeShift: FontsUtils.bytesToInteger(aFile.getBytes(2))
+    }
+  }
+};
+
 /**
  * This dictionary holds decoded fonts data.
  */

diff --git a/pdf.js b/pdf.js
index bbfa7186a7af9cb50374a1974fa373588d0a0255..afcb39fff4b8cff68ac61b2e2565213d5d93c069 100644 (file)
--- a/pdf.js
+++ b/pdf.js
@@ -563,6 +563,10 @@ var Dict = (function() {
         set: function(key, value) {
             this.map[key] = value;
         },
+        forEach: function(aCallback) {
+          for (var key in this.map)
+            aCallback(key, this.map[key]);
+        },
         toString: function() {
           var keys = [];
           for (var key in this.map)
@@ -1404,16 +1408,30 @@ var Page = (function() {
         },
         get fonts() {
             var xref = this.xref;
-            var fonts = [];
-
             var resources = xref.fetchIfRef(this.resources);
-            var fontResource = resources.get("Font");
-            for (var id in fontResource.map) {
-              var res = xref.fetch(fontResource.get(id));
-              var descriptor = xref.fetch(res.get("FontDescriptor"));
-              fonts.push(descriptor.get("FontName").toString());
+            var fontsDict = new Dict();
+
+            // Get the fonts use on the page
+            var fontResources = resources.get("Font");
+            fontResources.forEach(function(fontKey, fontData) {
+              fontsDict.set(fontKey, xref.fetch(fontData))
+            });
+
+            // Get the fonts use on xobjects of the page if any
+            var xobjs = xref.fetchIfRef(resources.get("XObject"));
+            if (xobjs) {
+              xobjs.forEach(function(key, xobj) {
+                xobj = xref.fetchIfRef(xobj);
+                assertWellFormed(IsStream(xobj), "XObject should be a stream");
+  
+                var xobjFonts = xobj.dict.get("Resources").get("Font");
+                xobjFonts.forEach(function(fontKey, fontData) {
+                  fontsDict.set(fontKey, xref.fetch(fontData))
+                });
+              });
             }
-            return shadow(this, "fonts", fonts);
+
+            return shadow(this, "fonts", fontsDict);
         },
         display: function(gfx) {
             var xref = this.xref;

diff --git a/test.js b/test.js
index f2fdcfdf7ad66e365e16a1d6e9e0b049d632ccef..071b2f0977c3c4822ba86383ca600f92f6c206bf 100644 (file)
--- a/test.js
+++ b/test.js
@@ -76,47 +76,37 @@ function displayPage(num) {
     // of the page to be fully loaded before loading the page
     var fontsReady = true;
     var fonts = page.fonts;
-    for (var i = 0; i < fonts.length; i++) {
-      var fontName = fonts[i].replace("+", "_");
-      var font = Fonts[fontName];
-      if (!font) {
-        // load the new font
-        var xref = page.xref;
-        var resources = xref.fetchIfRef(page.resources);
-        var fontResource = resources.get("Font");
-        for (var id in fontResource.map) {
-          var res = xref.fetch(fontResource.get(id));
-          var descriptor = xref.fetch(res.get("FontDescriptor"));
-          var name = descriptor.get("FontName").toString();
-          if (name == fontName.replace("_", "+")) {
-            var subtype = res.get("Subtype").name;
-            var fontFile = page.xref.fetchIfRef(descriptor.get("FontFile"));
-            if (!fontFile)
-              fontFile = page.xref.fetchIfRef(descriptor.get("FontFile2"));
-
-            // Generate the custom cmap of the font
-            var encoding = xref.fetch(res.get("Encoding"));
-            var differences = encoding.get("Differences");
+    var xref = page.xref;
+    fonts.forEach(function(fontKey, fontDict) {
+        var descriptor = xref.fetch(fontDict.get("FontDescriptor"));
+        var fontName = descriptor.get("FontName").name;
+        fontName = fontName.replace("+", "_");
+
+        // Check if the font has been loaded or is still loading
+        var font = Fonts[fontName];
+        if (!font) {
+            var fontFile = xref.fetchIfRef(descriptor.get2("FontFile", "FontFile2"));
+            // Generate the custom cmap of the font if needed
             var encodingMap = {};
-            var index = 0;
-            for (var j = 0; j < differences.length; j++) {
-              var data = differences[j];
-              if (IsNum(data))
-                index = data;
-              else
-                encodingMap[index++] = data;
+            if (fontDict.has("Encoding")) {
+              var encoding = xref.fetchIfRef(fontDict.get("Encoding"));
+              if (IsDict(encoding)) {
+                var differences = encoding.get("Differences");
+                var index = 0;
+                for (var j = 0; j < differences.length; j++) {
+                  var data = differences[j];
+                  IsNum(data) ? index = data : encodingMap[index++] = data;
+                }
+              }
             }
 
+            var subtype = fontDict.get("Subtype").name;
             new Font(fontName, fontFile, encodingMap, subtype);
-            fontsReady = false;
-            break;
-          }
+            return fontsReady = false;
+        } else if (font.loading) {
+            return fontsReady = false;
         }
-      } else if (font.loading) {
-        fontsReady = false;
-        break;
-      }
-    }
+      });
 
     // If everything is ready do not delayed the page loading any more
     if (fontsReady)