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

fix merge conflicts

Browse Source
This commit is contained in:
= 2011-10-04 08:52:15 -07:00
commit 8f57135513
9 changed files with 7105 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6932
cidmaps.js Normal file
View File

File diff suppressed because it is too large Load Diff

109
fonts.js
View File

@ -434,6 +434,9 @@ var Font = (function Font() {
if (properties.type == 'Type3')
return;
// Trying to fix encoding using glyph widths and CIDSystemInfo.
this.fixWidths(properties);
if (!file) {
// The file data is not specified. Trying to fix the font name
// to be used with the canvas.font.
@ -448,6 +451,7 @@ var Font = (function Font() {
this.defaultWidth = properties.defaultWidth;
this.loadedName = fontName.split('-')[0];
this.composite = properties.composite;
this.loading = false;
return;
}
@ -1213,25 +1217,11 @@ var Font = (function Font() {
}
var encoding = properties.encoding, i;
if (!encoding[0]) {
// the font is directly characters to glyphs with no encoding
// so create an identity encoding
var widths = properties.widths;
for (i = 0; i < numGlyphs; i++) {
var width = widths[i];
encoding[i] = {
unicode: i <= 0x1f || (i >= 127 && i <= 255) ?
i + kCmapGlyphOffset : i,
width: isNum(width) ? width : properties.defaultWidth
};
}
} else {
for (i in encoding) {
if (encoding.hasOwnProperty(i)) {
var unicode = encoding[i].unicode;
if (unicode <= 0x1f || (unicode >= 127 && unicode <= 255))
encoding[i].unicode = unicode += kCmapGlyphOffset;
}
for (i in encoding) {
if (encoding.hasOwnProperty(i)) {
var unicode = encoding[i].unicode;
if (unicode <= 0x1f || (unicode >= 127 && unicode <= 255))
encoding[i].unicode = unicode += kCmapGlyphOffset;
}
}
@ -1407,6 +1397,87 @@ var Font = (function Font() {
return stringToArray(otf.file);
},
fixWidths: function font_fixWidths(properties) {
if (properties.type !== 'CIDFontType0' &&
properties.type !== 'CIDFontType2')
return;
var encoding = properties.encoding;
if (encoding[0])
return;
var glyphsWidths = properties.widths;
if (!glyphsWidths)
return;
var defaultWidth = properties.defaultWidth;
var cidSystemInfo = properties.cidSystemInfo;
var cidToUnicode;
if (cidSystemInfo) {
cidToUnicode = CIDToUnicodeMaps[
cidSystemInfo.registry + '-' + cidSystemInfo.ordering];
}
if (!cidToUnicode) {
// the font is directly characters to glyphs with no encoding
// so create an identity encoding
for (i = 0; i < 0xD800; i++) {
var width = glyphsWidths[i];
encoding[i] = {
unicode: i,
width: isNum(width) ? width : defaultWidth
};
}
// skipping surrogates + 256-user defined
for (i = 0xE100; i <= 0xFFFF; i++) {
var width = glyphsWidths[i];
encoding[i] = {
unicode: i,
width: isNum(width) ? width : defaultWidth
};
}
return;
}
encoding[0] = { unicode: 0, width: 0 };
var glyph = 1, i, j, k;
for (i = 0; i < cidToUnicode.length; ++i) {
var unicode = cidToUnicode[i];
var width;
if (isArray(unicode)) {
var length = unicode.length;
width = glyphsWidths[glyph];
for (j = 0; j < length; j++) {
k = unicode[j];
encoding[k] = {
unicode: k,
width: isNum(width) ? width : defaultWidth
};
}
glyph++;
} else if (typeof unicode === 'object') {
var fillLength = unicode.f;
if (fillLength) {
k = unicode.c;
for (j = 0; j < fillLength; ++j) {
width = glyphsWidths[glyph++];
encoding[k] = {
unicode: k,
width: isNum(width) ? width : defaultWidth
};
k++;
}
} else
glyph += unicode.s;
} else if (unicode) {
width = glyphsWidths[glyph++];
encoding[unicode] = {
unicode: unicode,
width: isNum(width) ? width : defaultWidth
};
} else
glyph++;
}
},
bindWorker: function font_bindWorker(data) {
postMessage({
action: 'font',

124
pdf.js
View File

@ -4455,72 +4455,70 @@ var PartialEvaluator = (function partialEvaluator() {
properties) {
var type = properties.type, encoding;
if (properties.composite) {
if (type == 'CIDFontType2') {
var defaultWidth = xref.fetchIfRef(dict.get('DW')) || 1000;
properties.defaultWidth = defaultWidth;
var defaultWidth = xref.fetchIfRef(dict.get('DW')) || 1000;
properties.defaultWidth = defaultWidth;
var glyphsWidths = {};
var widths = xref.fetchIfRef(dict.get('W'));
if (widths) {
var start = 0, end = 0;
for (var i = 0; i < widths.length; i++) {
var code = widths[i];
if (isArray(code)) {
for (var j = 0; j < code.length; j++)
glyphsWidths[start++] = code[j];
start = 0;
} else if (start) {
var width = widths[++i];
for (var j = start; j <= code; j++)
glyphsWidths[j] = width;
start = 0;
} else {
start = code;
}
}
}
properties.widths = glyphsWidths;
var cidToGidMap = dict.get('CIDToGIDMap');
if (!cidToGidMap || !isRef(cidToGidMap)) {
return Object.create(GlyphsUnicode);
}
// Extract the encoding from the CIDToGIDMap
var glyphsStream = xref.fetchIfRef(cidToGidMap);
var glyphsData = glyphsStream.getBytes(0);
// Glyph ids are big-endian 2-byte values
encoding = properties.encoding;
// Set encoding 0 to later verify the font has an encoding
encoding[0] = { unicode: 0, width: 0 };
for (var j = 0; j < glyphsData.length; j++) {
var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
if (glyphID == 0)
continue;
var code = j >> 1;
var width = glyphsWidths[code];
encoding[code] = {
unicode: glyphID,
width: isNum(width) ? width : defaultWidth
};
}
} else if (type == 'CIDFontType0') {
if (isName(encoding)) {
// Encoding is a predefined CMap
if (encoding.name == 'Identity-H') {
TODO('Need to create an identity cmap');
var glyphsWidths = {};
var widths = xref.fetchIfRef(dict.get('W'));
if (widths) {
var start = 0, end = 0;
for (var i = 0; i < widths.length; i++) {
var code = widths[i];
if (isArray(code)) {
for (var j = 0; j < code.length; j++)
glyphsWidths[start++] = code[j];
start = 0;
} else if (start) {
var width = widths[++i];
for (var j = start; j <= code; j++)
glyphsWidths[j] = width;
start = 0;
} else {
TODO('Need to support predefined CMaps see PDF 32000-1:2008 ' +
'9.7.5.2 Predefined CMaps');
start = code;
}
} else {
TODO('Need to support encoding streams see PDF 32000-1:2008 ' +
'9.7.5.3');
}
}
properties.widths = glyphsWidths;
// Glyph ids are big-endian 2-byte values
encoding = properties.encoding;
// CIDSystemInfo might help to match width and glyphs
var cidSystemInfo = dict.get('CIDSystemInfo');
if (isDict(cidSystemInfo)) {
properties.cidSystemInfo = {
registry: cidSystemInfo.get('Registry'),
ordering: cidSystemInfo.get('Ordering'),
supplement: cidSystemInfo.get('Supplement')
};
}
var cidToGidMap = dict.get('CIDToGIDMap');
if (!cidToGidMap || !isRef(cidToGidMap)) {
return Object.create(GlyphsUnicode);
}
// Extract the encoding from the CIDToGIDMap
var glyphsStream = xref.fetchIfRef(cidToGidMap);
var glyphsData = glyphsStream.getBytes(0);
// Set encoding 0 to later verify the font has an encoding
encoding[0] = { unicode: 0, width: 0 };
for (var j = 0; j < glyphsData.length; j++) {
var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
if (glyphID == 0)
continue;
var code = j >> 1;
var width = glyphsWidths[code];
encoding[code] = {
unicode: glyphID,
width: isNum(width) ? width : defaultWidth
};
}
return Object.create(GlyphsUnicode);
}
@ -4910,8 +4908,8 @@ var CanvasExtraState = (function canvasExtraState() {
this.fillColorObj = null;
this.strokeColorObj = null;
// Default fore and background colors
this.fillColor = "#000000";
this.strokeColor = "#000000";
this.fillColor = '#000000';
this.strokeColor = '#000000';
this.old = old;
}

5
test/driver.js
View File

@ -86,7 +86,7 @@ function nextTask() {
}
function isLastPage(task) {
return (task.pageNum > task.pdfDoc.numPages);
return task.pageNum > task.pdfDoc.numPages || task.pageNum > task.pageLimit;
}
function canvasToDataURL() {
@ -205,7 +205,8 @@ function done() {
function sendTaskResult(snapshot, task, failure) {
var result = { browser: browser,
id: task.id,
numPages: task.pdfDoc ? task.pdfDoc.numPages : 0,
numPages: task.pdfDoc ?
(task.pageLimit || task.pdfDoc.numPages) : 0,
failure: failure,
file: task.file,
round: task.round,

1
test/pdfs/tcpdf_033.pdf.link Normal file
View File

@ -0,0 +1 @@
http://www.tcpdf.org/examples/example_033.pdf

16
test/test.py
View File

@ -23,6 +23,8 @@ class TestOptions(OptionParser):
OptionParser.__init__(self, **kwargs)
self.add_option("-m", "--masterMode", action="store_true", dest="masterMode",
help="Run the script in master mode.", default=False)
self.add_option("--noPrompts", action="store_true", dest="noPrompts",
help="Uses default answers (intended for CLOUD TESTS only!).", default=False)
self.add_option("--manifestFile", action="store", type="string", dest="manifestFile",
help="A JSON file in the form of test_manifest.json (the default).")
self.add_option("-b", "--browser", action="store", type="string", dest="browser",
@ -321,7 +323,7 @@ def setUp(options):
if options.masterMode and os.path.isdir(TMPDIR):
print 'Temporary snapshot dir tmp/ is still around.'
print 'tmp/ can be removed if it has nothing you need.'
if prompt('SHOULD THIS SCRIPT REMOVE tmp/? THINK CAREFULLY'):
if options.noPrompts or prompt('SHOULD THIS SCRIPT REMOVE tmp/? THINK CAREFULLY'):
subprocess.call(( 'rm', '-rf', 'tmp' ))
assert not os.path.isdir(TMPDIR)
@ -414,8 +416,9 @@ def checkEq(task, results, browser, masterMode):
path = os.path.join(pfx, str(page + 1))
if not os.access(path, os.R_OK):
print 'WARNING: no reference snapshot', path
State.numEqNoSnapshot += 1
if not masterMode:
print 'WARNING: no reference snapshot', path
else:
f = open(path)
ref = f.read()
@ -444,8 +447,9 @@ def checkEq(task, results, browser, masterMode):
try:
os.makedirs(tmpTaskDir)
except OSError, e:
print >>sys.stderr, 'Creating', tmpTaskDir, 'failed!'
if e.errno != 17: # file exists
print >>sys.stderr, 'Creating', tmpTaskDir, 'failed!'
of = open(os.path.join(tmpTaskDir, str(page + 1)), 'w')
of.write(snapshot)
of.close()
@ -503,10 +507,10 @@ def maybeUpdateRefImages(options, browser):
print ' Yes! The references in tmp/ can be synced with ref/.'
if options.reftest:
startReftest(browser, options)
if not prompt('Would you like to update the master copy in ref/?'):
if options.noPrompts or not prompt('Would you like to update the master copy in ref/?'):
print ' OK, not updating.'
else:
sys.stdout.write(' Updating ... ')
sys.stdout.write(' Updating ref/ ... ')
# XXX unclear what to do on errors here ...
# NB: do *NOT* pass --delete to rsync. That breaks this

6
test/test_manifest.json
View File

@ -171,6 +171,12 @@
"skipPages": [ 16 ],
"type": "load"
},
{ "id": "tcpdf_033",
"file": "pdfs/tcpdf_033.pdf",
"link": true,
"rounds": 1,
"type": "eq"
},
{ "id": "simpletype3font",
"file": "pdfs/simpletype3font.pdf",
"link": false,

1
test/test_slave.html
View File

@ -8,6 +8,7 @@
<script type="text/javascript" src="/glyphlist.js"></script>
<script type="text/javascript" src="/metrics.js"></script>
<script type="text/javascript" src="/charsets.js"></script>
<script type="text/javascript" src="/cidmaps.js"></script>
<script type="text/javascript" src="driver.js"></script>
</head>

1
web/viewer.html
View File

@ -12,6 +12,7 @@
<script type="text/javascript" src="../glyphlist.js"></script>
<script type="text/javascript" src="../metrics.js"></script>
<script type="text/javascript" src="../charsets.js"></script>
<script type="text/javascript" src="../cidmaps.js"></script>
</head>
<body>