From 792ef1b14dc7f48b3828d61cbcae0539ad95ece2 Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Fri, 20 Jul 2012 15:53:39 -0700 Subject: [PATCH] Support div number format for seac operator. --- src/fonts.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/fonts.js b/src/fonts.js index 6589901bd..7b2dfbd4a 100644 --- a/src/fonts.js +++ b/src/fonts.js @@ -3429,7 +3429,8 @@ var Type1Parser = function type1Parser() { for (var i = 0; i < numArgs; i++) { if (index < 0) { args.unshift({ arg: [0], - value: 0 }); + value: 0, + offset: 0 }); warn('Malformed charstring stack: not enough values on stack.'); continue; } @@ -3443,11 +3444,13 @@ var Type1Parser = function type1Parser() { b = 1; } args.unshift({ arg: [a, b, 'div'], - value: a / b }); + value: a / b, + offset: index - 2 }); index -= 3; } else if (isInt(token)) { args.unshift({ arg: stack.slice(index, index + 1), - value: token }); + value: token, + offset: index }); index--; } else { warn('Malformed charsting stack: found bad token ' + token + '.'); @@ -3501,7 +3504,9 @@ var Type1Parser = function type1Parser() { } else if (escape == 6) { // seac is like type 2's special endchar but it doesn't use the // first argument asb, so remove it. - charstring.splice(charstring.length - 5, 1); + var args = breakUpArgs(charstring, 5); + var arg0 = args[0]; + charstring.splice(arg0.offset, arg0.arg.length); } else if (!kHintingEnabled && (escape == 1 || escape == 2)) { charstring.push('drop', 'drop', 'drop', 'drop', 'drop', 'drop'); continue;