akira
/
pdfjs-dist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #96 from vingtetun/master 

Fix windows/mac font loading detection. r=gal
Andreas Gal 14 years ago
parent
f08bff5578 db5c454ca1
commit
94dae7e570
4 changed files with 78 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 125
      fonts.js
  2. 12
      utils/fonts_utils.js
  3. 4
      viewer.html
  4. 7
      viewer.js

125
fonts.js
Unescape View File

@ -787,7 +787,7 @@ var Font = (function () {
// This code could go away when bug 471915 has landed // This code could go away when bug 471915 has landed
var canvas = document.createElement("canvas"); var canvas = document.createElement("canvas");
var ctx = canvas.getContext("2d"); var ctx = canvas.getContext("2d");
ctx.font = "bold italic 20px " + fontName + ", Symbol"; ctx.font = "bold italic 20px " + fontName + ", Symbol, Arial";
var testString = " "; var testString = " ";
// Periodicaly check for the width of the testString, it will be // Periodicaly check for the width of the testString, it will be
@ -796,7 +796,7 @@ var Font = (function () {
var interval = window.setInterval(function canvasInterval(self) { var interval = window.setInterval(function canvasInterval(self) {
this.start = this.start || Date.now(); this.start = this.start || Date.now();
ctx.font = "bold italic 20px " + fontName + ", Symbol"; ctx.font = "bold italic 20px " + fontName + ", Symbol, Arial";
// For some reasons the font has not loaded, so mark it loaded for the // For some reasons the font has not loaded, so mark it loaded for the
// page to proceed but cry // page to proceed but cry
@ -976,6 +976,7 @@ var Type1Parser = function() {
"6": -1, // seac "6": -1, // seac
"7": -1, //sbw "7": -1, //sbw
"11": "sub",
"12": "div", "12": "div",
// callothersubr is a mechanism to make calls on the postscript // callothersubr is a mechanism to make calls on the postscript
@ -1288,6 +1289,11 @@ CFF.prototype = {
"hlineto": 6, "hlineto": 6,
"vlineto": 7, "vlineto": 7,
"rrcurveto": 8, "rrcurveto": 8,
"callsubr": 10,
"return": 11,
"sub": [12, 11],
"div": [12, 12],
"pop": [1, 12, 18],
"endchar": 14, "endchar": 14,
"rmoveto": 21, "rmoveto": 21,
"hmoveto": 22, "hmoveto": 22,
@ -1295,7 +1301,7 @@ CFF.prototype = {
"hvcurveto": 31, "hvcurveto": 31,
}, },
flattenCharstring: function flattenCharstring(charstring, subrs) { flattenCharstring: function flattenCharstring(charstring) {
var i = 0; var i = 0;
while (true) { while (true) {
var obj = charstring[i]; var obj = charstring[i];
@ -1304,62 +1310,39 @@ CFF.prototype = {
if (obj.charAt) { if (obj.charAt) {
switch (obj) { switch (obj) {
case "callsubr":
var subr = subrs[charstring[i - 1]];
if (subr.length > 1) {
subr = this.flattenCharstring(subr, subrs);
subr.pop();
charstring.splice(i - 1, 2, subr);
} else {
charstring.splice(i - 1, 2);
}
i -= 1;
break;
case "callothersubr": case "callothersubr":
var index = charstring[i - 1]; var index = charstring[i - 1];
var count = charstring[i - 2]; var count = charstring[i - 2];
var data = charstring[i - 3]; var data = charstring[i - 3];
// XXX The callothersubr needs to support at least the 3 defaults // If the flex mechanishm is not used in a font program, Adobe
// otherSubrs of the spec // state that that entries 0, 1 and 2 can simply be replace by
if (index != 3) // {}, which means that we can simply ignore them.
error("callothersubr for index: " + index + " (" + charstring + ")"); if (index < 3) {
i -= 3;
continue;
}
// This is the same things about hint replacment, if it is not used
// entry 3 can be replaced by {}
if (index == 3) {
if (!data) { if (!data) {
charstring.splice(i - 2, 4, "pop", 3); charstring.splice(i - 2, 4, 3);
i -= 3; i -= 3;
} else { } else {
// 5 to remove the arguments, the callothersubr call and the pop command // 5 to remove the arguments, the callothersubr call and the pop command
charstring.splice(i - 3, 5, 3); charstring.splice(i - 3, 5, 3);
i -= 3; i -= 3;
} }
}
break; break;
case "div":
var num2 = charstring[i - 1];
var num1 = charstring[i - 2];
charstring.splice(i - 2, 3, num1 / num2);
i -= 2;
break;
case "pop":
if (i)
charstring.splice(i - 2, 2);
else
charstring.splice(i - 1, 1);
i -= 1;
break;
case "hsbw": case "hsbw":
var charWidthVector = charstring[i - 1]; var charWidthVector = charstring[1];
var leftSidebearing = charstring[i - 2]; var leftSidebearing = charstring[0];
if (leftSidebearing) charstring.splice(i, 1, leftSidebearing, "hmoveto");
charstring.splice(i - 2, 3, charWidthVector, leftSidebearing, "hmoveto"); charstring.splice(0, 1);
else
charstring.splice(i - 2, 3, charWidthVector);
break; break;
case "endchar": case "endchar":
@ -1371,21 +1354,16 @@ CFF.prototype = {
charstring.splice(j, 1, 28, command >> 8, command); charstring.splice(j, 1, 28, command >> 8, command);
j+= 2; j+= 2;
} else if (command.charAt) { } else if (command.charAt) {
var command = this.commandsMap[command]; var cmd = this.commandsMap[command];
if (IsArray(command)) { if (!cmd)
charstring.splice(j - 1, 1, command[0], command[1]); error(command);
if (IsArray(cmd)) {
charstring.splice(j, 1, cmd[0], cmd[1]);
j += 1; j += 1;
} else { } else {
charstring[j] = command; charstring[j] = cmd;
} }
} else {
charstring.splice(j, 1);
// command has already been translated, just add them to the
// charstring directly
for (var k = 0; k < command.length; k++)
charstring.splice(j + k, 0, command[k]);
j+= command.length - 1;
} }
} }
return charstring; return charstring;
@ -1406,7 +1384,7 @@ CFF.prototype = {
var glyphsCount = charstrings.length; var glyphsCount = charstrings.length;
for (var i = 0; i < glyphsCount; i++) { for (var i = 0; i < glyphsCount; i++) {
var charstring = charstrings[i].charstring; var charstring = charstrings[i].charstring;
glyphs.push(this.flattenCharstring(charstring.slice(), subrs)); glyphs.push(this.flattenCharstring(charstring.slice()));
} }
// Create a CFF font data // Create a CFF font data
@ -1511,22 +1489,35 @@ CFF.prototype = {
247, 32, 11, 247, 32, 11,
247, 10, 161, 147, 154, 150, 143, 12, 13, 247, 10, 161, 147, 154, 150, 143, 12, 13,
139, 12, 14, 139, 12, 14,
28, 0, 55, 19 28, 0, 55, 19 // Subrs offset
]); ]);
cff.set(privateData, currentOffset); cff.set(privateData, currentOffset);
currentOffset += privateData.length; currentOffset += privateData.length;
// Dump shit at the end of the file // Local Subrs
var shit = [ var flattenedSubrs = [];
0x00, 0x01, 0x01, 0x01,
0x13, 0x5D, 0x65, 0x64, var bias = 0;
0x5E, 0x5B, 0xAF, 0x66, var subrsCount = subrs.length;
0xBA, 0xBB, 0xB1, 0xB0, if (subrsCount < 1240)
0xB9, 0xBA, 0x65, 0xB2, bias = 107;
0x5C, 0x1F, 0x0B else if (subrsCount < 33900)
]; bias = 1131;
cff.set(shit, currentOffset); else
currentOffset += shit.length; bias = 32768;
// Add a bunch of empty subrs to deal with the Type2 bias
for (var i = 0; i < bias; i++)
flattenedSubrs.push([0x0B]);
for (var i = 0; i < subrsCount; i++) {
var subr = subrs[i];
flattenedSubrs.push(this.flattenCharstring(subr));
}
var subrsData = this.createCFFIndexHeader(flattenedSubrs, true);
cff.set(subrsData, currentOffset);
currentOffset += subrsData.length;
var fontData = []; var fontData = [];
for (var i = 0; i < currentOffset; i++) for (var i = 0; i < currentOffset; i++)

12
utils/fonts_utils.js
Unescape View File

@ -194,6 +194,8 @@ function readFontIndexData(aStream, aIsByte) {
return aStream.getByte() << 24 | aStream.getByte() << 16 | return aStream.getByte() << 24 | aStream.getByte() << 16 |
aStream.getByte() << 8 | aStream.getByte(); aStream.getByte() << 8 | aStream.getByte();
} }
error(offsize + " is not a valid offset size");
return null;
}; };
var offsets = []; var offsets = [];
@ -320,12 +322,12 @@ var Type2Parser = function(aFilePath) {
dump(subrs); dump(subrs);
// Reading Private Dict // Reading Private Dict
var private = font.get("Private"); var priv = font.get("Private");
log("Reading Private Dict (offset: " + private.offset + " size: " + private.size + ")"); log("Reading Private Dict (offset: " + priv.offset + " size: " + priv.size + ")");
aStream.pos = private.offset; aStream.pos = priv.offset;
var privateDict = []; var privateDict = [];
for (var i = 0; i < private.size; i++) for (var i = 0; i < priv.size; i++)
privateDict.push(aStream.getByte()); privateDict.push(aStream.getByte());
dump("private:" + privateDict); dump("private:" + privateDict);
parseAsToken(privateDict, CFFDictPrivateDataMap); parseAsToken(privateDict, CFFDictPrivateDataMap);
@ -386,7 +388,7 @@ function writeToFile(aBytes, aFilePath) {
var stream = Cc["@mozilla.org/network/file-output-stream;1"] var stream = Cc["@mozilla.org/network/file-output-stream;1"]
.createInstance(Ci.nsIFileOutputStream); .createInstance(Ci.nsIFileOutputStream);
stream.init(file, 0x04 | 0x08 | 0x20, 0600, 0); stream.init(file, 0x04 | 0x08 | 0x20, 600, 0);
var bos = Cc["@mozilla.org/binaryoutputstream;1"] var bos = Cc["@mozilla.org/binaryoutputstream;1"]
.createInstance(Ci.nsIBinaryOutputStream); .createInstance(Ci.nsIBinaryOutputStream);

4
viewer.html
Unescape View File

@ -5,6 +5,7 @@
<script type="text/javascript" src="viewer.js"></script> <script type="text/javascript" src="viewer.js"></script>
<script type="text/javascript" src="pdf.js"></script> <script type="text/javascript" src="pdf.js"></script>
<script type="text/javascript" src="utils/fonts_utils.js"></script>
<script type="text/javascript" src="fonts.js"></script> <script type="text/javascript" src="fonts.js"></script>
<script type="text/javascript" src="crypto.js"></script> <script type="text/javascript" src="crypto.js"></script>
<script type="text/javascript" src="glyphlist.js"></script> <script type="text/javascript" src="glyphlist.js"></script>
@ -26,8 +27,7 @@
<div id="viewer"> <div id="viewer">
<!-- Canvas dimensions must be specified in CSS pixels. CSS pixels <!-- Canvas dimensions must be specified in CSS pixels. CSS pixels
are always 96 dpi. 816x1056 is 8.5x11in at 96dpi. --> are always 96 dpi. 816x1056 is 8.5x11in at 96dpi. -->
<!-- We're rendering here at 1.5x scale. --> <canvas id="canvas" width="816" height="1056" defaultwidth="816" defaultheight="1056"></canvas>
<canvas id="canvas" width="1224" height="1584"></canvas>
</div> </div>
</body> </body>
</html> </html>

7
viewer.js
Unescape View File

@ -3,11 +3,12 @@
"use strict"; "use strict";
var pdfDocument, canvas, pageDisplay, pageNum, numPages, pageTimeout; var pdfDocument, canvas, pageScale, pageDisplay, pageNum, numPages, pageTimeout;
function load(userInput) { function load(userInput) {
canvas = document.getElementById("canvas"); canvas = document.getElementById("canvas");
canvas.mozOpaque = true; canvas.mozOpaque = true;
pageNum = parseInt(queryParams().page) || 1; pageNum = ("page" in queryParams()) ? parseInt(queryParams().page) : 1;
pageScale = ("scale" in queryParams()) ? parseInt(queryParams().scale) : 1.5;
var fileName = userInput; var fileName = userInput;
if (!userInput) { if (!userInput) {
fileName = queryParams().file || "compressed.tracemonkey-pldi-09.pdf"; fileName = queryParams().file || "compressed.tracemonkey-pldi-09.pdf";
@ -59,6 +60,8 @@ function displayPage(num) {
var t0 = Date.now(); var t0 = Date.now();
var page = pdfDocument.getPage(pageNum = num); var page = pdfDocument.getPage(pageNum = num);
canvas.width = parseInt(canvas.getAttribute("defaultwidth")) * pageScale;
canvas.height = parseInt(canvas.getAttribute("defaultheight")) * pageScale;
// scale canvas by 2 // scale canvas by 2
canvas.width = 2 * page.mediaBox[2]; canvas.width = 2 * page.mediaBox[2];

Write Preview
Loading…
Cancel
Save