pdfmake 0.1.66 → 0.1.70

package/src/styleContextStack.js

@@ -103,7 +103,9 @@ StyleContextStack.prototype.autopush = function (item) {
 		'characterSpacing',
 		'noWrap',
 		'markerColor',
-		'leadingIndent'
+		'leadingIndent',
+		'sup',
+		'sub'
 		//'tableCellPadding'
 		// 'cellBorder',
 		// 'headerCellBorder',

package/src/svgMeasure.js

@@ -1,106 +1,70 @@
 'use strict';
 
-function SVGMeasure() {
-}
+var xmldoc = require('xmldoc');
 
-SVGMeasure.prototype.getSVGNode = function (svgString) {
-	// remove newlines
-	svgString = svgString.replace(/\r?\n|\r/g, "");
-
-	var svgNodeMatches = svgString.match(/<svg(.*?)>/);
+/** Strip unit postfix, parse number, but return undefined instead of NaN for bad input */
+function stripUnits(textVal) {
+	var n = parseFloat(textVal);
+	if (typeof n !== 'number' || isNaN(n)) {
+		return undefined;
+	}
+	return n;
+}
 
-	if (svgNodeMatches) {
-		// extract svg node <svg ... >
-		return svgNodeMatches[0];
+/** Make sure it's valid XML and the root tage is <svg/>, returns xmldoc DOM */
+function parseSVG(svgString) {
+	var doc;
+	
+	try {
+		doc = new xmldoc.XmlDocument(svgString);
+	} catch (err) {
+		throw new Error('SVGMeasure: ' + err);
 	}
 
-	return "";
-};
+	if (doc.name !== "svg") {
+		throw new Error('SVGMeasure: expected <svg> document');
+	}
 
-SVGMeasure.prototype.getHeightAndWidth = function (svgString) {
-	var svgNode = this.getSVGNode(svgString);
+	return doc;
+}
 
-	var widthMatches = svgNode.match(/width="([0-9]+(\.[0-9]+)?)(em|ex|px|in|cm|mm|pt|pc|%)?"/);
-	var heightMatches = svgNode.match(/height="([0-9]+(\.[0-9]+)?)(em|ex|px|in|cm|mm|pt|pc|%)?"/);
+function SVGMeasure() {
+}
 
-	if (widthMatches || heightMatches) {
-		return {
-			width: widthMatches ? +widthMatches[1] : undefined,
-			height: heightMatches ? +heightMatches[1] : undefined
-		};
-	}
-};
+SVGMeasure.prototype.measureSVG = function (svgString) {
 
-SVGMeasure.prototype.getViewboxHeightAndWidth = function (svgString) {
-	var svgNode = this.getSVGNode(svgString);
+	var doc = parseSVG(svgString);
 
-	var viewboxMatches = svgNode.match(/viewBox="([+-]?(\d*\.)?\d+(,|\s+|,\s+)[+-]?(\d*\.)?\d+(,|\s+|,\s+)[+-]?(\d*\.)?\d+(,|\s+|,\s+)[+-]?(\d*\.)?\d+)"/);
-	if (viewboxMatches) {
-		var viewboxStr = viewboxMatches[1];
-		var allVieboxEntries = viewboxStr.split(" ");
+	var docWidth = stripUnits(doc.attr.width);
+	var docHeight = stripUnits(doc.attr.height);
 
-		var viewboxEntries = []; // weeding out empty strings
-		for (var i = 0; i < allVieboxEntries.length; i++) {
-			if (allVieboxEntries[i]) {
-				viewboxEntries.push(allVieboxEntries[i]);
-			}
+	if ((docWidth == undefined || docHeight == undefined) && typeof doc.attr.viewBox == 'string') {
+		var viewBoxParts = doc.attr.viewBox.split(/[,\s]+/);
+		if (viewBoxParts.length !== 4) {
+			throw new Error("Unexpected svg viewbox format, should have 4 entries but found: '" + doc.attr.viewBox + "'");
 		}
-
-		if (viewboxEntries.length === 4) {
-			return { width: +viewboxEntries[2], height: +viewboxEntries[3] };
+		if (docWidth == undefined) {
+			docWidth = stripUnits(viewBoxParts[2]);
+		}
+		if (docHeight == undefined) {
+			docHeight = stripUnits(viewBoxParts[3]);
 		}
-
-		throw new Error("Unexpected svg viewbox format, should have 4 entries but found: '" + viewboxStr + "'");
 	}
-};
-
-SVGMeasure.prototype.measureSVG = function (svgString) {
-
-	var heightAndWidth = this.getHeightAndWidth(svgString);
-	var viewboxHeightAndWidth = this.getViewboxHeightAndWidth(svgString);
 
-	return heightAndWidth || viewboxHeightAndWidth || {};
+	return {
+		width: docWidth,
+		height: docHeight
+	};
 };
 
 SVGMeasure.prototype.writeDimensions = function (svgString, dimensions) {
 
-	var svgNode = this.getSVGNode(svgString);
-
-	if (svgNode) {
-
-		var nodeDimensions = this.getHeightAndWidth(svgString);
-
-		if (dimensions.width) {
-
-			var newWidth = 'width="' + dimensions.width + '"';
+	var doc = parseSVG(svgString);
 
-			if (nodeDimensions && nodeDimensions.width) {
-				// replace existing width
-				svgNode = svgNode.replace(/width="[0-9]+(\.[0-9]+)?(em|ex|px|in|cm|mm|pt|pc|%)?"/, newWidth);
-			} else {
-				// insert new width
-				svgNode = svgNode.replace(">", " " + newWidth + ">");
-			}
-		}
-
-		if (dimensions.height) {
-
-			var newHeight = 'height="' + dimensions.height + '"';
-
-			if (nodeDimensions && nodeDimensions.height) {
-				// replace existing height
-				svgNode = svgNode.replace(/height="[0-9]+(\.[0-9]+)?(em|ex|px|in|cm|mm|pt|pc|%)?"/, newHeight);
-			} else {
-				// insert new height
-				svgNode = svgNode.replace(">", " " + newHeight + ">");
-			}
-		}
-
-		// insert updated svg node
-		return svgString.replace(/<svg(.*?)>/, svgNode);
-	}
+	doc.attr.width = "" + dimensions.width;
+	doc.attr.height = "" + dimensions.height;
 
-	return svgString;
+	return doc.toString();
 };
 
 module.exports = SVGMeasure;

package/src/textTools.js

@@ -315,6 +315,13 @@ function measure(fontProvider, textArray, styleContextStack) {
 		var preserveLeadingSpaces = getStyleProperty(item, styleContextStack, 'preserveLeadingSpaces', false);
 		var preserveTrailingSpaces = getStyleProperty(item, styleContextStack, 'preserveTrailingSpaces', false);
 		var opacity = getStyleProperty(item, styleContextStack, 'opacity', 1);
+		var sup = getStyleProperty(item, styleContextStack, 'sup', false);
+		var sub = getStyleProperty(item, styleContextStack, 'sub', false);
+
+		if ((sup || sub) && item.fontSize === undefined) {
+			// font size reduction taken from here: https://en.wikipedia.org/wiki/Subscript_and_superscript#Desktop_publishing
+			fontSize *= 0.58
+		}
 
 		var font = fontProvider.provideFont(fontName, bold, italics);
 
@@ -352,6 +359,8 @@ function measure(fontProvider, textArray, styleContextStack) {
 		item.linkToDestination = linkToDestination;
 		item.noWrap = noWrap;
 		item.opacity = opacity;
+		item.sup = sup;
+		item.sub = sub;
 	});
 
 	return normalized;

package/webpack.config.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+var TerserPlugin = require('terser-webpack-plugin');
 var StringReplacePlugin = require("string-replace-webpack-plugin");
 var webpack = require('webpack');
 var pkg = require('./package.json');
@@ -42,7 +42,8 @@ module.exports = {
 								return "var fs = require('fs');";
 							}
 						}
-					]})
+					]
+				})
 			},
 			{
 				test: /\.js$/,
@@ -80,7 +81,8 @@ module.exports = {
 
 			/* temporary bugfix for FileSaver: added hack for mobile device support, see https://github.com/bpampuch/pdfmake/issues/1664 */
 			/* waiting to merge and release PR https://github.com/eligrey/FileSaver.js/pull/533 */
-			{test: /FileSaver.min.js$/, loader: StringReplacePlugin.replace({
+			{
+				test: /FileSaver.min.js$/, loader: StringReplacePlugin.replace({
 					replacements: [
 						{
 							pattern: '"download"in HTMLAnchorElement.prototype',
@@ -88,26 +90,35 @@ module.exports = {
 								return '(typeof HTMLAnchorElement !== "undefined" && "download" in HTMLAnchorElement.prototype)';
 							}
 						}
-					]})
+					]
+				})
 			},
 
-			{enforce: 'post', test: /fontkit[/\\]index.js$/, loader: "transform-loader?brfs"},
-			{enforce: 'post', test: /unicode-properties[/\\]index.js$/, loader: "transform-loader?brfs"},
-			{enforce: 'post', test: /linebreak[/\\]src[/\\]linebreaker.js/, loader: "transform-loader?brfs"}
+			{ enforce: 'post', test: /fontkit[/\\]index.js$/, loader: "transform-loader?brfs" },
+			{ enforce: 'post', test: /unicode-properties[/\\]index.js$/, loader: "transform-loader?brfs" },
+			{ enforce: 'post', test: /linebreak[/\\]src[/\\]linebreaker.js/, loader: "transform-loader?brfs" }
 		]
 	},
 	optimization: {
 		minimizer: [
-			new UglifyJsPlugin({
+			new TerserPlugin({
 				include: /\.min\.js$/,
 				sourceMap: true,
-				uglifyOptions: {
+				extractComments: false,
+				terserOptions: {
+					format: {
+						preamble: banner,
+						comments: false,
+					},
+					output: {
+						preamble: banner,
+						comments: false,
+					},
 					compress: {
 						drop_console: true
 					},
-					mangle: {
-						reserved: ['HeadTable', 'NameTable', 'CmapTable', 'HheaTable', 'MaxpTable', 'HmtxTable', 'PostTable', 'OS2Table', 'LocaTable', 'GlyfTable']
-					}
+					keep_classnames: true,
+					keep_fnames: true
 				}
 			})
 		]