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

moved width setting code

Browse Source
This commit is contained in:
sbarman 2011-07-20 15:00:16 -07:00
parent 8824ff9539
commit 2f30dd5174
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fonts.js
View File

@ -394,25 +394,11 @@ var Font = (function() {
var subtype = properties.subtype; var subtype = properties.subtype;
if (subtype === 'Type1C') { if (subtype === 'Type1C') {
var cff = new Type2CFF(file); var cff = new Type2CFF(file, properties);
} else { } else {
var cff = new CFF(name, file, properties); var cff = new CFF(name, file, properties);
} }
var widths = properties.glyphWidths;
if (widths) {
var charstrings = cff.charstrings;
for (var i = 0, ii = charstrings.length; i < ii; ++i) {
var charstring = charstrings[i];
var unicode = charstring.unicode;
var width = widths[unicode];
if (width)
charstring.width = width;
else
charstring.width = 0;
}
}
// Wrap the CFF data inside an OTF font file // Wrap the CFF data inside an OTF font file
data = this.convert(name, cff, properties); data = this.convert(name, cff, properties);
break; break;
@ -2011,9 +1997,10 @@ CFF.prototype = {
var Type2CFF = (function() { var Type2CFF = (function() {
// TODO: replace parsing code with the Type2Parser in font_utils.js // TODO: replace parsing code with the Type2Parser in font_utils.js
function constructor(file) { function constructor(file, properties) {
var bytes = file.getBytes(); var bytes = file.getBytes();
this.bytes = bytes; this.bytes = bytes;
this.properties = properties;
// Other classes expect this.data to be a Javascript array // Other classes expect this.data to be a Javascript array
var data = [] var data = []
@ -2056,10 +2043,11 @@ 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(encoding, charset, charStrings, this.charstrings = this.getCharStrings(encoding, charset, charStrings,
privDict); privDict, this.properties);
}, },
getCharStrings: function cff_charstrings(encoding, charsets, charStrings, getCharStrings: function cff_charstrings(encoding, charsets, charStrings,
privDict) { privDict, properties) {
var widths = properties.glyphWidths;
var defaultWidth = privDict['defaultWidthX']; var defaultWidth = privDict['defaultWidthX'];
var nominalWidth = privDict['nominalWidthX']; var nominalWidth = privDict['nominalWidthX'];
@ -2069,7 +2057,10 @@ var Type2CFF = (function() {
var charName = charsets[i]; var charName = charsets[i];
var charCode = GlyphsUnicode[charName]; var charCode = GlyphsUnicode[charName];
if (charCode) { if (charCode) {
charstrings.push({unicode: charCode, width: 0}); var width = widths[charCode];
if (!width)
width = defaultWidth;
charstrings.push({unicode: charCode, width: width});
} }
} }
return charstrings; return charstrings;