JavaScriptCollection
diff --git a/‎examples/basic.html‎
Lines changed: 17 additions & 0 deletions b/‎examples/basic.html‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎examples/js/basic.js‎
Lines changed: 4 additions & 1 deletion b/‎examples/js/basic.js‎
Lines changed: 4 additions & 1 deletion
@@ -364,6 +364,23 @@ <h2><a href="#">Text alignment</a></h2>
 	pdf.save('Test.pdf');</pre>
 <a href="javascript:demoTextAlign()" class="button">Run Code</a></p></div>
 
+
+<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 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>
+
 </div>
 	</div>
 
 
@@ -352,6 +352,7 @@ function demoFromHTML() {
     )
 }
 
+<<<<<<< Upstream, based on mr_rio/master
 function demoTextAlign() {
 	var pdf = new jsPDF('p', 'pt', 'letter');
 
@@ -390,6 +391,8 @@ function demoTextAngles() {
 	pdf.save('Test.pdf');
 }
 
+=======
+>>>>>>> f2bcc5e Demo function and html for text alignment
 function demoTextAlign() {
 	var pdf = new jsPDF('p', 'pt', 'letter');
 
@@ -404,4 +407,4 @@ function demoTextAlign() {
 	pdf.text( 'This text is\raligned to the\rright.', 400, 550, -85, 'right' );
 
 	pdf.save('Test.pdf');
-}
+}
Original file line number	Diff line number	Diff line change
`@@ -352,6 +352,7 @@ function demoFromHTML() {`
`352`	`352`	`)`
`353`	`353`	`}`
`354`	`354`
	`355`	`+<<<<<<< Upstream, based on mr_rio/master`
`355`	`356`	`function demoTextAlign() {`
`356`	`357`	`var pdf = new jsPDF('p', 'pt', 'letter');`
`357`	`358`
`@@ -390,6 +391,8 @@ function demoTextAngles() {`
`390`	`391`	`pdf.save('Test.pdf');`
`391`	`392`	`}`
`392`	`393`
	`394`	`+=======`
	`395`	`+>>>>>>> f2bcc5e Demo function and html for text alignment`
`393`	`396`	`function demoTextAlign() {`
`394`	`397`	`var pdf = new jsPDF('p', 'pt', 'letter');`
`395`	`398`
`@@ -404,4 +407,4 @@ function demoTextAlign() {`
`404`	`407`	`pdf.text( 'This text is\raligned to the\rright.', 400, 550, -85, 'right' );`
`405`	`408`
`406`	`409`	`pdf.save('Test.pdf');`
`407`		`-}`
	`410`	`+}`