mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 01:58:06 +02:00
Code Activity

Merge pull request #3570 from brendandahl/encoding-wip

Browse source 
Fix handling of multiply-encoded glyphs.
This commit is contained in:
Yury Delendik 2013-08-28 13:51:39 -07:00
commit 0fc8bac7c0
3 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/core/fonts.js
View file

@ -4132,7 +4132,7 @@ var Font = (function FontClosure() {
properties.seacMap = seacMap;
}
if (!properties.hasEncoding && (properties.subtype == 'Type1C' ||
if (properties.overridableEncoding && (properties.subtype == 'Type1C' ||
properties.subtype == 'CIDFontType0C')) {
var encoding = [];
for (var i = 0; i < charstrings.length; ++i) {
@ -5538,8 +5538,20 @@ var CFFFont = (function CFFFontClosure() {
}
}
} else {
for (var charcode in encoding)
inverseEncoding[encoding[charcode]] = charcode | 0;
for (var charcode in encoding) {
var gid = encoding[charcode];
if (gid in inverseEncoding) {
// Glyphs can be multiply-encoded if there was an encoding
// supplement. Convert to an array and append the charcode.
var previousCharcode = inverseEncoding[gid];
if (!isArray(previousCharcode)) {
inverseEncoding[gid] = [previousCharcode];
}
inverseEncoding[gid].push(charcode | 0);
} else {
inverseEncoding[gid] = charcode | 0;
}
}
if (charsets[0] === '.notdef') {
gidStart = 1;
}
@ -5548,22 +5560,30 @@ var CFFFont = (function CFFFontClosure() {
for (var i = gidStart, ii = charsets.length; i < ii; i++) {
var glyph = charsets[i];
var code = inverseEncoding[i];
if (!code || isSpecialUnicode(code)) {
unassignedUnicodeItems.push(i);
continue;
var codes = inverseEncoding[i];
if (!isArray(codes)) {
codes = [codes];
}
for (var j = 0; j < codes.length; j++) {
var code = codes[j];
if (!code || isSpecialUnicode(code)) {
unassignedUnicodeItems.push(i, code);
continue;
}
charstrings.push({
unicode: code,
code: code,
gid: i,
glyph: glyph
});
unicodeUsed[code] = true;
}
charstrings.push({
unicode: code,
code: code,
gid: i,
glyph: glyph
});
unicodeUsed[code] = true;
}
var nextUnusedUnicode = CMAP_GLYPH_OFFSET;
for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; ++j) {
for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; j += 2) {
var i = unassignedUnicodeItems[j];
// giving unicode value anyway
while (nextUnusedUnicode in unicodeUsed)
@ -5571,7 +5591,7 @@ var CFFFont = (function CFFFontClosure() {
var unicode = nextUnusedUnicode++;
charstrings.push({
unicode: unicode,
code: inverseEncoding[i] || 0,
code: unassignedUnicodeItems[j + 1] || 0,
gid: i,
glyph: charsets[i]
});
@ -6140,7 +6160,7 @@ var CFFParser = (function CFFParserClosure() {
for (var i = 0; i < supplementsCount; i++) {
var code = bytes[pos++];
var sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
encoding[code] = properties.differences.indexOf(strings.get(sid));
encoding[code] = charset.indexOf(strings.get(sid));
}
}