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

simplify font measurement code, bug is now fixed in nightlies, no need to hack around it

Browse Source
This commit is contained in:
Andreas Gal 2011-07-08 19:28:24 -07:00
parent 7e42cf781b
commit adb619941c
2 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fonts.js
View File

@ -22,14 +22,7 @@ var kMaxWaitForFontFace = 1000;
*/ */
var Fonts = (function Fonts() { var Fonts = (function Fonts() {
var kScalePrecision = 40;
var fonts = []; var fonts = [];
if (!isWorker) {
var ctx = document.createElement('canvas').getContext('2d');
ctx.scale(1 / kScalePrecision, 1);
}
var fontCount = 0; var fontCount = 0;
function FontInfo(name, data, properties) { function FontInfo(name, data, properties) {
@ -42,7 +35,6 @@ var Fonts = (function Fonts() {
} }
var current; var current;
var measureCache;
return { return {
registerFont: function fonts_registerFont(fontName, data, properties) { registerFont: function fonts_registerFont(fontName, data, properties) {
@ -57,28 +49,6 @@ var Fonts = (function Fonts() {
}, },
lookupById: function fonts_lookupById(id) { lookupById: function fonts_lookupById(id) {
return fonts[id]; return fonts[id];
},
setActive: function fonts_setActive(fontName, fontObj, size) {
// |current| can be null is fontName is a built-in font
// (e.g. "sans-serif")
if (fontObj && (current = fonts[fontObj.id])) {
var sizes = current.sizes;
if (!(measureCache = sizes[size]))
measureCache = sizes[size] = Object.create(null);
} else {
measureCache = null
}
ctx.font = (size * kScalePrecision) + 'px "' + fontName + '"';
},
measureText: function fonts_measureText(text) {
var width;
if (measureCache && (width = measureCache[text]))
return width;
width = ctx.measureText(text).width / kScalePrecision;
if (measureCache)
measureCache[text] = width;
return width;
} }
}; };
})(); })();
@ -1110,7 +1080,7 @@ var Font = (function() {
return rule; return rule;
}, },
charsToUnicode: function fonts_chars2Unicode(chars) { charsToUnicode: function fonts_charsToUnicode(chars) {
var charsCache = this.charsCache; var charsCache = this.charsCache;
// if we translated this string before, just grab it from the cache // if we translated this string before, just grab it from the cache

30
pdf.js
View File

@ -3972,7 +3972,6 @@ var CanvasGraphics = (function() {
this.ctx.$setFont(fontName, size); this.ctx.$setFont(fontName, size);
} else { } else {
this.ctx.font = size + 'px "' + fontName + '"'; this.ctx.font = size + 'px "' + fontName + '"';
Fonts.setActive(fontName, fontObj, size);
} }
}, },
setTextRenderingMode: function(mode) { setTextRenderingMode: function(mode) {
@ -4010,24 +4009,25 @@ var CanvasGraphics = (function() {
var ctx = this.ctx; var ctx = this.ctx;
var current = this.current; var current = this.current;
ctx.save();
ctx.transform.apply(ctx, current.textMatrix);
ctx.scale(1, -1);
if (this.ctx.$showText) { if (this.ctx.$showText) {
ctx.$showText(current.y, text); ctx.$showText(current.y, text);
} else { } else {
ctx.translate(current.x, -1 * current.y); ctx.save();
var font = this.current.font;
if (font) {
ctx.transform.apply(ctx, font.textMatrix);
text = font.charsToUnicode(text);
}
ctx.fillText(text, 0, 0);
current.x += Fonts.measureText(text);
}
this.ctx.restore(); ctx.transform.apply(ctx, current.textMatrix);
ctx.scale(1, -1);
ctx.translate(current.x, -1 * current.y);
var font = current.font;
ctx.transform.apply(ctx, font.textMatrix);
text = font.charsToUnicode(text);
ctx.fillText(text, 0, 0);
current.x += ctx.measureText(text).width;
ctx.restore();
}
}, },
showSpacedText: function(arr) { showSpacedText: function(arr) {
for (var i = 0; i < arr.length; ++i) { for (var i = 0; i < arr.length; ++i) {