Improved API.text() code

Made the align code more efficient, and improved the example code.

Removed jspdf.debug.js from commit.

Author: Kenneth Glassey

examples/basic.html

@@ -346,15 +346,20 @@ <h2></h2>
 <h2><a href="#">Text alignment</a></h2>
 <div><p><pre>var pdf = new jsPDF('p', 'pt', 'letter');
 
-	pdf.text( 'This text is centered\raround\rthis point.', 150, 50, 'center' );
-	pdf.text( 'This text is centered\raround\rthis point.', 150, 300, 45, 'center' );
-	pdf.text( 'This text is\raligned to the\rright.', 150, 400, 'right' );
-	pdf.text( 'This text is\raligned to the\rright.', 150, 550, 45, 'right' );
+	pdf.text( 'This text is normally\raligned.', 140, 50 );
+	
+	pdf.text( 'This text is centered\raround\rthis point.', 140, 120, 'center' );
+	
+	pdf.text( 'This text is rotated\rand centered around\rthis point.', 140, 300, 45, 'center' );
+	
+	pdf.text( 'This text is\raligned to the\rright.', 140, 400, 'right' );
+	
+	pdf.text( 'This text is\raligned to the\rright.', 140, 550, 45, 'right' );
+	
+	pdf.text( 'This single line is centered', 460, 50, 'center' );
+
+	pdf.text( 'This right aligned text\r\rhas an empty line.', 460, 200, 'right' );
 
-	pdf.text( 'This text is centered\raround\rthis point.', 400, 50, 'center' );
-	pdf.text( 'This text is centered\raround\rthis point.', 400, 150, -85, 'center' );
-	pdf.text( 'This text is\raligned to the\rright.', 400, 400, 'right' );
-	pdf.text( 'This text is\raligned to the\rright.', 400, 550, -85, 'right' );
 
 	pdf.save('Test.pdf');</pre>
 <a href="javascript:demoTextAlign()" class="button">Run Code</a></p></div>

examples/js/basic.js

@@ -355,15 +355,28 @@ function demoFromHTML() {
 function demoTextAlign() {
 	var pdf = new jsPDF('p', 'pt', 'letter');
 
-	pdf.text( 'This text is centered\raround\rthis point.', 150, 50, 'center' );
-	pdf.text( 'This text is centered\raround\rthis point.', 150, 300, 45, 'center' );
-	pdf.text( 'This text is\raligned to the\rright.', 150, 400, 'right' );
-	pdf.text( 'This text is\raligned to the\rright.', 150, 550, 45, 'right' );
-	
-	pdf.text( 'This text is centered\raround\rthis point.', 400, 50, 'center' );
-	pdf.text( 'This text is centered\raround\rthis point.', 400, 150, -85, 'center' );
-	pdf.text( 'This text is\raligned to the\rright.', 400, 400, 'right' );
-	pdf.text( 'This text is\raligned to the\rright.', 400, 550, -85, 'right' );
+	pdf.setFillColor(0);
+	pdf.circle( 140, 50, 2, "F" );
+	pdf.text( 'This text is normally\raligned.', 140, 50 );
+	
+	pdf.circle( 140, 120, 2, "F" );
+	pdf.text( 'This text is centered\raround\rthis point.', 140, 120, 'center' );
+	
+	pdf.circle( 140, 300, 2, "F" );
+	pdf.text( 'This text is rotated\rand centered around\rthis point.', 140, 300, 45, 'center' );
+	
+	pdf.circle( 140, 400, 2, "F" );
+	pdf.text( 'This text is\raligned to the\rright.', 140, 400, 'right' );
+	
+	pdf.circle( 140, 550, 2, "F" );
+	pdf.text( 'This text is\raligned to the\rright.', 140, 550, 45, 'right' );
+	
+	pdf.circle( 460, 50, 2, "F" );
+	pdf.text( 'This single line is centered', 460, 50, 'center' );
+
+	pdf.circle( 460, 200, 2, "F" );
+	pdf.text( 'This right aligned text\r\rhas an empty line.', 460, 200, 'right' );
+	
 
 	pdf.save('Test.pdf');
 }

jspdf.js

@@ -1013,12 +1013,12 @@ var jsPDF = (function(global) {
 			// the user wanted to print multiple lines, so break the
 			// text up into an array.  If the text is already an array,
 			// we assume the user knows what they are doing.
-			// Convert text into an array anyway to simplify
-			// later code.
 			if (typeof text === 'string') {
 				if(text.match(/[\n\r]/)) {
 					text = text.split( /\r\n|\r|\n/g);
 				} else {
+					// Convert text into an array anyway
+					// to simplify later code.
 					text = [text];
 				}			
 			}
@@ -1062,41 +1062,34 @@ var jsPDF = (function(global) {
 				}
 
 				if( align ) {					
-					var left,
-						prevX,
-						maxLineLength,
+					var prevX,
 						leading =  activeFontSize * lineHeightProportion,
 						lineWidths = text.map( function( v ) { 
 							return this.getStringUnitWidth( v ) * activeFontSize / k;
 						}, this );
-					maxLineLength = Math.max.apply( Math, lineWidths );
 					// The first line uses the "main" Td setting,
 					// and the subsequent lines are offset by the
 					// previous line's x coordinate.
 					if( align === "center" ) {
 						// The passed in x coordinate defines
-						// the center point.
-						left = x - maxLineLength / 2;							
+						// the center point.						
 						x -= lineWidths[0] / 2;
 					} else if ( align === "right" ) {
 						// The passed in x coordinate defines the
-						// rightmost point of the text.
-						left = x - maxLineLength;							
+						// rightmost point of the text.											
 						x -= lineWidths[0];
 					} else {
 						throw new Error('Unrecognized alignment option, use "center" or "right".');
 					}
 					prevX = x;
-					text = da[0] + ") Tj\n";
+					text = da[0];
 					for ( i = 1, len = da.length ; i < len; i++ ) {
-						var delta = maxLineLength - lineWidths[i];
+						var delta = lineWidths[i-1] - lineWidths[i];
 						if( align === "center" ) delta /= 2;
 						// T* = x-offset leading Td ( text )
-						text += ( ( left - prevX ) + delta ) + " -" + leading + " Td (" + da[i];
-						prevX = left + delta;
-						if( i < len - 1 ) {
-							text += ") Tj\n";
-						}
+						// PDF Spec 1.3 p.288
+						text += ") Tj\n" + delta + " -" + leading + " Td (" + da[i];
+						prevX += delta;
 					}			
 				} else {
 					text = da.join(") Tj\nT* (");