pdfmake 0.1.68 → 0.1.72

package/build-vfs.js

@@ -0,0 +1,44 @@
+const fs = require('fs');
+
+const vfsBefore = "this.pdfMake = this.pdfMake || {}; this.pdfMake.vfs = ";
+const vfsAfter = ";";
+const sourcePath = process.argv[2];
+const vfsFilename = process.argv[3] ? process.argv[2] : './build/vfs_fonts.js';
+
+var vfs = {};
+
+if (sourcePath === undefined) {
+	console.error('Usage: node build-vfs.js path [filename]');
+	console.log('');
+	console.log('Parameters:');
+	console.log('  path      Source path with fonts.');
+	console.log('  filename  Optional. Output vfs file. Default: ./build/vfs_fonts.js');
+	console.log('');
+	console.log('Examples:');
+	console.log('  node build-vfs.js "examples/fonts"');
+	console.log('  node build-vfs.js "examples/fonts" "./build/vfs_fonts.js"');
+	return;
+}
+
+if (!fs.existsSync(sourcePath)) {
+	console.error('Source path "' + sourcePath + '" not found.');
+	return;
+}
+
+console.log('Source path:', sourcePath);
+console.log('');
+
+var files = fs.readdirSync(sourcePath);
+
+files.forEach(function (file) {
+	var fileBase64 = fs.readFileSync(sourcePath + '/' + file).toString('base64');
+	console.log('FILE:', file);
+
+	vfs[file] = fileBase64;
+});
+
+const vfsFileContent = vfsBefore + JSON.stringify(vfs, null, 2) + vfsAfter;
+fs.writeFileSync(vfsFilename, vfsFileContent);
+
+console.log('');
+console.log('Builded ' + files.length + ' files to ' + vfsFilename + '.');

package/package.json

@@ -1,74 +1,75 @@
-{
-  "name": "pdfmake",
-  "version": "0.1.68",
-  "description": "Client/server side PDF printing in pure JavaScript",
-  "main": "src/printer.js",
-  "browser": "build/pdfmake.js",
-  "directories": {
-    "test": "tests"
-  },
-  "dependencies": {
-    "iconv-lite": "^0.6.2",
-    "linebreak": "^1.0.2",
-    "pdfkit": "^0.11.0",
-    "svg-to-pdfkit": "^0.1.8",
-    "xmldoc": "^1.1.2"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.10.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.10.4",
-    "@babel/preset-env": "^7.10.4",
-    "babel-loader": "^8.1.0",
-    "brfs": "^2.0.2",
-    "core-js": "^3.6.5",
-    "eslint-plugin-jsdoc": "^27.1.2",
-    "expose-loader": "^1.0.0",
-    "fancy-log": "^1.3.3",
-    "file-saver": "^2.0.2",
-    "gulp": "^4.0.2",
-    "gulp-each": "^0.5.0",
-    "gulp-eslint": "^6.0.0",
-    "gulp-file-contents-to-json": "^0.2.2",
-    "gulp-spawn-mocha": "^6.0.0",
-    "mocha": "^7.2.0",
-    "rewire": "^5.0.0",
-    "sinon": "^9.0.2",
-    "string-replace-webpack-plugin": "^0.1.3",
-    "transform-loader": "^0.2.4",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.44.1"
-  },
-  "engines": {
-    "node": ">=8"
-  },
-  "scripts": {
-    "build": "gulp build",
-    "test": "gulp",
-    "playground": "node dev-playground/server.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/bpampuch/pdfmake.git"
-  },
-  "keywords": [
-    "pdf",
-    "javascript",
-    "printing",
-    "layout"
-  ],
-  "author": "Bartek Pampuch <bartosz.pampuch@gmail.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/bpampuch/pdfmake/issues"
-  },
-  "homepage": "http://pdfmake.org",
-  "config": {
-    "blanket": {
-      "pattern": "src",
-      "data-cover-never": [
-        "node_modules",
-        "tests"
-      ]
-    }
-  }
-}
+{
+  "name": "pdfmake",
+  "version": "0.1.72",
+  "description": "Client/server side PDF printing in pure JavaScript",
+  "main": "src/printer.js",
+  "browser": "build/pdfmake.js",
+  "directories": {
+    "test": "tests"
+  },
+  "dependencies": {
+    "iconv-lite": "^0.6.2",
+    "linebreak": "^1.0.2",
+    "pdfkit": "^0.12.0",
+    "svg-to-pdfkit": "^0.1.8",
+    "xmldoc": "^1.1.2"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.10",
+    "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+    "@babel/preset-env": "^7.12.11",
+    "babel-loader": "^8.2.2",
+    "brfs": "^2.0.2",
+    "core-js": "^3.8.1",
+    "eslint-plugin-jsdoc": "^30.7.9",
+    "expose-loader": "^1.0.3",
+    "fancy-log": "^1.3.3",
+    "file-saver": "^2.0.5",
+    "gulp": "^4.0.2",
+    "gulp-each": "^0.5.0",
+    "gulp-eslint": "^6.0.0",
+    "gulp-file-contents-to-json": "^0.2.2",
+    "gulp-spawn-mocha": "^6.0.0",
+    "mocha": "7.2.0",
+    "rewire": "^5.0.0",
+    "sinon": "^9.2.2",
+    "string-replace-webpack-plugin": "^0.1.3",
+    "terser-webpack-plugin": "2.3.8",
+    "transform-loader": "^0.2.4",
+    "webpack": "^4.44.2"
+  },
+  "engines": {
+    "node": ">=8"
+  },
+  "scripts": {
+    "build": "gulp build",
+    "build:vfs": "node build-vfs.js \"./examples/fonts\"",
+    "test": "gulp",
+    "playground": "node dev-playground/server.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/bpampuch/pdfmake.git"
+  },
+  "keywords": [
+    "pdf",
+    "javascript",
+    "printing",
+    "layout"
+  ],
+  "author": "Bartek Pampuch <bartosz.pampuch@gmail.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/bpampuch/pdfmake/issues"
+  },
+  "homepage": "http://pdfmake.org",
+  "config": {
+    "blanket": {
+      "pattern": "src",
+      "data-cover-never": [
+        "node_modules",
+        "tests"
+      ]
+    }
+  }
+}

package/src/layoutBuilder.js

@@ -81,11 +81,7 @@ LayoutBuilder.prototype.layoutDocument = function (docStructure, fontProvider, s
 				}
 			});
 			nodeInfo.startPosition = node.positions[0];
-			nodeInfo.pageNumbers = node.positions.map(function (node) {
-				return node.pageNumber;
-			}).filter(function (element, position, array) {
-				return array.indexOf(element) === position;
-			});
+			nodeInfo.pageNumbers = Array.from(new Set(node.positions.map(function (node) { return node.pageNumber; })));
 			nodeInfo.pages = pages.length;
 			nodeInfo.stack = isArray(node.stack);
 
@@ -100,17 +96,21 @@ LayoutBuilder.prototype.layoutDocument = function (docStructure, fontProvider, s
 				var followingNodesOnPage = [];
 				var nodesOnNextPage = [];
 				var previousNodesOnPage = [];
-				for (var ii = index + 1, l = linearNodeList.length; ii < l; ii++) {
-					if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
-						followingNodesOnPage.push(linearNodeList[ii].nodeInfo);
-					}
-					if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber + 1) > -1) {
-						nodesOnNextPage.push(linearNodeList[ii].nodeInfo);
+				if (pageBreakBeforeFct.length > 1) {
+					for (var ii = index + 1, l = linearNodeList.length; ii < l; ii++) {
+						if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
+							followingNodesOnPage.push(linearNodeList[ii].nodeInfo);
+						}
+						if (pageBreakBeforeFct.length > 2 && linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber + 1) > -1) {
+							nodesOnNextPage.push(linearNodeList[ii].nodeInfo);
+						}
 					}
 				}
-				for (var ii = 0; ii < index; ii++) {
-					if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
-						previousNodesOnPage.push(linearNodeList[ii].nodeInfo);
+				if (pageBreakBeforeFct.length > 3) {
+					for (var ii = 0; ii < index; ii++) {
+						if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
+							previousNodesOnPage.push(linearNodeList[ii].nodeInfo);
+						}
 					}
 				}
 				if (pageBreakBeforeFct(node.nodeInfo, followingNodesOnPage, nodesOnNextPage, previousNodesOnPage)) {

package/src/printer.js

@@ -207,6 +207,8 @@ function calculatePageHeight(pages, margins) {
 			return item.item.getHeight();
 		} else if (item.item._height) {
 			return item.item._height;
+		} else if (item.type === 'vector') {
+			return item.item.y1 > item.item.y2 ? item.item.y1 : item.item.y2;
 		} else {
 			// TODO: add support for next item types
 			return 0;
@@ -214,7 +216,7 @@ function calculatePageHeight(pages, margins) {
 	}
 
 	function getBottomPosition(item) {
-		var top = item.item.y;
+		var top = item.item.y || 0;
 		var height = getItemHeight(item);
 		return top + height;
 	}
@@ -406,6 +408,25 @@ function renderPages(pages, fontProvider, pdfKitDoc, progressCallback) {
 	}
 }
 
+/**
+ * Shift the "y" height of the text baseline up or down (superscript or subscript,
+ * respectively). The exact shift can / should be changed according to standard
+ * conventions.
+ *
+ * @param {number} y
+ * @param {any} inline
+ */
+function offsetText(y, inline) {
+	var newY = y;
+	if (inline.sup) {
+		newY -= inline.fontSize * 0.75;
+	}
+	if (inline.sub) {
+		newY += inline.fontSize * 0.35;
+	}
+	return newY;
+}
+
 function renderLine(line, x, y, pdfKitDoc) {
 	function preparePageNodeRefLine(_pageNodeRef, inline) {
 		var newWidth;
@@ -481,18 +502,20 @@ function renderLine(line, x, y, pdfKitDoc) {
 
 		pdfKitDoc._font = inline.font;
 		pdfKitDoc.fontSize(inline.fontSize);
-		pdfKitDoc.text(inline.text, x + inline.x, y + shiftToBaseline, options);
+
+		var shiftedY = offsetText(y + shiftToBaseline, inline);
+		pdfKitDoc.text(inline.text, x + inline.x, shiftedY, options);
 
 		if (inline.linkToPage) {
 			var _ref = pdfKitDoc.ref({ Type: 'Action', S: 'GoTo', D: [inline.linkToPage, 0, 0] }).end();
-			pdfKitDoc.annotate(x + inline.x, y + shiftToBaseline, inline.width, inline.height, {
+			pdfKitDoc.annotate(x + inline.x, shiftedY, inline.width, inline.height, {
 				Subtype: 'Link',
 				Dest: [inline.linkToPage - 1, 'XYZ', null, null, null]
 			});
 		}
 
 	}
-
+	// Decorations won't draw correctly for superscript
 	textDecorator.drawDecorations(line, x, y, pdfKitDoc);
 }
 
@@ -607,7 +630,18 @@ function renderVector(vector, pdfKitDoc) {
 function renderImage(image, x, y, pdfKitDoc) {
 	var opacity = isNumber(image.opacity) ? image.opacity : 1;
 	pdfKitDoc.opacity(opacity);
-	pdfKitDoc.image(image.image, image.x, image.y, { width: image._width, height: image._height });
+	if (image.cover) {
+		var align = image.cover.align || 'center';
+		var valign = image.cover.valign || 'center';
+		var width = image.cover.width ? image.cover.width : image.width;
+		var height = image.cover.height ? image.cover.height : image.height;
+		pdfKitDoc.save();
+		pdfKitDoc.rect(image.x, image.y, width, height).clip();
+		pdfKitDoc.image(image.image, image.x, image.y, { cover: [width, height], align: align, valign: valign });
+		pdfKitDoc.restore();
+	} else {
+		pdfKitDoc.image(image.image, image.x, image.y, { width: image._width, height: image._height });
+	}
 	if (image.link) {
 		pdfKitDoc.link(image.x, image.y, image._width, image._height, image.link);
 	}

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/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/gulpfile.js

@@ -1,110 +0,0 @@
-var gulp = require('gulp');
-var webpack = require('webpack');
-var mocha = require('gulp-spawn-mocha');
-var eslint = require('gulp-eslint');
-var each = require('gulp-each');
-var fc2json = require('gulp-file-contents-to-json');
-var log = require('fancy-log');
-var exec = require('child_process').exec;
-const fs = require('fs');
-
-var DEBUG = process.env.NODE_ENV === 'debug';
-var CI = process.env.CI === 'true';
-
-var vfsBefore = "this.pdfMake = this.pdfMake || {}; this.pdfMake.vfs = ";
-var vfsAfter = ";";
-
-gulp.task('build', function (callback) {
-	webpack(require('./webpack.config.js'), function (err, stats) {
-		if (err) {
-			callback(err);
-			return;
-		}
-		log("[webpack]", stats.toString({}));
-		if (stats.compilation.errors && stats.compilation.errors.length) {
-			callback(stats.compilation.errors);
-			return;
-		}
-		callback();
-	});
-});
-
-gulp.task('buildWithStandardFonts', function (callback) {
-	webpack(require('./webpack-standardfonts.config.js'), function (err, stats) {
-		if (err) {
-			callback(err);
-			return;
-		}
-		log("[webpack]", stats.toString({}));
-		if (stats.compilation.errors && stats.compilation.errors.length) {
-			callback(stats.compilation.errors);
-			return;
-		}
-		callback();
-	});
-});
-
-gulp.task('test', function () {
-	return gulp.src(['./tests/**/*.js'])
-		.pipe(mocha({
-			debugBrk: DEBUG,
-			R: CI ? 'spec' : 'nyan'
-		}));
-});
-
-gulp.task('lint', function () {
-	return gulp.src(['./src/**/*.js'])
-		.pipe(eslint())
-		.pipe(eslint.format())
-		.pipe(eslint.failAfterError());
-});
-
-gulp.task('buildFonts', function () {
-	return gulp.src(['./examples/fonts/*.*'])
-		.pipe(each(function (content, file, callback) {
-			var newContent = Buffer.from(content).toString('base64');
-			callback(null, newContent);
-		}, 'buffer'))
-		.pipe(fc2json('vfs_fonts.js', { flat: true }))
-		.pipe(each(function (content, file, callback) {
-			var newContent = vfsBefore + content + vfsAfter;
-			callback(null, newContent);
-		}, 'buffer'))
-		.pipe(gulp.dest('build'));
-});
-
-gulp.task('watch', function () {
-	gulp.watch('./src/**', ['test', 'build']);
-	gulp.watch('./tests/**', ['test']);
-});
-
-gulp.task('generateExamples', function (cb) {
-	var errCount = 0;
-	var position = 0;
-	process.chdir('examples');
-
-	const items = fs.readdirSync('.');
-	const files = items.filter(file => file.substring(file.length - 3, file.length) === '.js');
-
-	files.forEach(function (file) {
-		exec(`node ${file}`, function (err, stdout, stderr) {
-			position++;
-			log('FILE: ', file, ` (${position}/${files.length})`);
-			log(stdout);
-
-			if (err) {
-				errCount++;
-				log(stderr);
-			}
-
-			if (position === files.length) {
-				if (errCount) {
-					log('Errors count: ', errCount);
-				}
-				cb();
-			}
-		});
-	});
-});
-
-gulp.task('default', gulp.series(/*'lint',*/ 'test', 'build', 'buildFonts'));

package/webpack-standardfonts.config.js

@@ -1,7 +0,0 @@
-var config = require("./webpack.config.js");
-
-var rule = {enforce: 'post', test: /pdfkit[/\\]js[/\\]/, loader: "transform-loader?brfs"};
-
-config.module.rules.push(rule);
-
-module.exports = config;

package/webpack.config.js

@@ -1,123 +0,0 @@
-var path = require('path');
-var UglifyJsPlugin = require('uglifyjs-webpack-plugin');
-var StringReplacePlugin = require("string-replace-webpack-plugin");
-var webpack = require('webpack');
-var pkg = require('./package.json');
-
-var banner = '/*! ' + pkg.name + ' v' + pkg.version + ', @license ' + pkg.license + ', @link ' + pkg.homepage + ' */';
-
-module.exports = {
-	mode: 'production',
-	entry: {
-		'pdfmake': './src/browser-extensions/pdfMake.js',
-		'pdfmake.min': './src/browser-extensions/pdfMake.js'
-	},
-	output: {
-		path: path.join(__dirname, './build'),
-		filename: '[name].js',
-		libraryTarget: 'umd',
-		// Workaround https://github.com/webpack/webpack/issues/6642 until https://github.com/webpack/webpack/issues/6525 lands.
-		globalObject: `typeof self !== 'undefined' ? self : this`
-	},
-	resolve: {
-		alias: {
-			fs: path.join(__dirname, './src/browser-extensions/virtual-fs.js')
-		}
-	},
-	node: {
-		// Prevent webpack from injecting setImmediate polyfill, which includes a "new Function" through a global polyfill - which cannot be used in a CSP environment with sane defaults
-		setImmediate: false
-	},
-	module: {
-		rules: [
-			// for fs don't use babel _interopDefault command
-			{
-				enforce: 'pre',
-				test: /pdfkit[/\\]js[/\\]/,
-				loader: StringReplacePlugin.replace({
-					replacements: [
-						{
-							pattern: "import fs from 'fs';",
-							replacement: function () {
-								return "var fs = require('fs');";
-							}
-						}
-					]})
-			},
-			{
-				test: /\.js$/,
-				include: /(pdfkit|saslprep|unicode-trie|unicode-properties|dfa|linebreak|png-js)/,
-				use: {
-					loader: 'babel-loader',
-					options: {
-						presets: [
-							[
-								"@babel/preset-env",
-								{
-									targets: {
-										"ie": "10"
-									},
-									modules: false,
-									useBuiltIns: 'usage',
-									// TODO: after fix in babel remove corejs version and remove core-js dependency in package.json
-									corejs: "3.0.0",
-									loose: true
-								}
-							]
-						],
-						plugins: ["@babel/plugin-transform-modules-commonjs"]
-					}
-				}
-			},
-			{
-				test: /pdfMake.js$/,
-				loader: 'expose-loader',
-				options: {
-					exposes: 'pdfMake',
-				},
-				include: [path.join(__dirname, './src/browser-extensions')]
-			},
-
-			/* 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({
-					replacements: [
-						{
-							pattern: '"download"in HTMLAnchorElement.prototype',
-							replacement: function () {
-								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"}
-		]
-	},
-	optimization: {
-		minimizer: [
-			new UglifyJsPlugin({
-				include: /\.min\.js$/,
-				sourceMap: true,
-				uglifyOptions: {
-					compress: {
-						drop_console: true
-					},
-					mangle: {
-						reserved: ['HeadTable', 'NameTable', 'CmapTable', 'HheaTable', 'MaxpTable', 'HmtxTable', 'PostTable', 'OS2Table', 'LocaTable', 'GlyfTable']
-					}
-				}
-			})
-		]
-	},
-	plugins: [
-		new StringReplacePlugin(),
-		new webpack.BannerPlugin({
-			banner: banner,
-			raw: true
-		})
-	],
-	devtool: 'source-map'
-};