(#840) fix font stretching and overlapping characters encoding

This commit is contained in:
notmasteryet 2011-12-01 20:56:26 -06:00
parent b958fd41d8
commit bb6e5c6e00
2 changed files with 14 additions and 6 deletions

View File

@ -575,7 +575,7 @@ var CanvasGraphics = (function canvasGraphics() {
ctx.scale(1, -1);
ctx.translate(current.x, -1 * current.y);
ctx.transform.apply(ctx, fontMatrix);
ctx.scale(1 / textHScale, 1);
ctx.scale(textHScale, 1);
},
getTextGeometry: function canvasGetTextGeometry() {
var geometry = {};
@ -651,7 +651,7 @@ var CanvasGraphics = (function canvasGraphics() {
ctx.transform.apply(ctx, current.textMatrix);
ctx.translate(current.x, current.y);
ctx.scale(1 / textHScale, 1);
ctx.scale(textHScale, 1);
for (var i = 0; i < glyphsLength; ++i) {
var glyph = glyphs[i];

View File

@ -1705,10 +1705,18 @@ var Font = (function Font() {
var cidToGidMap = properties.cidToGidMap || [];
var gidToCidMap = [0];
for (var j = cidToGidMap.length - 1; j >= 0; j--) {
var gid = cidToGidMap[j];
if (gid)
gidToCidMap[gid] = j;
if (cidToGidMap.length > 0) {
for (var j = cidToGidMap.length - 1; j >= 0; j--) {
var gid = cidToGidMap[j];
if (gid)
gidToCidMap[gid] = j;
}
// filling the gaps using CID above the CIDs currently used in font
var nextCid = cidToGidMap.length;
for (var i = 1; i < numGlyphs; i++) {
if (!gidToCidMap[i])
gidToCidMap[i] = nextCid++;
}
}
var glyphs = [], ids = [];