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

Refactoring charsToUnicode into charsToGlyphs

Browse source
This commit is contained in:
notmasteryet 2011-09-10 20:21:20 -05:00
parent beea86db31
commit faf8b8ac0b
2 changed files with 23 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
fonts.js
View file

@ -1296,7 +1296,7 @@ var Font = (function Font() {
return rule;
},
charsToUnicode: function fonts_chars2Unicode(chars) {
charsToGlyphs: function fonts_chars2Glyphs(chars) {
var charsCache = this.charsCache;
var str;
@ -1315,7 +1315,7 @@ var Font = (function Font() {
var encoding = this.encoding;
if (!encoding)
return chars;
str = '';
var glyphs = [];
if (this.composite) {
// composite fonts have multi-byte strings convert the string from
@ -1329,11 +1329,9 @@ var Font = (function Font() {
var unicode = encoding[charcode];
if ('undefined' == typeof(unicode)) {
warn('Unencoded charcode ' + charcode);
unicode = charcode;
} else {
unicode = unicode.unicode;
unicode = { unicode: charcode };
}
str += String.fromCharCode(unicode);
glyphs.push(unicode);
}
}
else {
@ -1342,22 +1340,14 @@ var Font = (function Font() {
var unicode = encoding[charcode];
if ('undefined' == typeof(unicode)) {
warn('Unencoded charcode ' + charcode);
unicode = charcode;
} else {
unicode = unicode.unicode;
unicode = { unicode: charcode };
}
// Handle surrogate pairs
if (unicode > 0xFFFF) {
str += String.fromCharCode(unicode & 0xFFFF);
unicode >>= 16;
}
str += String.fromCharCode(unicode);
glyphs.push(unicode);
}
}
// Enter the translated string into the cache
return charsCache[chars] = str;
return charsCache[chars] = glyphs;
}
};