Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3529 from brendandahl/refactor-font2

Browse Source 
Move chars to glyphs conversion to the worker.
This commit is contained in:
Yury Delendik 2013-08-05 07:10:01 -07:00
commit 029b970871
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api.js
View File

@ -622,9 +622,9 @@ var WorkerTransport = (function WorkerTransportClosure() {
var font;
if ('error' in exportedData) {
font = new ErrorFont(exportedData.error);
warn('Error during font loading: ' + font.error);
this.commonObjs.resolve(id, font);
var error = exportedData.error;
warn('Error during font loading: ' + error);
this.commonObjs.resolve(id, error);
break;
} else {
font = new Font(exportedData);

7
src/canvas.js
View File

@ -1047,11 +1047,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
}
},
showText: function CanvasGraphics_showText(str, skipTextSelection) {
showText: function CanvasGraphics_showText(glyphs, skipTextSelection) {
var ctx = this.ctx;
var current = this.current;
var font = current.font;
var glyphs = font.charsToGlyphs(str);
var fontSize = current.fontSize;
var fontSizeScale = current.fontSizeScale;
var charSpacing = current.charSpacing;
@ -1246,15 +1245,13 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
if (textSelection)
spacingAccumulator += spacingLength;
} else if (isString(e)) {
} else {
var shownCanvasWidth = this.showText(e, true);
if (textSelection) {
canvasWidth += spacingAccumulator + shownCanvasWidth;
spacingAccumulator = 0;
}
} else {
error('TJ array element ' + e + ' is not string or num');
}
}

43
src/evaluator.js
View File

@ -333,6 +333,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var self = this;
var font = this.loadFont(fontName, fontRef, this.xref, resources,
operatorList);
this.state.font = font;
var loadedName = font.loadedName;
if (!font.sent) {
var fontData = font.translated.exportData();
@ -620,6 +621,29 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
self.buildPaintImageXObject(resources, args[0], true, operatorList);
args = [];
continue;
} else if (cmd === 'q') { // save
var old = this.state;
this.stateStack.push(this.state);
this.state = old.clone();
} else if (cmd === 'Q') { // restore
var prev = this.stateStack.pop();
if (prev) {
this.state = prev;
}
} else if (cmd === 'Tj') { // showText
args[0] = this.state.font.translated.charsToGlyphs(args[0]);
} else if (cmd === 'TJ') { // showSpacedText
var arr = args[0];
var arrLength = arr.length;
for (var i = 0; i < arrLength; ++i) {
if (isString(arr[i])) {
arr[i] = this.state.font.translated.charsToGlyphs(arr[i]);
}
}
} else if (cmd === '\'') { // nextLineShowText
args[0] = this.state.font.translated.charsToGlyphs(args[0]);
} else if (cmd === '"') { // nextLineSetSpacingShowText
args[2] = this.state.font.translated.charsToGlyphs(args[2]);
}
switch (fn) {
@ -1504,23 +1528,12 @@ var OperatorList = (function OperatorListClosure() {
var EvalState = (function EvalStateClosure() {
function EvalState() {
// Are soft masks and alpha values shapes or opacities?
this.alphaIsShape = false;
this.fontSize = 0;
this.textMatrix = IDENTITY_MATRIX;
this.leading = 0;
// Start of text line (in text coordinates)
this.lineX = 0;
this.lineY = 0;
// Character and word spacing
this.charSpacing = 0;
this.wordSpacing = 0;
this.textHScale = 1;
// Color spaces
this.fillColorSpace = null;
this.strokeColorSpace = null;
this.font = null;
}
EvalState.prototype = {
clone: function CanvasExtraState_clone() {
return Object.create(this);
},
};
return EvalState;
})();