pdfmake 0.2.21 → 0.2.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.2.21",
+  "version": "0.2.23",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",

package/src/browser-extensions/pdfMake.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var isFunction = require('../helpers').isFunction;
+var isObject = require('../helpers').isObject;
 var isUndefined = require('../helpers').isUndefined;
 //var isNull = require('../helpers').isNull;
 var pack = require('../helpers').pack;
@@ -321,6 +322,10 @@ Document.prototype.getStream = function (options, cb) {
 
 module.exports = {
 	createPdf: function (docDefinition, tableLayouts, fonts, vfs) {
+		if (!isObject(docDefinition)) {
+			throw new Error("Parameter 'docDefinition' has an invalid type. Object expected.");
+		}
+
 		if (!canCreatePdf()) {
 			throw 'Your browser does not provide the level of support needed';
 		}

package/src/docMeasure.js

@@ -168,8 +168,10 @@ DocMeasure.prototype.measureImageWithDimensions = function (node, dimensions) {
 		node._width = node._minWidth = node._maxWidth = node.cover.width;
 		node._height = node._minHeight = node._maxHeight = node.cover.height;
 	} else {
-		node._width = node._minWidth = node._maxWidth = node.width || dimensions.width;
-		node._height = node.height || (dimensions.height * node._width / dimensions.width);
+		var ratio = dimensions.width / dimensions.height;
+
+		node._width = node._minWidth = node._maxWidth = node.width || (node.height ? (node.height * ratio) : dimensions.width);
+		node._height = node.height || (node.width ? node.width / ratio : dimensions.height);
 
 		if (isNumber(node.maxWidth) && node.maxWidth < node._width) {
 			node._width = node._minWidth = node._maxWidth = node.maxWidth;
@@ -215,6 +217,15 @@ DocMeasure.prototype.measureSVG = function (node) {
 
 	node.font = this.styleStack.getProperty('font');
 
+	// SVG requires a defined width and height
+	if (!isNumber(node._width) && !isNumber(node._height)) {
+		throw new Error('SVG is missing defined width and height.');
+	} else if (!isNumber(node._width)) {
+		throw new Error('SVG is missing defined width.');
+	} else if (!isNumber(node._height)) {
+		throw new Error('SVG is missing defined height.');
+	}
+
 	// scale SVG based on final dimension
 	node.svg = this.svgMeasure.writeDimensions(node.svg, {
 		width: node._width,
@@ -302,7 +313,7 @@ DocMeasure.prototype.gapSizeForList = function () {
 	return this.textTools.sizeOfString('9. ', this.styleStack);
 };
 
-DocMeasure.prototype.buildUnorderedMarker = function (styleStack, gapSize, type) {
+DocMeasure.prototype.buildUnorderedMarker = function (item, styleStack, gapSize, type) {
 	function buildDisc(gapSize, color) {
 		// TODO: ascender-based calculations
 		var radius = gapSize.fontSize / 6;
@@ -349,7 +360,7 @@ DocMeasure.prototype.buildUnorderedMarker = function (styleStack, gapSize, type)
 	}
 
 	var marker;
-	var color = styleStack.getProperty('markerColor') || styleStack.getProperty('color') || 'black';
+	var color = TextTools.getStyleProperty(item, styleStack, 'markerColor', undefined) || styleStack.getProperty('color') || 'black';
 
 	switch (type) {
 		case 'circle':
@@ -376,7 +387,7 @@ DocMeasure.prototype.buildUnorderedMarker = function (styleStack, gapSize, type)
 	return marker;
 };
 
-DocMeasure.prototype.buildOrderedMarker = function (counter, styleStack, type, separator) {
+DocMeasure.prototype.buildOrderedMarker = function (item, counter, styleStack, type, separator) {
 	function prepareAlpha(counter) {
 		function toAlpha(num) {
 			return (num >= 26 ? toAlpha((num / 26 >> 0) - 1) : '') + 'abcdefghijklmnopqrstuvwxyz'[num % 26 >> 0];
@@ -455,11 +466,11 @@ DocMeasure.prototype.buildOrderedMarker = function (counter, styleStack, type, s
 		}
 	}
 
-	var textArray = { text: counterText };
-	var markerColor = styleStack.getProperty('markerColor');
-	if (markerColor) {
-		textArray.color = markerColor;
-	}
+	var markerColor = TextTools.getStyleProperty(item, styleStack, 'markerColor', undefined) || styleStack.getProperty('color') || 'black';
+	var textArray = {
+		text: counterText,
+		color: markerColor
+	};
 
 	return { _inlines: this.textTools.buildInlines(textArray, styleStack).items };
 };
@@ -476,7 +487,7 @@ DocMeasure.prototype.measureUnorderedList = function (node) {
 		var item = items[i] = this.measureNode(items[i]);
 
 		if (!item.ol && !item.ul) {
-			item.listMarker = this.buildUnorderedMarker(style, node._gapSize, item.listType || node.type);
+			item.listMarker = this.buildUnorderedMarker(item, style, node._gapSize, item.listType || node.type);
 		}
 
 		node._minWidth = Math.max(node._minWidth, items[i]._minWidth + node._gapSize.width);
@@ -505,7 +516,7 @@ DocMeasure.prototype.measureOrderedList = function (node) {
 
 		if (!item.ol && !item.ul) {
 			var counterValue = isNumber(item.counter) ? item.counter : counter;
-			item.listMarker = this.buildOrderedMarker(counterValue, style, item.listType || node.type, node.separator);
+			item.listMarker = this.buildOrderedMarker(item, counterValue, style, item.listType || node.type, node.separator);
 			if (item.listMarker._inlines) {
 				node._gapSize.width = Math.max(node._gapSize.width, item.listMarker._inlines[0].width);
 			}

package/src/helpers.js

@@ -5,7 +5,7 @@ function isString(variable) {
 }
 
 function isNumber(variable) {
-	return typeof variable === 'number' || variable instanceof Number;
+	return ((typeof variable === 'number') || (variable instanceof Number)) && !Number.isNaN(variable);
 }
 
 function isBoolean(variable) {

package/src/printer.js

@@ -15,6 +15,7 @@ var isNumber = require('./helpers').isNumber;
 var isBoolean = require('./helpers').isBoolean;
 var isArray = require('./helpers').isArray;
 var isUndefined = require('./helpers').isUndefined;
+var isObject = require('./helpers').isObject;
 var isPattern = require('./helpers').isPattern;
 var getPattern = require('./helpers').getPattern;
 var SVGtoPDF = require('./3rd-party/svg-to-pdfkit');
@@ -111,6 +112,14 @@ function PdfPrinter(fontDescriptors) {
 PdfPrinter.prototype.createPdfKitDocument = function (docDefinition, options) {
 	options = options || {};
 
+	if (!isObject(docDefinition)) {
+		throw new Error("Parameter 'docDefinition' has an invalid type. Object expected.");
+	}
+
+	if (!isObject(options)) {
+		throw new Error("Parameter 'options' has an invalid type. Object expected.");
+	}
+
 	docDefinition.version = docDefinition.version || '1.3';
 	docDefinition.subset = docDefinition.subset || undefined;
 	docDefinition.tagged = typeof docDefinition.tagged === 'boolean' ? docDefinition.tagged : false;
@@ -677,7 +686,7 @@ function renderImage(image, x, y, pdfKitDoc) {
 }
 
 function renderSVG(svg, x, y, pdfKitDoc, fontProvider) {
-	var options = Object.assign({ width: svg._width, height: svg._height, assumePt: true }, svg.options);
+	var options = Object.assign({ width: svg._width, height: svg._height, assumePt: true, useCSS: !isString(svg.svg) }, svg.options);
 	options.fontCallback = function (family, bold, italic) {
 		var fontsFamily = family.split(',').map(function (f) { return f.trim().replace(/('|")/g, ''); });
 		var font = findFont(fontProvider.fonts, fontsFamily, svg.font || 'Roboto');

package/src/svgMeasure.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var xmldoc = require('xmldoc');
+var isString = require('./helpers').isString;
 
 /** Strip unit postfix, parse number, but return undefined instead of NaN for bad input */
 function stripUnits(textVal) {
@@ -18,11 +19,11 @@ function parseSVG(svgString) {
 	try {
 		doc = new xmldoc.XmlDocument(svgString);
 	} catch (err) {
-		throw new Error('SVGMeasure: ' + err);
+		throw new Error('Invalid svg document (' + err + ')');
 	}
 
 	if (doc.name !== "svg") {
-		throw new Error('SVGMeasure: expected <svg> document');
+		throw new Error('Invalid svg document (expected <svg>)');
 	}
 
 	return doc;
@@ -31,17 +32,30 @@ function parseSVG(svgString) {
 function SVGMeasure() {
 }
 
-SVGMeasure.prototype.measureSVG = function (svgString) {
-
-	var doc = parseSVG(svgString);
+SVGMeasure.prototype.measureSVG = function (svg) {
+	var width, height, viewBox;
+
+	if (isString(svg)) {
+		var doc = parseSVG(svg);
+
+		width = doc.attr.width;
+		height = doc.attr.height;
+		viewBox = doc.attr.viewBox;
+	} else if (typeof SVGElement !== 'undefined' && svg instanceof SVGElement && typeof getComputedStyle === 'function') {
+		width = svg.getAttribute("width");
+		height = svg.getAttribute("height");
+		viewBox = svg.getAttribute("viewBox");
+	} else {
+		throw new Error('Invalid SVG document');
+	}
 
-	var docWidth = stripUnits(doc.attr.width);
-	var docHeight = stripUnits(doc.attr.height);
+	var docWidth = stripUnits(width);
+	var docHeight = stripUnits(height);
 
-	if ((docWidth == undefined || docHeight == undefined) && typeof doc.attr.viewBox == 'string') {
-		var viewBoxParts = doc.attr.viewBox.split(/[,\s]+/);
+	if ((docWidth == undefined || docHeight == undefined) && typeof viewBox == 'string') {
+		var viewBoxParts = viewBox.split(/[,\s]+/);
 		if (viewBoxParts.length !== 4) {
-			throw new Error("Unexpected svg viewbox format, should have 4 entries but found: '" + doc.attr.viewBox + "'");
+			throw new Error("Unexpected svg viewBox format, should have 4 entries but found: '" + viewBox + "'");
 		}
 		if (docWidth == undefined) {
 			docWidth = stripUnits(viewBoxParts[2]);
@@ -57,14 +71,28 @@ SVGMeasure.prototype.measureSVG = function (svgString) {
 	};
 };
 
-SVGMeasure.prototype.writeDimensions = function (svgString, dimensions) {
+SVGMeasure.prototype.writeDimensions = function (svg, dimensions) {
+	if (isString(svg)) {
+		var doc = parseSVG(svg);
+
+		if (typeof doc.attr.viewBox !== 'string') {
+			doc.attr.viewBox = `0 0 ${stripUnits(doc.attr.width)} ${stripUnits(doc.attr.height)}`;
+		}
+
+		doc.attr.width = "" + dimensions.width;
+		doc.attr.height = "" + dimensions.height;
+
+		return doc.toString();
+	}
 
-	var doc = parseSVG(svgString);
+	if (!svg.hasAttribute('viewBox')) {
+		svg.setAttribute('viewBox', `0 0 ${stripUnits(svg.getAttribute('width'))} ${stripUnits(svg.getAttribute('height'))}`);
+	}
 
-	doc.attr.width = "" + dimensions.width;
-	doc.attr.height = "" + dimensions.height;
+	svg.setAttribute('width', "" + dimensions.width);
+	svg.setAttribute('height', "" + dimensions.height);
 
-	return doc.toString();
+	return svg;
 };
 
 module.exports = SVGMeasure;

package/src/textTools.js

@@ -395,4 +395,6 @@ function widthOfString(text, font, fontSize, characterSpacing, fontFeatures) {
 	return font.widthOfString(text, fontSize, fontFeatures) + ((characterSpacing || 0) * (text.length - 1));
 }
 
+TextTools.getStyleProperty = getStyleProperty;
+
 module.exports = TextTools;