From 76cb96f1cd7cfdd32e3cd190f8b7a8719679cac5 Mon Sep 17 00:00:00 2001 From: Andreas Gal Date: Thu, 9 Jun 2011 18:06:01 -0700 Subject: [PATCH 1/2] add ?file= parameter to test.html --- test.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test.html b/test.html index 09ccf62d2..f78f22ce2 100644 --- a/test.html +++ b/test.html @@ -52,7 +52,8 @@ function load() { pageDisplay = document.getElementById("pageNumber"); infoDisplay = document.getElementById("info"); pageNum = parseInt(queryParams().page) || 1; - open("compressed.tracemonkey-pldi-09.pdf"); + fileName = queryParams().file || "compressed.tracemonkey-pldi-09.pdf"; + open(fileName); } function open(url) { From 78d0b3caf1d996192cfd8acd354799fe7863a910 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Thu, 9 Jun 2011 18:19:17 -0700 Subject: [PATCH 2/2] implement TL and T* --- pdf.js | 9 +++++++++ test.html | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pdf.js b/pdf.js index 8f0b09e35..f7e553699 100644 --- a/pdf.js +++ b/pdf.js @@ -1547,6 +1547,7 @@ var CanvasExtraState = (function() { this.alphaIsShape = false; this.fontSize = 0.0; this.textMatrix = IDENTITY_MATRIX; + this.leading = 0.0; // Current point (in user coordinates) this.x = 0.0; this.y = 0.0; @@ -1600,9 +1601,11 @@ var CanvasGraphics = (function() { // Text BT: this.beginText, ET: this.endText, + TL: this.setLeading, Tf: this.setFont, Td: this.moveText, Tm: this.setTextMatrix, + "T*": this.nextLine, Tj: this.showText, TJ: this.showSpacedText, @@ -1774,6 +1777,9 @@ var CanvasGraphics = (function() { }, endText: function() { }, + setLeading: function(leading) { + this.current.leading = leading; + }, setFont: function(fontRef, size) { var fontRes = this.res.get("Font"); if (!fontRes) @@ -1795,6 +1801,9 @@ var CanvasGraphics = (function() { this.current.x = this.current.lineX = 0; this.current.y = this.current.lineY = 0; }, + nextLine: function() { + this.moveText(0, this.current.leading); + }, showText: function(text) { this.ctx.save(); this.ctx.translate(0, 2 * this.current.y); diff --git a/test.html b/test.html index 09ccf62d2..8cb8cb8ee 100644 --- a/test.html +++ b/test.html @@ -52,7 +52,8 @@ function load() { pageDisplay = document.getElementById("pageNumber"); infoDisplay = document.getElementById("info"); pageNum = parseInt(queryParams().page) || 1; - open("compressed.tracemonkey-pldi-09.pdf"); +// open("compressed.tracemonkey-pldi-09.pdf"); + open("compressed.canvas.pdf"); } function open(url) {