From 3d0e6da2ffd6423a73b984031f17d056175b4eb1 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sun, 16 Sep 2012 09:18:46 -0700
Subject: [PATCH] Move some more font conversion into loadFont function to make
 type3 fonts work for now

---
 src/evaluator.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/evaluator.js b/src/evaluator.js
index 2bf261913..39c92a59f 100644
--- a/src/evaluator.js
+++ b/src/evaluator.js
@@ -164,6 +164,21 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
           translated = { error: e };
         }
         font.translated = translated;
+
+        var data = translated;
+        if (data.loadCharProcs) {
+          delete data.loadCharProcs;
+
+          var charProcs = font.get('CharProcs').getAll();
+          var fontResources = font.get('Resources') || resources;
+          var charProcOperatorList = {};
+          for (var key in charProcs) {
+            var glyphStream = charProcs[key];
+            charProcOperatorList[key] =
+              this.getOperatorList(glyphStream, fontResources, dependency);
+          }
+          data.charProcOperatorList = charProcOperatorList;
+        }
       }
       return font;
     },
@@ -195,19 +210,6 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
         var loadedName = font.loadedName;
         if (!font.sent) {
           var data = font.translated;
-          if (data.loadCharProcs) {
-            delete data.loadCharProcs;
-
-            var charProcs = font.get('CharProcs').getAll();
-            var fontResources = font.get('Resources') || resources;
-            var charProcOperatorList = {};
-            for (var key in charProcs) {
-              var glyphStream = charProcs[key];
-              charProcOperatorList[key] =
-                self.getOperatorList(glyphStream, fontResources, dependency);
-            }
-            data.charProcOperatorList = charProcOperatorList;
-          }
 
           if (data instanceof Font)
             data = data.export();