|
|
@ -2613,14 +2613,13 @@ var Type2CFF = (function type2CFF() { |
|
|
|
var glyph = charsets[i]; |
|
|
|
var glyph = charsets[i]; |
|
|
|
var code = glyphMap[glyph] || 0; |
|
|
|
var code = glyphMap[glyph] || 0; |
|
|
|
|
|
|
|
|
|
|
|
var mapping = glyphs[code] || glyphs[glyph] || {}; |
|
|
|
var mapping = glyphs[code] || glyphs[glyph] || { width: defaultWidth }; |
|
|
|
var unicode = mapping.unicode; |
|
|
|
var unicode = mapping.unicode; |
|
|
|
|
|
|
|
|
|
|
|
if (unicode <= 0x1f || (unicode >= 127 && unicode <= 255)) |
|
|
|
if (unicode <= 0x1f || (unicode >= 127 && unicode <= 255)) |
|
|
|
unicode += kCmapGlyphOffset; |
|
|
|
unicode += kCmapGlyphOffset; |
|
|
|
|
|
|
|
|
|
|
|
var width = ('width' in mapping) && isNum(mapping.width) ? mapping.width |
|
|
|
var width = isNum(mapping.width) ? mapping.width : defaultWidth; |
|
|
|
: defaultWidth; |
|
|
|
|
|
|
|
properties.encoding[code] = { |
|
|
|
properties.encoding[code] = { |
|
|
|
unicode: unicode, |
|
|
|
unicode: unicode, |
|
|
|
width: width |
|
|
|
width: width |
|
|
|