Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the mapping from charstring to glyphs

Browse Source
This commit is contained in:
sbarman 2011-07-22 09:57:26 -07:00
parent d502866111
commit f177398777
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fonts.js
View File

@ -1069,6 +1069,7 @@ var Font = (function Font() {
var charstrings = font.charstrings; var charstrings = font.charstrings;
properties.fixedPitch = isFixedPitch(charstrings); properties.fixedPitch = isFixedPitch(charstrings);
var fields = { var fields = {
// PostScript Font Program // PostScript Font Program
'CFF ': font.data, 'CFF ': font.data,
@ -1077,7 +1078,7 @@ var Font = (function Font() {
'OS/2': stringToArray(createOS2Table(properties)), 'OS/2': stringToArray(createOS2Table(properties)),
// Character to glyphs mapping // Character to glyphs mapping
'cmap': createCMapTable(charstrings.slice()), 'cmap': createCMapTable(charstrings.slice(), font.glyphIds),
// Font header // Font header
'head': (function() { 'head': (function() {
@ -2065,8 +2066,17 @@ var Type2CFF = (function() {
// charstrings contains info about glyphs (one element per glyph // charstrings contains info about glyphs (one element per glyph
// containing mappings for {unicode, width}) // containing mappings for {unicode, width})
this.charstrings = this.getCharStrings(charset, charStrings, var charstrings = this.getCharStrings(charset, charStrings,
privDict, this.properties); privDict, this.properties);
// create the mapping between charstring and glyph id
var glyphIds = [];
for (var i = 0, ii = charstrings.length; i < ii; ++i) {
glyphIds.push(charstrings[i].gid);
}
this.charstrings = charstrings;
this.glyphIds = glyphIds;
}, },
getCharStrings: function cff_charstrings(charsets, charStrings, getCharStrings: function cff_charstrings(charsets, charStrings,
privDict, properties) { privDict, properties) {
@ -2081,12 +2091,15 @@ var Type2CFF = (function() {
var charCode = GlyphsUnicode[charName]; var charCode = GlyphsUnicode[charName];
if (charCode) { if (charCode) {
var width = widths[charCode] || defaultWidth; var width = widths[charCode] || defaultWidth;
charstrings.push({unicode: charCode, width: width}); charstrings.push({unicode: charCode, width: width, gid: i});
} else { } else {
if (charName !== '.notdef') if (charName !== '.notdef')
warn('Cannot find unicode for glyph ' + charName); warn('Cannot find unicode for glyph ' + charName);
} }
} }
// sort the arry by the unicode value
charstrings.sort(function(a, b) {return a.unicode - b.unicode});
return charstrings; return charstrings;
}, },
parseEncoding: function cff_parseencoding(pos) { parseEncoding: function cff_parseencoding(pos) {