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

Add XObjects fonts to the list of page fonts and has a forEach method to the Dict class

Browse Source
This commit is contained in:
Vivien Nicolas 2011-06-14 21:38:59 +02:00
parent 3625ac93a3
commit 363071aab9
3 changed files with 64 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PDFFont.js
View File

@ -580,9 +580,22 @@ var FontsUtils = {
* and valid in the point of view of the sanitizer.
*/
var TrueType = function(aFile) {
var header = this._readOpenTypeHeader(aFile);
this.data = aFile;
};
TrueType.prototype = {
_readOpenTypeHeader: function(aFile) {
return {
version: aFile.getBytes(4),
numTables: FontsUtils.bytesToInteger(aFile.getBytes(2)),
searchRange: FontsUtils.bytesToInteger(aFile.getBytes(2)),
entrySelector: FontsUtils.bytesToInteger(aFile.getBytes(2)),
rangeShift: FontsUtils.bytesToInteger(aFile.getBytes(2))
}
}
};
/**
* This dictionary holds decoded fonts data.
*/

34
pdf.js
View File

@ -563,6 +563,10 @@ var Dict = (function() {
set: function(key, value) {
this.map[key] = value;
},
forEach: function(aCallback) {
for (var key in this.map)
aCallback(key, this.map[key]);
},
toString: function() {
var keys = [];
for (var key in this.map)
@ -1404,16 +1408,30 @@ var Page = (function() {
},
get fonts() {
var xref = this.xref;
var fonts = [];
var resources = xref.fetchIfRef(this.resources);
var fontResource = resources.get("Font");
for (var id in fontResource.map) {
var res = xref.fetch(fontResource.get(id));
var descriptor = xref.fetch(res.get("FontDescriptor"));
fonts.push(descriptor.get("FontName").toString());
var fontsDict = new Dict();
// Get the fonts use on the page
var fontResources = resources.get("Font");
fontResources.forEach(function(fontKey, fontData) {
fontsDict.set(fontKey, xref.fetch(fontData))
});
// Get the fonts use on xobjects of the page if any
var xobjs = xref.fetchIfRef(resources.get("XObject"));
if (xobjs) {
xobjs.forEach(function(key, xobj) {
xobj = xref.fetchIfRef(xobj);
assertWellFormed(IsStream(xobj), "XObject should be a stream");
var xobjFonts = xobj.dict.get("Resources").get("Font");
xobjFonts.forEach(function(fontKey, fontData) {
fontsDict.set(fontKey, xref.fetch(fontData))
});
});
}
return shadow(this, "fonts", fonts);
return shadow(this, "fonts", fontsDict);
},
display: function(gfx) {
var xref = this.xref;

60
test.js
View File

@ -76,47 +76,37 @@ function displayPage(num) {
// of the page to be fully loaded before loading the page
var fontsReady = true;
var fonts = page.fonts;
for (var i = 0; i < fonts.length; i++) {
var fontName = fonts[i].replace("+", "_");
var font = Fonts[fontName];
if (!font) {
// load the new font
var xref = page.xref;
var resources = xref.fetchIfRef(page.resources);
var fontResource = resources.get("Font");
for (var id in fontResource.map) {
var res = xref.fetch(fontResource.get(id));
var descriptor = xref.fetch(res.get("FontDescriptor"));
var name = descriptor.get("FontName").toString();
if (name == fontName.replace("_", "+")) {
var subtype = res.get("Subtype").name;
var fontFile = page.xref.fetchIfRef(descriptor.get("FontFile"));
if (!fontFile)
fontFile = page.xref.fetchIfRef(descriptor.get("FontFile2"));
var xref = page.xref;
fonts.forEach(function(fontKey, fontDict) {
var descriptor = xref.fetch(fontDict.get("FontDescriptor"));
var fontName = descriptor.get("FontName").name;
fontName = fontName.replace("+", "_");
// Generate the custom cmap of the font
var encoding = xref.fetch(res.get("Encoding"));
var differences = encoding.get("Differences");
// Check if the font has been loaded or is still loading
var font = Fonts[fontName];
if (!font) {
var fontFile = xref.fetchIfRef(descriptor.get2("FontFile", "FontFile2"));
// Generate the custom cmap of the font if needed
var encodingMap = {};
var index = 0;
for (var j = 0; j < differences.length; j++) {
var data = differences[j];
if (IsNum(data))
index = data;
else
encodingMap[index++] = data;
if (fontDict.has("Encoding")) {
var encoding = xref.fetchIfRef(fontDict.get("Encoding"));
if (IsDict(encoding)) {
var differences = encoding.get("Differences");
var index = 0;
for (var j = 0; j < differences.length; j++) {
var data = differences[j];
IsNum(data) ? index = data : encodingMap[index++] = data;
}
}
}
var subtype = fontDict.get("Subtype").name;
new Font(fontName, fontFile, encodingMap, subtype);
fontsReady = false;
break;
}
return fontsReady = false;
} else if (font.loading) {
return fontsReady = false;
}
} else if (font.loading) {
fontsReady = false;
break;
}
}
});
// If everything is ready do not delayed the page loading any more
if (fontsReady)