Move some more font conversion into loadFont function to make type3 fonts work for now
This commit is contained in:
parent
e7894ca07d
commit
3d0e6da2ff
@ -164,6 +164,21 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|||||||
translated = { error: e };
|
translated = { error: e };
|
||||||
}
|
}
|
||||||
font.translated = translated;
|
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;
|
return font;
|
||||||
},
|
},
|
||||||
@ -195,19 +210,6 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|||||||
var loadedName = font.loadedName;
|
var loadedName = font.loadedName;
|
||||||
if (!font.sent) {
|
if (!font.sent) {
|
||||||
var data = font.translated;
|
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)
|
if (data instanceof Font)
|
||||||
data = data.export();
|
data = data.export();
|
||||||
|
Loading…
Reference in New Issue
Block a user