Browse Source

Merge pull request #344 from notmasteryet/bookmarks

Intra-document links and formatting fixes
Andreas Gal 14 years ago
parent
commit
107c03e0e8
  1. 132
      pdf.js
  2. 34
      web/viewer.js

132
pdf.js

@ -2228,6 +2228,26 @@ var Ref = (function() {
return constructor; return constructor;
})(); })();
// The reference is identified by number and generation,
// this structure stores only one instance of the reference.
var RefSet = (function() {
function constructor() {
this.dict = {};
}
constructor.prototype = {
has: function(ref) {
return !!this.dict['R' + ref.num + '.' + ref.gen];
},
put: function(ref) {
this.dict['R' + ref.num + '.' + ref.gen] = ref;
}
};
return constructor;
})();
function IsBool(v) { function IsBool(v) {
return typeof v == 'boolean'; return typeof v == 'boolean';
} }
@ -3163,7 +3183,7 @@ var XRef = (function() {
})(); })();
var Page = (function() { var Page = (function() {
function constructor(xref, pageNumber, pageDict) { function constructor(xref, pageNumber, pageDict, ref) {
this.pageNumber = pageNumber; this.pageNumber = pageNumber;
this.pageDict = pageDict; this.pageDict = pageDict;
this.stats = { this.stats = {
@ -3174,6 +3194,7 @@ var Page = (function() {
render: 0.0 render: 0.0
}; };
this.xref = xref; this.xref = xref;
this.ref = ref;
} }
constructor.prototype = { constructor.prototype = {
@ -3349,10 +3370,10 @@ var Page = (function() {
var annotation = xref.fetch(annotations[i]); var annotation = xref.fetch(annotations[i]);
if (!IsDict(annotation, 'Annot')) if (!IsDict(annotation, 'Annot'))
continue; continue;
var subtype = annotation.get("Subtype"); var subtype = annotation.get('Subtype');
if (!IsName(subtype) || subtype.name != 'Link') if (!IsName(subtype) || subtype.name != 'Link')
continue; continue;
var rect = annotation.get("Rect"); var rect = annotation.get('Rect');
var topLeftCorner = this.rotatePoint(rect[0], rect[1]); var topLeftCorner = this.rotatePoint(rect[0], rect[1]);
var bottomRightCorner = this.rotatePoint(rect[2], rect[3]); var bottomRightCorner = this.rotatePoint(rect[2], rect[3]);
@ -3361,14 +3382,17 @@ var Page = (function() {
link.y = Math.min(topLeftCorner.y, bottomRightCorner.y); link.y = Math.min(topLeftCorner.y, bottomRightCorner.y);
link.width = Math.abs(topLeftCorner.x - bottomRightCorner.x); link.width = Math.abs(topLeftCorner.x - bottomRightCorner.x);
link.height = Math.abs(topLeftCorner.y - bottomRightCorner.y); link.height = Math.abs(topLeftCorner.y - bottomRightCorner.y);
var a = annotation.get("A"); var a = this.xref.fetchIfRef(annotation.get('A'));
if (a) { if (a) {
switch(a.get("S").name) { switch(a.get('S').name) {
case "URI": case 'URI':
link.url = a.get("URI"); link.url = a.get('URI');
break;
case 'GoTo':
link.dest = a.get('D');
break; break;
default: default:
TODO("other link types"); TODO('other link types');
break; break;
} }
} }
@ -3398,6 +3422,63 @@ var Catalog = (function() {
// shadow the prototype getter // shadow the prototype getter
return shadow(this, 'toplevelPagesDict', obj); return shadow(this, 'toplevelPagesDict', obj);
}, },
get documentOutline() {
function convertIfUnicode(str) {
if (str[0] === '\xFE' && str[1] === '\xFF') {
// UTF16BE BOM
var i, n = str.length, str2 = "";
for (i = 2; i < n; i+=2)
str2 += String.fromCharCode(
(str.charCodeAt(i) << 8) | str.charCodeAt(i + 1));
str = str2;
}
return str;
}
var obj = this.catDict.get('Outlines');
var root = { items: [] };
if (IsRef(obj)) {
obj = this.xref.fetch(obj).get('First');
var processed = new RefSet();
if (IsRef(obj)) {
var queue = [{obj: obj, parent: root}];
// to avoid recursion keeping track of the items
// in the processed dictionary
processed.put(obj);
while (queue.length > 0) {
var i = queue.shift();
var outlineDict = this.xref.fetch(i.obj);
if (!outlineDict.has('Title'))
error('Invalid outline item');
var dest = outlineDict.get('Dest');
if (!dest && outlineDict.get('A')) {
var a = this.xref.fetchIfRef(outlineDict.get('A'));
dest = a.get('D');
}
var outlineItem = {
dest: dest,
title: convertIfUnicode(outlineDict.get('Title')),
color: outlineDict.get('C') || [0, 0, 0],
count: outlineDict.get('Count'),
bold: !!(outlineDict.get('F') & 2),
italic: !!(outlineDict.get('F') & 1),
items: []
};
i.parent.items.push(outlineItem);
obj = outlineDict.get('First');
if (IsRef(obj) && !processed.has(obj)) {
queue.push({obj: obj, parent: outlineItem});
processed.put(obj);
}
obj = outlineDict.get('Next');
if (IsRef(obj) && !processed.has(obj)) {
queue.push({obj: obj, parent: i.parent});
processed.put(obj);
}
}
}
}
return shadow(this, 'documentOutline', root);
},
get numPages() { get numPages() {
var obj = this.toplevelPagesDict.get('Count'); var obj = this.toplevelPagesDict.get('Count');
assertWellFormed( assertWellFormed(
@ -3418,7 +3499,7 @@ var Catalog = (function() {
'page dictionary kid is not a reference'); 'page dictionary kid is not a reference');
var obj = this.xref.fetch(kid); var obj = this.xref.fetch(kid);
if (IsDict(obj, 'Page') || (IsDict(obj) && !obj.has('Kids'))) { if (IsDict(obj, 'Page') || (IsDict(obj) && !obj.has('Kids'))) {
pageCache.push(new Page(this.xref, pageCache.length, obj)); pageCache.push(new Page(this.xref, pageCache.length, obj, kid));
} else { // must be a child page dictionary } else { // must be a child page dictionary
assertWellFormed( assertWellFormed(
IsDict(obj), IsDict(obj),
@ -3428,6 +3509,39 @@ var Catalog = (function() {
} }
} }
}, },
get destinations() {
var xref = this.xref;
var obj = this.catDict.get('Names');
obj = obj ? xref.fetch(obj) : this.catDict;
obj = obj.get('Dests');
var dests = {};
if (obj) {
// reading name tree
var processed = new RefSet();
processed.put(obj);
var queue = [obj];
while (queue.length > 0) {
var i, n;
obj = xref.fetch(queue.shift());
if (obj.has('Kids')) {
var kids = obj.get('Kids');
for (i = 0, n = kids.length; i < n; i++) {
var kid = kids[i];
if (processed.has(kid))
error('invalid destinations');
queue.push(kid);
processed.put(kid);
}
continue;
}
var names = obj.get('Names');
for (i = 0, n = names.length; i < n; i += 2) {
dests[names[i]] = xref.fetch(names[i + 1]).get('D');
}
}
}
return shadow(this, 'destinations', dests);
},
getPage: function(n) { getPage: function(n) {
var pageCache = this.pageCache; var pageCache = this.pageCache;
if (!pageCache) { if (!pageCache) {

34
web/viewer.js

@ -84,6 +84,18 @@ var PDFView = {
xhr.send(null); xhr.send(null);
}, },
navigateTo: function (dest) {
if (typeof dest === 'string')
dest = this.destinations[dest];
// dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
var destRef = dest[0];
var pageNumber = this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'];
if (pageNumber) {
this.page = pageNumber;
// TODO scroll to specific region on the page, the precise scaling required
}
},
load: function(data, scale) { load: function(data, scale) {
var sidebar = document.getElementById('sidebarView'); var sidebar = document.getElementById('sidebarView');
sidebar.parentNode.scrollTop = 0; sidebar.parentNode.scrollTop = 0;
@ -101,16 +113,21 @@ var PDFView = {
document.getElementById('numPages').innerHTML = pagesCount; document.getElementById('numPages').innerHTML = pagesCount;
var pages = this.pages = []; var pages = this.pages = [];
var pagesRefMap = {};
var thumbnails = this.thumbnails = []; var thumbnails = this.thumbnails = [];
for (var i = 1; i <= pagesCount; i++) { for (var i = 1; i <= pagesCount; i++) {
var page = pdf.getPage(i); var page = pdf.getPage(i);
pages.push(new PageView(container, page, i, page.width, page.height, pages.push(new PageView(container, page, i, page.width, page.height,
page.stats)); page.stats, this.navigateTo.bind(this)));
thumbnails.push(new ThumbnailView(sidebar, pages[i - 1])); thumbnails.push(new ThumbnailView(sidebar, pages[i - 1]));
var pageRef = page.ref;
pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i;
} }
this.scale = (scale || kDefaultScale); this.scale = (scale || kDefaultScale);
this.page = parseInt(document.location.hash.substring(1)) || 1; this.page = parseInt(document.location.hash.substring(1)) || 1;
this.pagesRefMap = pagesRefMap;
this.destinations = pdf.catalog.destinations;
}, },
getVisiblePages: function() { getVisiblePages: function() {
@ -140,7 +157,8 @@ var PDFView = {
} }
}; };
var PageView = function(container, content, id, width, height, stats) { var PageView = function(container, content, id, width, height,
stats, navigateTo) {
this.width = width; this.width = width;
this.height = height; this.height = height;
this.id = id; this.id = id;
@ -178,10 +196,9 @@ var PageView = function(container, content, id, width, height, stats) {
} }
x /= scale; x /= scale;
y /= scale; y /= scale;
for (var i = 0; i < links.length; i++) { var i, n = links.length;
for (i = 0; i < n; i++) {
var link = links[i]; var link = links[i];
if (!link.url)
continue;
if (link.x <= x && link.y <= y && if (link.x <= x && link.y <= y &&
x < link.x + link.width && y < link.y + link.height) { x < link.x + link.width && y < link.y + link.height) {
currentLink = link; currentLink = link;
@ -193,7 +210,12 @@ var PageView = function(container, content, id, width, height, stats) {
canvas.style.cursor = 'default'; canvas.style.cursor = 'default';
}, false); }, false);
canvas.addEventListener('mousedown', function(e) { canvas.addEventListener('mousedown', function(e) {
window.location.href = currentLink.url; if (!currentLink)
return;
if (currentLink.url)
window.location.href = currentLink.url;
if (currentLink.dest)
navigateTo(currentLink.dest);
}, false); }, false);
} }
} }

Loading…
Cancel
Save