Skip to content

Commit 5016fa2

Browse files
MrRioMrRio
authored
Merge pull request parallax#849 from MrRio/bugfix-align-fix
Fix alignment in Acrobat, and add example
2 parents e527636 + a7cc7ae commit 5016fa2

5 files changed

Lines changed: 21 additions & 16 deletions

File tree

‎dist/jspdf.debug.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
/** @preserve
1414
* jsPDF - PDF Document creation from JavaScript
15-
* Version 1.2.61 Built on 2016-09-25T19:47:26.050Z
16-
* CommitID 68baeff299
15+
* Version 1.2.61 Built on 2016-09-25T20:14:04.913Z
16+
* CommitID e527636485
1717
*
1818
* Copyright (c) 2010-2014 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
1919
* 2010 Aaron Spike, https://github.com/acspike
@@ -1295,16 +1295,13 @@
12951295
throw new Error('Unrecognized alignment option, use "center" or "right".');
12961296
}
12971297
prevX = x;
1298-
text = da[0] + ") Tj\n";
1298+
text = da[0];
12991299
for (var i = 1, len = da.length; i < len; i++) {
13001300
var delta = maxLineLength - lineWidths[i];
13011301
if (align === "center") delta /= 2;
13021302
// T* = x-offset leading Td ( text )
1303-
text += left - prevX + delta + " -" + leading + " Td (" + da[i];
1303+
text += ") Tj\n" + (left - prevX + delta) + " -" + leading + " Td (" + da[i];
13041304
prevX = left + delta;
1305-
if (i < len - 1) {
1306-
text += ") Tj\n";
1307-
}
13081305
}
13091306
} else {
13101307
text = da.join(") Tj\nT* (");
@@ -2029,7 +2026,7 @@
20292026
* pdfdoc.mymethod() // <- !!!!!!
20302027
*/
20312028
jsPDF.API = { events: [] };
2032-
jsPDF.version = "1.2.61 2016-09-25T19:47:26.050Z:jameshall";
2029+
jsPDF.version = "1.2.61 2016-09-25T20:14:04.913Z:jameshall";
20332030

20342031
if (typeof define === 'function' && define.amd) {
20352032
define('jsPDF', function () {

‎dist/jspdf.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/js/editor.js‎

Lines changed: 1 addition & 1 deletion
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);

‎jspdf.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,16 +1303,13 @@ var jsPDF = (function (global) {
13031303
throw new Error('Unrecognized alignment option, use "center" or "right".');
13041304
}
13051305
prevX = x;
1306-
text = da[0] + ") Tj\n";
1306+
text = da[0];
13071307
for (var i = 1, len = da.length; i < len; i++) {
13081308
var delta = maxLineLength - lineWidths[i];
13091309
if (align === "center") delta /= 2;
13101310
// T* = x-offset leading Td ( text )
1311-
text += ( ( left - prevX ) + delta ) + " -" + leading + " Td (" + da[i];
1311+
text += ") Tj\n" + ( ( left - prevX ) + delta ) + " -" + leading + " Td (" + da[i];
13121312
prevX = left + delta;
1313-
if (i < len - 1) {
1314-
text += ") Tj\n";
1315-
}
13161313
}
13171314
} else {
13181315
text = da.join(") Tj\nT* (");

0 commit comments

Comments
 (0)