Skip to content

Commit bd9c96b

Browse files
committed
Merge pull request #424 from bjoerne2/beautify_lists
Beautify lists in from_html plugin
2 parents 05a14a8 + b1a0cd9 commit bd9c96b

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

jspdf.plugin.from_html.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@
463463
renderer.y += 10;
464464
} else if (cn.nodeName === "LI") {
465465
var temp = renderer.x;
466-
renderer.x += cn.parentNode.nodeName === "UL" ? 22 : 10;
466+
renderer.x += 20 / renderer.pdf.internal.scaleFactor;
467467
renderer.y += 3;
468468
if (!elementHandledElsewhere(cn, renderer, elementHandlers)) {
469469
DrillForContent(cn, renderer, elementHandlers);
@@ -483,13 +483,12 @@
483483
if (cn.parentNode.parentNode.nodeName === "OL") {
484484
value = listCount++ + '. ' + value;
485485
} else {
486-
var fontPx = fragmentCSS["font-size"] * 16;
487-
var radius = 2;
488-
if (fontPx > 20) {
489-
radius = 3;
490-
}
486+
var fontSize = fragmentCSS["font-size"];
487+
offsetX = (3 - fontSize * 0.75) * renderer.pdf.internal.scaleFactor;
488+
offsetY = fontSize * 0.75 * renderer.pdf.internal.scaleFactor;
489+
radius = fontSize * 1.74 / renderer.pdf.internal.scaleFactor;
491490
cb = function (x, y) {
492-
this.pdf.circle(x, y, radius, 'FD');
491+
this.pdf.circle(x + offsetX, y + offsetY, radius, 'FD');
493492
};
494493
}
495494
}

0 commit comments

Comments
 (0)