Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into zoom-bookmark
This commit is contained in:
notmasteryet
commit
7795d3fa4e
54
fonts.js
54
fonts.js
@ -1439,7 +1439,6 @@ var Type1Parser = function() {
|
||||
var charstring = [];
|
||||
var lsb = 0;
|
||||
var width = 0;
|
||||
var used = false;
|
||||
|
||||
var value = '';
|
||||
var count = array.length;
|
||||
@ -1458,7 +1457,7 @@ var Type1Parser = function() {
|
||||
for (var j = 0; j < argc; j++)
|
||||
charstring.push('drop');
|
||||
|
||||
// If the flex mechanishm is not used in a font program, Adobe
|
||||
// If the flex mechanism is not used in a font program, Adobe
|
||||
// state that that entries 0, 1 and 2 can simply be replace by
|
||||
// {}, which means that we can simply ignore them.
|
||||
if (index < 3) {
|
||||
@ -1467,6 +1466,7 @@ var Type1Parser = function() {
|
||||
|
||||
// This is the same things about hint replacement, if it is not used
|
||||
// entry 3 can be replaced by {3}
|
||||
// TODO support hint replacment
|
||||
if (index == 3) {
|
||||
charstring.push(3);
|
||||
i++;
|
||||
@ -1477,7 +1477,7 @@ var Type1Parser = function() {
|
||||
command = charStringDictionary['12'][escape];
|
||||
} else {
|
||||
// TODO Clean this code
|
||||
if (value == 13) {
|
||||
if (value == 13) { //hsbw
|
||||
if (charstring.length == 2) {
|
||||
lsb = charstring[0];
|
||||
width = charstring[1];
|
||||
@ -1509,7 +1509,7 @@ var Type1Parser = function() {
|
||||
} else if (command == -1) {
|
||||
error('Support for Type1 command ' + value +
|
||||
' (' + escape + ') is not implemented in charstring: ' +
|
||||
charString);
|
||||
charstring);
|
||||
}
|
||||
|
||||
value = command;
|
||||
@ -1535,7 +1535,11 @@ var Type1Parser = function() {
|
||||
* array extracted from and eexec encrypted block of data
|
||||
*/
|
||||
function readNumberArray(str, index) {
|
||||
var start = ++index;
|
||||
var start = index;
|
||||
while (str[index++] != '[')
|
||||
start++;
|
||||
start++;
|
||||
|
||||
var count = 0;
|
||||
while (str[index++] != ']')
|
||||
count++;
|
||||
@ -1569,7 +1573,9 @@ var Type1Parser = function() {
|
||||
subrs: [],
|
||||
charstrings: [],
|
||||
properties: {
|
||||
'private': {}
|
||||
'private': {
|
||||
'lenIV': 4
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -1592,9 +1598,12 @@ var Type1Parser = function() {
|
||||
};
|
||||
var c = eexecStr[i];
|
||||
|
||||
if ((glyphsSection || subrsSection) && c == 'R') {
|
||||
var data = eexec.slice(i + 3, i + 3 + length);
|
||||
var encoded = decrypt(data, kCharStringsEncryptionKey, 4);
|
||||
if ((glyphsSection || subrsSection) &&
|
||||
(token == 'RD' || token == '-|')) {
|
||||
i++;
|
||||
var data = eexec.slice(i, i + length);
|
||||
var lenIV = program.properties.private['lenIV'];
|
||||
var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
|
||||
var str = decodeCharString(encoded);
|
||||
|
||||
if (glyphsSection) {
|
||||
@ -1607,7 +1616,8 @@ var Type1Parser = function() {
|
||||
} else {
|
||||
program.subrs.push(str.charstring);
|
||||
}
|
||||
i += length + 3;
|
||||
i += length;
|
||||
token = '';
|
||||
} else if (c == ' ' || c == '\n') {
|
||||
length = parseInt(token);
|
||||
token = '';
|
||||
@ -1624,7 +1634,7 @@ var Type1Parser = function() {
|
||||
getToken(); // read in 'array'
|
||||
for (var j = 0; j < num; ++j) {
|
||||
var t = getToken(); // read in 'dup'
|
||||
if (t == 'ND')
|
||||
if (t == 'ND' || t == '|-' || t == 'noaccess')
|
||||
break;
|
||||
var index = parseInt(getToken());
|
||||
if (index > j)
|
||||
@ -1632,10 +1642,13 @@ var Type1Parser = function() {
|
||||
var length = parseInt(getToken());
|
||||
getToken(); // read in 'RD'
|
||||
var data = eexec.slice(i + 1, i + 1 + length);
|
||||
var encoded = decrypt(data, kCharStringsEncryptionKey, 4);
|
||||
var lenIV = program.properties.private['lenIV'];
|
||||
var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
|
||||
var str = decodeCharString(encoded);
|
||||
i = i + 1 + length;
|
||||
getToken(); //read in 'NP'
|
||||
t = getToken(); //read in 'NP'
|
||||
if (t == 'noaccess')
|
||||
getToken(); //read in 'put'
|
||||
program.subrs[index] = str.charstring;
|
||||
}
|
||||
break;
|
||||
@ -1646,7 +1659,7 @@ var Type1Parser = function() {
|
||||
case '/StemSnapH':
|
||||
case '/StemSnapV':
|
||||
program.properties.private[token.substring(1)] =
|
||||
readNumberArray(eexecStr, i + 2);
|
||||
readNumberArray(eexecStr, i + 1);
|
||||
break;
|
||||
case '/StdHW':
|
||||
case '/StdVW':
|
||||
@ -1654,6 +1667,7 @@ var Type1Parser = function() {
|
||||
readNumberArray(eexecStr, i + 2)[0];
|
||||
break;
|
||||
case '/BlueShift':
|
||||
case '/lenIV':
|
||||
case '/BlueFuzz':
|
||||
case '/BlueScale':
|
||||
case '/LanguageGroup':
|
||||
@ -1821,7 +1835,7 @@ var CFF = function(name, file, properties) {
|
||||
|
||||
// Decrypt the data blocks and retrieve it's content
|
||||
var eexecBlock = file.getBytes(length2);
|
||||
var data = type1Parser.extractFontProgram(eexecBlock, properties);
|
||||
var data = type1Parser.extractFontProgram(eexecBlock);
|
||||
for (var info in data.properties)
|
||||
properties[info] = data.properties[info];
|
||||
|
||||
@ -1929,7 +1943,7 @@ CFF.prototype = {
|
||||
return type2Charstrings;
|
||||
},
|
||||
|
||||
getType2Subrs: function cff_getType2Charstrings(type1Subrs) {
|
||||
getType2Subrs: function cff_getType2Subrs(type1Subrs) {
|
||||
var bias = 0;
|
||||
var count = type1Subrs.length;
|
||||
if (count < 1240)
|
||||
@ -1987,11 +2001,10 @@ CFF.prototype = {
|
||||
var cmd = map[command];
|
||||
assert(cmd, 'Unknow command: ' + command);
|
||||
|
||||
if (IsArray(cmd)) {
|
||||
if (IsArray(cmd))
|
||||
charstring.splice(i++, 1, cmd[0], cmd[1]);
|
||||
} else {
|
||||
else
|
||||
charstring[i] = cmd;
|
||||
}
|
||||
} else {
|
||||
// Type1 charstring use a division for number above 32000
|
||||
if (command > 32000) {
|
||||
@ -2110,7 +2123,8 @@ CFF.prototype = {
|
||||
ExpansionFactor: '\x0c\x18'
|
||||
};
|
||||
for (var field in fieldMap) {
|
||||
if (!properties.private.hasOwnProperty(field)) continue;
|
||||
if (!properties.private.hasOwnProperty(field))
|
||||
continue;
|
||||
var value = properties.private[field];
|
||||
|
||||
if (IsArray(value)) {
|
||||
|
||||
85
pdf.js
85
pdf.js
@ -1,4 +1,4 @@
|
||||
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
|
||||
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
|
||||
|
||||
'use strict';
|
||||
@ -18,6 +18,16 @@ function warn(msg) {
|
||||
log('Warning: ' + msg);
|
||||
}
|
||||
|
||||
function backtrace() {
|
||||
var stackStr;
|
||||
try {
|
||||
throw new Error();
|
||||
} catch (e) {
|
||||
stackStr = e.stack;
|
||||
}
|
||||
return stackStr.split('\n').slice(1).join('\n');
|
||||
}
|
||||
|
||||
function error(msg) {
|
||||
log(backtrace());
|
||||
throw new Error(msg);
|
||||
@ -44,23 +54,13 @@ function assertWellFormed(cond, msg) {
|
||||
malformed(msg);
|
||||
}
|
||||
|
||||
function backtrace() {
|
||||
var stackStr;
|
||||
try {
|
||||
throw new Error();
|
||||
} catch (e) {
|
||||
stackStr = e.stack;
|
||||
}
|
||||
return stackStr.split('\n').slice(1).join('\n');
|
||||
}
|
||||
|
||||
function shadow(obj, prop, value) {
|
||||
try {
|
||||
Object.defineProperty(obj, prop, { value: value,
|
||||
enumerable: true,
|
||||
configurable: true,
|
||||
writable: false });
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
obj.__defineGetter__(prop, function() {
|
||||
return value;
|
||||
});
|
||||
@ -185,7 +185,7 @@ var DecodeStream = (function() {
|
||||
var buffer2 = new Uint8Array(size);
|
||||
for (var i = 0; i < current; ++i)
|
||||
buffer2[i] = buffer[i];
|
||||
return this.buffer = buffer2;
|
||||
return (this.buffer = buffer2);
|
||||
},
|
||||
getByte: function decodestream_getByte() {
|
||||
var pos = this.pos;
|
||||
@ -197,11 +197,11 @@ var DecodeStream = (function() {
|
||||
return this.buffer[this.pos++];
|
||||
},
|
||||
getBytes: function decodestream_getBytes(length) {
|
||||
var pos = this.pos;
|
||||
var end, pos = this.pos;
|
||||
|
||||
if (length) {
|
||||
this.ensureBuffer(pos + length);
|
||||
var end = pos + length;
|
||||
end = pos + length;
|
||||
|
||||
while (!this.eof && this.bufferLength < end)
|
||||
this.readBlock();
|
||||
@ -213,7 +213,7 @@ var DecodeStream = (function() {
|
||||
while (!this.eof)
|
||||
this.readBlock();
|
||||
|
||||
var end = this.bufferLength;
|
||||
end = this.bufferLength;
|
||||
|
||||
// checking if bufferLength is still 0 then
|
||||
// the buffer has to be initialized
|
||||
@ -265,7 +265,7 @@ var FakeStream = (function() {
|
||||
function constructor(stream) {
|
||||
this.dict = stream.dict;
|
||||
DecodeStream.call(this);
|
||||
};
|
||||
}
|
||||
|
||||
constructor.prototype = Object.create(DecodeStream.prototype);
|
||||
constructor.prototype.readBlock = function() {
|
||||
@ -532,8 +532,8 @@ var FlateStream = (function() {
|
||||
|
||||
constructor.prototype.readBlock = function() {
|
||||
function repeat(stream, array, len, offset, what) {
|
||||
var repeat = stream.getBits(len) + offset;
|
||||
while (repeat-- > 0)
|
||||
var repeatLength = stream.getBits(len) + offset;
|
||||
while (repeatLength-- > 0)
|
||||
array[i++] = what;
|
||||
}
|
||||
|
||||
@ -821,8 +821,8 @@ var PredictorStream = (function() {
|
||||
currentRow[i] = up + c;
|
||||
else
|
||||
currentRow[i] = upLeft + c;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
error('Unsupported predictor: ' + predictor);
|
||||
break;
|
||||
@ -1621,6 +1621,7 @@ var CCITTFaxStream = (function() {
|
||||
|
||||
this.err = false;
|
||||
|
||||
var code1, code2, code3;
|
||||
if (this.nextLine2D) {
|
||||
for (var i = 0; codingLine[i] < columns; ++i)
|
||||
refLine[i] = codingLine[i];
|
||||
@ -1633,7 +1634,7 @@ var CCITTFaxStream = (function() {
|
||||
blackPixels = 0;
|
||||
|
||||
while (codingLine[this.codingPos] < columns) {
|
||||
var code1 = this.getTwoDimCode();
|
||||
code1 = this.getTwoDimCode();
|
||||
switch (code1) {
|
||||
case twoDimPass:
|
||||
this.addPixels(refLine[refPos + 1], blackPixels);
|
||||
@ -1641,9 +1642,8 @@ var CCITTFaxStream = (function() {
|
||||
refPos += 2;
|
||||
break;
|
||||
case twoDimHoriz:
|
||||
var code1 = 0, code2 = 0;
|
||||
code1 = code2 = 0;
|
||||
if (blackPixels) {
|
||||
var code3;
|
||||
do {
|
||||
code1 += (code3 = this.getBlackCode());
|
||||
} while (code3 >= 64);
|
||||
@ -1651,7 +1651,6 @@ var CCITTFaxStream = (function() {
|
||||
code2 += (code3 = this.getWhiteCode());
|
||||
} while (code3 >= 64);
|
||||
} else {
|
||||
var code3;
|
||||
do {
|
||||
code1 += (code3 = this.getWhiteCode());
|
||||
} while (code3 >= 64);
|
||||
@ -1831,7 +1830,6 @@ var CCITTFaxStream = (function() {
|
||||
this.eof = true;
|
||||
}
|
||||
} else if (this.err && this.eoline) {
|
||||
var code1;
|
||||
while (true) {
|
||||
code1 = this.lookBits(13);
|
||||
if (code1 == EOF) {
|
||||
@ -2403,7 +2401,7 @@ var Lexer = (function() {
|
||||
var floating = false;
|
||||
var str = ch;
|
||||
var stream = this.stream;
|
||||
do {
|
||||
for (;;) {
|
||||
ch = stream.lookChar();
|
||||
if (ch == '.' && !floating) {
|
||||
str += ch;
|
||||
@ -2421,7 +2419,7 @@ var Lexer = (function() {
|
||||
break;
|
||||
}
|
||||
stream.skip();
|
||||
} while (true);
|
||||
}
|
||||
var value = parseFloat(str);
|
||||
if (isNaN(value))
|
||||
error('Invalid floating point number: ' + value);
|
||||
@ -2541,7 +2539,7 @@ var Lexer = (function() {
|
||||
getHexString: function(ch) {
|
||||
var str = '';
|
||||
var stream = this.stream;
|
||||
while (1) {
|
||||
for (;;) {
|
||||
ch = stream.getChar();
|
||||
if (ch == '>') {
|
||||
break;
|
||||
@ -3378,15 +3376,15 @@ var Page = (function() {
|
||||
rotatePoint: function(x, y) {
|
||||
var rotate = this.rotate;
|
||||
switch (rotate) {
|
||||
default:
|
||||
case 0:
|
||||
return {x: x, y: this.height - y};
|
||||
case 180:
|
||||
return {x: this.width - x, y: y};
|
||||
case 90:
|
||||
return {x: this.width - y, y: this.height - x};
|
||||
case 270:
|
||||
return {x: y, y: x};
|
||||
case 0:
|
||||
default:
|
||||
return {x: x, y: this.height - y};
|
||||
}
|
||||
},
|
||||
getLinks: function() {
|
||||
@ -3548,7 +3546,7 @@ var Catalog = (function() {
|
||||
}
|
||||
},
|
||||
get destinations() {
|
||||
function fetchDestination(ref) {
|
||||
function fetchDestination(xref, ref) {
|
||||
var dest = xref.fetchIfRef(ref);
|
||||
return IsDict(dest) ? dest.get('D') : dest;
|
||||
}
|
||||
@ -3566,7 +3564,7 @@ var Catalog = (function() {
|
||||
obj = xref.fetchIfRef(nameDictionaryRef);
|
||||
obj.forEach(function(key, value) {
|
||||
if (!value) return;
|
||||
dests[key] = fetchDestination(value);
|
||||
dests[key] = fetchDestination(xref, value);
|
||||
});
|
||||
}
|
||||
if (nameTreeRef) {
|
||||
@ -3590,7 +3588,7 @@ var Catalog = (function() {
|
||||
}
|
||||
var names = obj.get('Names');
|
||||
for (i = 0, n = names.length; i < n; i += 2) {
|
||||
dests[names[i]] = fetchDestination(names[i + 1]);
|
||||
dests[names[i]] = fetchDestination(xref, names[i + 1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -4268,7 +4266,7 @@ var PartialEvaluator = (function() {
|
||||
} else if (IsName(encoding)) {
|
||||
baseEncoding = Encodings[encoding.name].slice();
|
||||
} else {
|
||||
error("Encoding is not a Name nor a Dict");
|
||||
error('Encoding is not a Name nor a Dict');
|
||||
}
|
||||
}
|
||||
|
||||
@ -4300,11 +4298,18 @@ var PartialEvaluator = (function() {
|
||||
var glyphsMap = {};
|
||||
for (var i = firstChar; i <= lastChar; i++) {
|
||||
var glyph = diffEncoding[i] || baseEncoding[i];
|
||||
if (glyph)
|
||||
glyphsMap[glyph] = encodingMap[i] = GlyphsUnicode[glyph] || i;
|
||||
if (glyph) {
|
||||
var index = GlyphsUnicode[glyph] || i;
|
||||
glyphsMap[glyph] = encodingMap[i] = index;
|
||||
|
||||
var kCmapGlyphOffset = 0xE000;
|
||||
if (index <= 0x1f || (index >= 127 && index <= 255))
|
||||
glyphsMap[glyph] = encodingMap[i] += kCmapGlyphOffset;
|
||||
}
|
||||
}
|
||||
|
||||
if (fontType == 'TrueType' && fontDict.has('ToUnicode') && differences) {
|
||||
if (fontType == 'TrueType' && fontDict.has('ToUnicode') &&
|
||||
differences) {
|
||||
var cmapObj = xref.fetchIfRef(fontDict.get('ToUnicode'));
|
||||
if (IsName(cmapObj)) {
|
||||
error('ToUnicode file cmap translation not implemented');
|
||||
@ -4803,8 +4808,8 @@ var CanvasGraphics = (function() {
|
||||
|
||||
size = (size <= kRasterizerMin) ? size * kScalePrecision : size;
|
||||
|
||||
var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold')
|
||||
: (fontObj.bold ? 'bold' : 'normal');
|
||||
var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold') :
|
||||
(fontObj.bold ? 'bold' : 'normal');
|
||||
|
||||
var italic = fontObj.italic ? 'italic' : 'normal';
|
||||
var rule = italic + ' ' + bold + ' ' + size + 'px "' + name + '"';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user