Merge pull request #219 from sbarman/font
Font code cleanup, avoid name collisions
This commit is contained in:
Andreas Gal
commit
d3979e4ac2
74
fonts.js
74
fonts.js
@ -23,17 +23,20 @@ var kMaxWaitForFontFace = 1000;
|
||||
|
||||
var Fonts = (function Fonts() {
|
||||
var kScalePrecision = 40;
|
||||
var fonts = Object.create(null);
|
||||
var fonts = [];
|
||||
|
||||
if (!isWorker) {
|
||||
var ctx = document.createElement('canvas').getContext('2d');
|
||||
ctx.scale(1 / kScalePrecision, 1);
|
||||
}
|
||||
|
||||
function Font(name, data, properties) {
|
||||
var fontCount = 0;
|
||||
|
||||
function FontInfo(name, data, properties) {
|
||||
this.name = name;
|
||||
this.data = data;
|
||||
this.properties = properties;
|
||||
this.id = fontCount++;
|
||||
this.loading = true;
|
||||
this.charsCache = Object.create(null);
|
||||
this.sizes = [];
|
||||
@ -45,24 +48,31 @@ var Fonts = (function Fonts() {
|
||||
|
||||
return {
|
||||
registerFont: function fonts_registerFont(fontName, data, properties) {
|
||||
fonts[fontName] = new Font(fontName, data, properties);
|
||||
var font = new FontInfo(fontName, data, properties);
|
||||
fonts.push(font);
|
||||
return font.id;
|
||||
},
|
||||
blacklistFont: function fonts_blacklistFont(fontName) {
|
||||
registerFont(fontName, null, {});
|
||||
var id = registerFont(fontName, null, {});
|
||||
markLoaded(fontName);
|
||||
return id;
|
||||
},
|
||||
lookup: function fonts_lookup(fontName) {
|
||||
return fonts[fontName];
|
||||
lookupById: function fonts_lookupById(id) {
|
||||
return fonts[id];
|
||||
},
|
||||
setActive: function fonts_setActive(fontName, size) {
|
||||
setActive: function fonts_setActive(fontName, fontObj, size) {
|
||||
// |current| can be null is fontName is a built-in font
|
||||
// (e.g. "sans-serif")
|
||||
if ((current = fonts[fontName])) {
|
||||
if (fontObj && (current = fonts[fontObj.id])) {
|
||||
charsCache = current.charsCache;
|
||||
var sizes = current.sizes;
|
||||
if (!(measureCache = sizes[size]))
|
||||
measureCache = sizes[size] = Object.create(null);
|
||||
} else {
|
||||
charsCache = null;
|
||||
measureCache = null
|
||||
}
|
||||
|
||||
ctx.font = (size * kScalePrecision) + 'px "' + fontName + '"';
|
||||
},
|
||||
charsToUnicode: function fonts_chars2Unicode(chars) {
|
||||
@ -116,9 +126,9 @@ var FontLoader = {
|
||||
|
||||
bind: function(fonts, callback) {
|
||||
function checkFontsLoaded() {
|
||||
for (var i = 0; i < fonts.length; i++) {
|
||||
var font = fonts[i];
|
||||
if (Fonts.lookup(font.name).loading) {
|
||||
for (var i = 0; i < allIds.length; i++) {
|
||||
var id = allIds[i];
|
||||
if (Fonts.lookupById(id).loading) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -130,14 +140,18 @@ var FontLoader = {
|
||||
return true;
|
||||
}
|
||||
|
||||
var rules = [], names = [];
|
||||
var allIds = [];
|
||||
var rules = [], names = [], ids = [];
|
||||
|
||||
for (var i = 0; i < fonts.length; i++) {
|
||||
var font = fonts[i];
|
||||
if (!Fonts.lookup(font.name)) {
|
||||
|
||||
var obj = new Font(font.name, font.file, font.properties);
|
||||
font.fontDict.fontObj = obj;
|
||||
allIds.push(obj.id);
|
||||
|
||||
var str = '';
|
||||
var data = Fonts.lookup(font.name).data;
|
||||
var data = Fonts.lookupById(obj.id).data;
|
||||
var length = data.length;
|
||||
for (var j = 0; j < length; j++)
|
||||
str += String.fromCharCode(data[j]);
|
||||
@ -145,13 +159,14 @@ var FontLoader = {
|
||||
var rule = isWorker ? obj.bindWorker(str) : obj.bindDOM(str);
|
||||
if (rule) {
|
||||
rules.push(rule);
|
||||
names.push(font.name);
|
||||
}
|
||||
names.push(obj.loadedName);
|
||||
ids.push(obj.id);
|
||||
}
|
||||
}
|
||||
|
||||
this.listeningForFontLoad = false;
|
||||
if (!isWorker && rules.length) {
|
||||
FontLoader.prepareFontLoadEvent(rules, names);
|
||||
FontLoader.prepareFontLoadEvent(rules, names, ids);
|
||||
}
|
||||
|
||||
if (!checkFontsLoaded()) {
|
||||
@ -166,7 +181,7 @@ var FontLoader = {
|
||||
// loaded in a subdocument. It's expected that the load of |rules|
|
||||
// has already started in this (outer) document, so that they should
|
||||
// be ordered before the load in the subdocument.
|
||||
prepareFontLoadEvent: function(rules, names) {
|
||||
prepareFontLoadEvent: function(rules, names, ids) {
|
||||
/** Hack begin */
|
||||
// There's no event when a font has finished downloading so the
|
||||
// following code is a dirty hack to 'guess' when a font is
|
||||
@ -202,13 +217,13 @@ var FontLoader = {
|
||||
div.innerHTML = html;
|
||||
document.body.appendChild(div);
|
||||
|
||||
if (!this.listeneningForFontLoad) {
|
||||
if (!this.listeningForFontLoad) {
|
||||
window.addEventListener(
|
||||
'message',
|
||||
function(e) {
|
||||
var fontNames = JSON.parse(e.data);
|
||||
for (var i = 0; i < fontNames.length; ++i) {
|
||||
var font = Fonts.lookup(fontNames[i]);
|
||||
var font = Fonts.lookupById(ids[i]);
|
||||
font.loading = false;
|
||||
}
|
||||
var evt = document.createEvent('Events');
|
||||
@ -216,7 +231,7 @@ var FontLoader = {
|
||||
document.documentElement.dispatchEvent(evt);
|
||||
},
|
||||
false);
|
||||
this.listeneningForFontLoad = true;
|
||||
this.listeningForFontLoad = true;
|
||||
}
|
||||
|
||||
// XXX we should have a time-out here too, and maybe fire
|
||||
@ -400,16 +415,11 @@ var Font = (function() {
|
||||
this.name = name;
|
||||
this.encoding = properties.encoding;
|
||||
|
||||
// If the font has already been decoded simply return it
|
||||
if (Fonts.lookup(name)) {
|
||||
this.font = Fonts.lookup(name).data;
|
||||
return;
|
||||
}
|
||||
|
||||
// If the font is to be ignored, register it like an already loaded font
|
||||
// to avoid the cost of waiting for it be be loaded by the platform.
|
||||
if (properties.ignore) {
|
||||
Fonts.blacklistFont(name);
|
||||
this.id = Fonts.blacklistFont(name);
|
||||
this.loadedName = 'pdfFont' + this.id;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -436,7 +446,9 @@ var Font = (function() {
|
||||
break;
|
||||
}
|
||||
this.data = data;
|
||||
Fonts.registerFont(name, data, properties);
|
||||
|
||||
this.id = Fonts.registerFont(name, data, properties);
|
||||
this.loadedName = 'pdfFont' + this.id;
|
||||
};
|
||||
|
||||
function stringToArray(str) {
|
||||
@ -1116,14 +1128,14 @@ var Font = (function() {
|
||||
action: 'font',
|
||||
data: {
|
||||
raw: data,
|
||||
fontName: this.name,
|
||||
fontName: this.loadedName,
|
||||
mimetype: this.mimetype
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
bindDOM: function font_bindDom(data) {
|
||||
var fontName = this.name;
|
||||
var fontName = this.loadedName;
|
||||
|
||||
// Add the font-face rule to the document
|
||||
var url = ('url(data:' + this.mimetype + ';base64,' +
|
||||
|
||||
23
pdf.js
23
pdf.js
@ -3610,6 +3610,7 @@ var CanvasGraphics = (function() {
|
||||
|
||||
return {
|
||||
name: fontName,
|
||||
fontDict: fontDict,
|
||||
file: fontFile,
|
||||
properties: properties
|
||||
};
|
||||
@ -3873,25 +3874,23 @@ var CanvasGraphics = (function() {
|
||||
return;
|
||||
|
||||
var fontName = '';
|
||||
var fontDescriptor = font.get('FontDescriptor');
|
||||
if (fontDescriptor && fontDescriptor.num) {
|
||||
var fontDescriptor = this.xref.fetchIfRef(fontDescriptor);
|
||||
fontName = fontDescriptor.get('FontName').name.replace('+', '_');
|
||||
}
|
||||
var fontObj = font.fontObj;
|
||||
if (fontObj)
|
||||
fontName = fontObj.loadedName;
|
||||
|
||||
if (!fontName) {
|
||||
// TODO: fontDescriptor is not available, fallback to default font
|
||||
fontName = 'sans-serif';
|
||||
}
|
||||
|
||||
this.current.fontName = fontName;
|
||||
this.current.font = fontObj;
|
||||
this.current.fontSize = size;
|
||||
|
||||
if (this.ctx.$setFont) {
|
||||
this.ctx.$setFont(fontName, size);
|
||||
} else {
|
||||
this.ctx.font = size + 'px "' + fontName + '"';
|
||||
Fonts.setActive(fontName, size);
|
||||
Fonts.setActive(fontName, fontObj, size);
|
||||
}
|
||||
},
|
||||
setTextRenderingMode: function(mode) {
|
||||
@ -3936,10 +3935,12 @@ var CanvasGraphics = (function() {
|
||||
text = Fonts.charsToUnicode(text);
|
||||
this.ctx.translate(this.current.x, -1 * this.current.y);
|
||||
|
||||
var font = Fonts.lookup(this.current.fontName);
|
||||
if (font && font.properties.textMatrix)
|
||||
this.ctx.transform.apply(this.ctx, font.properties.textMatrix);
|
||||
|
||||
var font = this.current.font;
|
||||
if (font) {
|
||||
var fontInfo = Fonts.lookupById(font.id);
|
||||
if (fontInfo && fontInfo.properties.textMatrix)
|
||||
this.ctx.transform.apply(this.ctx, fontInfo.properties.textMatrix);
|
||||
}
|
||||
this.ctx.fillText(text, 0, 0);
|
||||
this.current.x += Fonts.measureText(text);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user