Merge pull request #404 from Flamenco/c2d

HTML5 CanvasRenderingContext2D interface

Author: diegocr

jspdf.js

@@ -199,6 +199,7 @@ var jsPDF = (function(global) {
 			},
 			API = {},
 			events = new PubSub(API),
+			lastTextWasStroke = false,
 
 		/////////////////////
 		// Private functions
@@ -963,7 +964,17 @@ var jsPDF = (function(global) {
 			'getNumberOfPages' : function() {
 				return pages.length - 1;
 			},
-			'pages' : pages
+			'pages' : pages,
+			'out' : out,
+			'f2' : f2,
+			'getPageInfo' : function(pageNumberOneBased){
+				var objId = (pageNumberOneBased - 1) * 2 + 3;
+				return {objId:objId, pageNumber:pageNumberOneBased};
+			},
+			'getCurrentPageInfo' : function(){
+				var objId = (currentPage - 1) * 2 + 3;
+				return {objId:objId, pageNumber:currentPage};
+			}
 		};
 
 		/**
@@ -1055,7 +1066,23 @@ var jsPDF = (function(global) {
 				flags.noBOM = true;
 			if (!('autoencode' in flags))
 				flags.autoencode = true;
-
+			
+			//TODO this might not work after object block changes
+			// It would be better to pass in a page context
+			var strokeOption = '';
+			if (true === flags.stroke){
+				if (this.lastTextWasStroke !== true){
+					strokeOption = '1 Tr\n';
+					this.lastTextWasStroke = true;				
+				}
+			}
+			else{
+				if (this.lastTextWasStroke){
+					strokeOption = '0 Tr\n';								
+				}
+				this.lastTextWasStroke = false;
+			}
+			
 			if (typeof text === 'string') {
 				text = ESC(text);
 			} else if (text instanceof Array) {
@@ -1085,6 +1112,7 @@ var jsPDF = (function(global) {
 				'BT\n/' +
 				activeFontKey + ' ' + activeFontSize + ' Tf\n' +     // font face, style, size
 				(activeFontSize * lineHeightProportion) + ' TL\n' +  // line spacing
+				strokeOption +// stroke option
 				textColor +
 				'\n' + xtra + f2(x * k) + ' ' + f2((pageHeight - y) * k) + ' ' + mode + '\n(' +
 				text +

jspdf.plugin.annotations.js

@@ -109,8 +109,8 @@
 						line = '<</Type /Annot /Subtype /Link ' + rect + '/Border [0 0 0] /A <</S /URI /URI (' + anno.options.url + ') >>';
 					} else if (anno.options.pageNumber) {
 						// first page is 0
-						var pageObjId = anno.options.pageNumber * 2 + 1;
-						line = '<</Type /Annot /Subtype /Link ' + rect + '/Border [0 0 0] /Dest [' + pageObjId + " 0 R";
+						var info = this.internal.getPageInfo(anno.options.pageNumber);
+						line = '<</Type /Annot /Subtype /Link ' + rect + '/Border [0 0 0] /Dest [' + info.objId + " 0 R";
 						anno.options.magFactor = anno.options.magFactor || "XYZ";
 						switch (anno.options.magFactor) {
 						case 'Fit':
@@ -153,7 +153,7 @@
 	 */
 	jsPDFAPI.link = function(x,y,w,h,options) {
 		'use strict';
-		this.annotationPlugin.annotations[this.internal.getNumberOfPages()].push({
+		this.annotationPlugin.annotations[this.internal.getCurrentPageInfo().pageNumber].push({
 			x : x,
 			y : y,
 			w : w,