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

Fully support truetype composite fonts, clean up

Browse Source
This commit is contained in:
Adil Allawi 2011-07-13 09:31:34 +01:00
parent 926e4f1130
commit 36763e8e82
2 changed files with 137 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
fonts.js
View File

@ -411,7 +411,7 @@ var Font = (function() {
break; break;
} }
this.data = data; this.data = data;
this.type = properties.type; //use the type to test if the string is single or multi-byte this.type = properties.type; // Use the type to test if the string is single or multi-byte
this.id = Fonts.registerFont(name, data, properties); this.id = Fonts.registerFont(name, data, properties);
this.loadedName = 'pdfFont' + this.id; this.loadedName = 'pdfFont' + this.id;
this.compositeFont = properties.compositeFont; this.compositeFont = properties.compositeFont;
@ -682,6 +682,65 @@ var Font = (function() {
'\x00\x00\x00\x00'; // maxMemType1 '\x00\x00\x00\x00'; // maxMemType1
}; };
function createNameTable(name) {
var strings = [
'Original licence', // 0.Copyright
name, // 1.Font family
'Unknown', // 2.Font subfamily (font weight)
'uniqueID', // 3.Unique ID
name, // 4.Full font name
'Version 0.11', // 5.Version
'', // 6.Postscript name
'Unknown', // 7.Trademark
'Unknown', // 8.Manufacturer
'Unknown' // 9.Designer
];
// Mac want 1-byte per character strings while Windows want
// 2-bytes per character, so duplicate the names table
var stringsUnicode = [];
for (var i = 0; i < strings.length; i++) {
var str = strings[i];
var strUnicode = '';
for (var j = 0; j < str.length; j++)
strUnicode += string16(str.charCodeAt(j));
stringsUnicode.push(strUnicode);
}
var names = [strings, stringsUnicode];
var platforms = ['\x00\x01', '\x00\x03'];
var encodings = ['\x00\x00', '\x00\x01'];
var languages = ['\x00\x00', '\x04\x09'];
var namesRecordCount = strings.length * platforms.length;
var nameTable =
'\x00\x00' + // format
string16(namesRecordCount) + // Number of names Record
string16(namesRecordCount * 12 + 6); // Storage
// Build the name records field
var strOffset = 0;
for (var i = 0; i < platforms.length; i++) {
var strs = names[i];
for (var j = 0; j < strs.length; j++) {
var str = strs[j];
var nameRecord =
platforms[i] + // platform ID
encodings[i] + // encoding ID
languages[i] + // language ID
string16(j) + // name ID
string16(str.length) +
string16(strOffset);
nameTable += nameRecord;
strOffset += str.length;
}
}
nameTable += strings.join('') + stringsUnicode.join('');
return nameTable;
}
constructor.prototype = { constructor.prototype = {
name: null, name: null,
font: null, font: null,
@ -814,7 +873,7 @@ var Font = (function() {
// This keep a reference to the CMap and the post tables since they can // This keep a reference to the CMap and the post tables since they can
// be rewritted // be rewritted
var cmap, post; var cmap, post, nameTable, maxp;
var tables = []; var tables = [];
for (var i = 0; i < numTables; i++) { for (var i = 0; i < numTables; i++) {
@ -825,6 +884,10 @@ var Font = (function() {
cmap = table; cmap = table;
else if (table.tag == 'post') else if (table.tag == 'post')
post = table; post = table;
else if (table.tag == 'name')
nameTable = table;
else if (table.tag == 'maxp')
maxp = table;
requiredTables.splice(index, 1); requiredTables.splice(index, 1);
} }
@ -859,9 +922,29 @@ var Font = (function() {
data: stringToArray(createOS2Table(properties)) data: stringToArray(createOS2Table(properties))
}); });
if (!cmap) { // Replace the old CMAP table with a shiny new one
if (properties.type == 'CIDFontType2') {
// Type2 composite fonts map charcters directly to glyphs so the cmap
// table must be replaced.
var glyphs = []; var glyphs = [];
var charset = properties.charset; var charset = properties.charset;
if (charset.length == 0)
{
// PDF did not contain a GIDMap for the font so create an identity cmap
// First get the number of glyphs from the maxp table
font.pos = (font.start ? font.start : 0) + maxp.length;
var version = int16(font.getBytes(4));
var numGlyphs = int16(font.getBytes(2));
// Now create an identity mapping
for (var i=1; i < numGlyphs; i++) {
glyphs.push({
unicode: i
});
}
} else {
for (var i=1; i < charset.length; i++) { for (var i=1; i < charset.length; i++) {
if (charset.indexOf(i) != -1) { if (charset.indexOf(i) != -1) {
glyphs.push({ glyphs.push({
@ -871,12 +954,18 @@ var Font = (function() {
break; break;
} }
} }
}
if (!cmap) {
// Font did not contain a cmap
tables.push({ tables.push({
tag: 'cmap', tag: 'cmap',
data: createCMapTable(glyphs) data: createCMapTable(glyphs)
}) })
} else { } else {
// Replace the old CMAP table with a shiny new one cmap.data = createCMapTable(glyphs);
}
} else {
replaceCMapTable(cmap, font, properties); replaceCMapTable(cmap, font, properties);
} }
@ -888,6 +977,14 @@ var Font = (function() {
}); });
} }
// Rewrite the 'name' table if needed
if (!nameTable) {
tables.push({
tag: 'name',
data: stringToArray(createNameTable(this.name))
});
}
// Tables needs to be written by ascendant alphabetic order // Tables needs to be written by ascendant alphabetic order
tables.sort(function tables_sort(a, b) { tables.sort(function tables_sort(a, b) {
return (a.tag > b.tag) - (a.tag < b.tag); return (a.tag > b.tag) - (a.tag < b.tag);
@ -930,65 +1027,6 @@ var Font = (function() {
}, },
convert: function font_convert(fontName, font, properties) { convert: function font_convert(fontName, font, properties) {
function createNameTable(name) {
var strings = [
'Original licence', // 0.Copyright
name, // 1.Font family
'Unknown', // 2.Font subfamily (font weight)
'uniqueID', // 3.Unique ID
name, // 4.Full font name
'Version 0.11', // 5.Version
'', // 6.Postscript name
'Unknown', // 7.Trademark
'Unknown', // 8.Manufacturer
'Unknown' // 9.Designer
];
// Mac want 1-byte per character strings while Windows want
// 2-bytes per character, so duplicate the names table
var stringsUnicode = [];
for (var i = 0; i < strings.length; i++) {
var str = strings[i];
var strUnicode = '';
for (var j = 0; j < str.length; j++)
strUnicode += string16(str.charCodeAt(j));
stringsUnicode.push(strUnicode);
}
var names = [strings, stringsUnicode];
var platforms = ['\x00\x01', '\x00\x03'];
var encodings = ['\x00\x00', '\x00\x01'];
var languages = ['\x00\x00', '\x04\x09'];
var namesRecordCount = strings.length * platforms.length;
var nameTable =
'\x00\x00' + // format
string16(namesRecordCount) + // Number of names Record
string16(namesRecordCount * 12 + 6); // Storage
// Build the name records field
var strOffset = 0;
for (var i = 0; i < platforms.length; i++) {
var strs = names[i];
for (var j = 0; j < strs.length; j++) {
var str = strs[j];
var nameRecord =
platforms[i] + // platform ID
encodings[i] + // encoding ID
languages[i] + // language ID
string16(j) + // name ID
string16(str.length) +
string16(strOffset);
nameTable += nameRecord;
strOffset += str.length;
}
}
nameTable += strings.join('') + stringsUnicode.join('');
return nameTable;
}
function isFixedPitch(glyphs) { function isFixedPitch(glyphs) {
for (var i = 0; i < glyphs.length - 1; i++) { for (var i = 0; i < glyphs.length - 1; i++) {
if (glyphs[i] != glyphs[i + 1]) if (glyphs[i] != glyphs[i + 1])

18
pdf.js
View File

@ -3665,31 +3665,35 @@ var PartialEvaluator = (function() {
var charset = []; var charset = [];
if (compositeFont) { if (compositeFont) {
// Special CIDFont support // Special CIDFont support
//XXX only identity CID Encodings supported for now // XXX only CIDFontType2 supported for now
var encoding = xref.fetchIfRef(fontDict.get('Encoding'));
if (IsName(encoding)) {
//Encoding is a predefined CMap
if (encoding.name == 'Identity-H') {
if (subType.name == 'CIDFontType2') { if (subType.name == 'CIDFontType2') {
var cidToGidMap = descendant.get('CIDToGIDMap'); var cidToGidMap = descendant.get('CIDToGIDMap');
if (cidToGidMap) { if (cidToGidMap && IsRef(cidToGidMap)) {
// Extract the charset from the CIDToGIDMap // Extract the charset from the CIDToGIDMap
var glyphsStream = xref.fetchIfRef(cidToGidMap); var glyphsStream = xref.fetchIfRef(cidToGidMap);
var glyphsData = glyphsStream.getBytes(0); var glyphsData = glyphsStream.getBytes(0);
var i = 0; var i = 0;
//glyph ids are big-endian 2-byte values // Glyph ids are big-endian 2-byte values
for (var j=0; j<glyphsData.length; j++) { for (var j=0; j<glyphsData.length; j++) {
var glyphID = (glyphsData[j++] << 8) | glyphsData[j]; var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
charset.push(glyphID); charset.push(glyphID);
} }
} }
} }
else {
// XXX This is a placeholder for handling of the encoding of CIDFontType0 fonts
var encoding = xref.fetchIfRef(fontDict.get('Encoding'));
if (IsName(encoding)) {
// Encoding is a predefined CMap
if (encoding.name == 'Identity-H') {
TODO ('Need to create an identity cmap')
} else { } else {
TODO ('Need to support predefined CMaps see PDF 32000-1:2008 9.7.5.2 Predefined CMaps') TODO ('Need to support predefined CMaps see PDF 32000-1:2008 9.7.5.2 Predefined CMaps')
} }
} else { } else {
TODO ('Need to support encoding streams see PDF 32000-1:2008 9.7.5.3'); TODO ('Need to support encoding streams see PDF 32000-1:2008 9.7.5.3');
} }
}
} else if (fontDict.has('Encoding')) { } else if (fontDict.has('Encoding')) {
var encoding = xref.fetchIfRef(fontDict.get('Encoding')); var encoding = xref.fetchIfRef(fontDict.get('Encoding'));
if (IsDict(encoding)) { if (IsDict(encoding)) {