From b1a0cd9160b8820b3135287c7391fea264d2c85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Weinbrenner?= Date: Sun, 14 Dec 2014 18:09:55 +0100 Subject: [PATCH] Beautify lists in from_html plugin --- jspdf.plugin.from_html.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/jspdf.plugin.from_html.js b/jspdf.plugin.from_html.js index 79395fcd9..94d99ba1c 100644 --- a/jspdf.plugin.from_html.js +++ b/jspdf.plugin.from_html.js @@ -455,7 +455,7 @@ renderer.y += 10; } else if (cn.nodeName === "LI") { var temp = renderer.x; - renderer.x += cn.parentNode.nodeName === "UL" ? 22 : 10; + renderer.x += 20 / renderer.pdf.internal.scaleFactor; renderer.y += 3; if (!elementHandledElsewhere(cn, renderer, elementHandlers)) { DrillForContent(cn, renderer, elementHandlers); @@ -474,13 +474,12 @@ if (cn.parentNode.parentNode.nodeName === "OL") { value = listCount++ + '. ' + value; } else { - var fontPx = fragmentCSS["font-size"] * 16; - var radius = 2; - if (fontPx > 20) { - radius = 3; - } + var fontSize = fragmentCSS["font-size"]; + offsetX = (3 - fontSize * 0.75) * renderer.pdf.internal.scaleFactor; + offsetY = fontSize * 0.75 * renderer.pdf.internal.scaleFactor; + radius = fontSize * 1.74 / renderer.pdf.internal.scaleFactor; cb = function (x, y) { - this.pdf.circle(x, y, radius, 'FD'); + this.pdf.circle(x + offsetX, y + offsetY, radius, 'FD'); }; } }