Skip to content

Commit e76f566

Browse files
MrRioMrRio
committed
Merge 'master' into pr/801
2 parents bd60b2f + 5acfc8c commit e76f566

25 files changed

+22626
-16238
lines changed

‎bower.json.bak‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎dist/jspdf.debug.js‎

Lines changed: 15992 additions & 15235 deletions
Large diffs are not rendered by default.

‎dist/jspdf.min.js‎

Lines changed: 160 additions & 162 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/basic.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ <h2><a href="#">Draw example: rectangles / squares</a></h2>
392392

393393
doc.setDrawColor(0);
394394
doc.setFillColor(255, 255, 255);
395-
doc.roundedRect(140, 20, 10, 10, 3, 3, 'FD'); // Black sqaure with rounded corners
395+
doc.roundedRect(140, 20, 10, 10, 3, 3, 'FD'); // Black square with rounded corners
396396

397397
doc.save('Test.pdf');</pre>
398398
<a href="javascript:demoRectangles()" class="button">Run Code</a></p></div>

‎examples/canvg_context2d/bar_graph_with_text_and_lines.html‎

Lines changed: 685 additions & 0 deletions
Large diffs are not rendered by default.

‎examples/downloadify.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<body onload="load()">
1313
<h1>jsPDF Downloadify Example</h1>
1414

15-
<p>This is an example of jsPDF using <a href="http://www.downloadify.info/">Downloadify</a>. This works in all major browsers.</p>
15+
<p>This is an example of jsPDF using <a href="https://github.com/dcneiner/Downloadify">Downloadify</a>. This works in all major browsers.</p>
1616

1717
<p id="downloadify">
1818
You must have Flash 10 installed to download this file.
@@ -42,4 +42,4 @@ <h1>jsPDF Downloadify Example</h1>
4242
}
4343
</script>
4444
</body>
45-
</html>
45+
</html>

‎examples/js/autoprint.js‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/js/basic.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ function demoRectangles() {
140140

141141
doc.setDrawColor(0);
142142
doc.setFillColor(255, 255, 255);
143-
doc.roundedRect(140, 20, 10, 10, 3, 3, 'FD'); // Black sqaure with rounded corners
143+
doc.roundedRect(140, 20, 10, 10, 3, 3, 'FD'); // Black square with rounded corners
144144

145145
doc.save('Test.pdf');
146146
}

‎examples/js/editor.js‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/js/font-faces.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,15 @@ doc.text(20, 50, 'This is helvetica bold.');
1616

1717
doc.setFont("courier");
1818
doc.setFontType("bolditalic");
19-
doc.text(20, 60, 'This is courier bolditalic.');
19+
doc.text(20, 60, 'This is courier bolditalic.');
20+
21+
doc.setFont("times");
22+
doc.setFontType("normal");
23+
doc.text(105, 80, 'This is centred text.', null, null, 'center');
24+
doc.text(105, 90, 'And a little bit more underneath it.', null, null, 'center');
25+
doc.text(200, 100, 'This is right aligned text', null, null, 'right');
26+
doc.text(200, 110, 'And some more', null, null, 'right');
27+
doc.text(20, 120, 'Back to left');
28+
29+
doc.text(20, 140, '10 degrees rotated', null, 10);
30+
doc.text(20, 160, '-10 degrees rotated', null, -10);

0 commit comments

Comments
 (0)