Be more flexible about Subrs parsing

This commit is contained in:
Vivien Nicolas 2011-09-02 14:21:48 +02:00
parent 18661debdc
commit 5f99e398f4

View File

@ -1633,7 +1633,7 @@ var Type1Parser = function() {
getToken(); // read in 'array' getToken(); // read in 'array'
for (var j = 0; j < num; ++j) { for (var j = 0; j < num; ++j) {
var t = getToken(); // read in 'dup' var t = getToken(); // read in 'dup'
if (t == 'ND' || t == '|-') if (t == 'ND' || t == '|-' || t == 'noaccess')
break; break;
var index = parseInt(getToken()); var index = parseInt(getToken());
if (index > j) if (index > j)
@ -1645,7 +1645,9 @@ var Type1Parser = function() {
var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV); var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
var str = decodeCharString(encoded); var str = decodeCharString(encoded);
i = i + 1 + length; 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; program.subrs[index] = str.charstring;
} }
break; break;