pdfmake 0.3.3 → 0.3.4

package/src/PageElementWriter.js

@@ -1,179 +1,187 @@
-import ElementWriter from './ElementWriter';
-import { normalizePageSize, normalizePageMargin } from './PageSize';
-import DocumentContext from './DocumentContext';
-
-/**
- * An extended ElementWriter which can handle:
- * - page-breaks (it adds new pages when there's not enough space left),
- * - repeatable fragments (like table-headers, which are repeated everytime
- *                         a page-break occurs)
- * - transactions (used for unbreakable-blocks when we want to make sure
- *                 whole block will be rendered on the same page)
- */
-class PageElementWriter extends ElementWriter {
-
-	/**
-	 * @param {DocumentContext} context
-	 */
-	constructor(context) {
-		super(context);
-		this.transactionLevel = 0;
-		this.repeatables = [];
-	}
-
-	addLine(line, dontUpdateContextPosition, index) {
-		return this._fitOnPage(() => super.addLine(line, dontUpdateContextPosition, index));
-	}
-
-	addImage(image, index) {
-		return this._fitOnPage(() => super.addImage(image, index));
-	}
-
-	addCanvas(image, index) {
-		return this._fitOnPage(() => super.addCanvas(image, index));
-	}
-
-	addSVG(image, index) {
-		return this._fitOnPage(() => super.addSVG(image, index));
-	}
-
-	addQr(qr, index) {
-		return this._fitOnPage(() => super.addQr(qr, index));
-	}
-
-	addAttachment(attachment, index) {
-		return this._fitOnPage(() => super.addAttachment(attachment, index));
-	}
-
-	addVector(vector, ignoreContextX, ignoreContextY, index, forcePage) {
-		return super.addVector(vector, ignoreContextX, ignoreContextY, index, forcePage);
-	}
-
-	beginClip(width, height) {
-		return super.beginClip(width, height);
-	}
-
-	endClip() {
-		return super.endClip();
-	}
-
-	addFragment(fragment, useBlockXOffset, useBlockYOffset, dontUpdateContextPosition) {
-		return this._fitOnPage(() => super.addFragment(fragment, useBlockXOffset, useBlockYOffset, dontUpdateContextPosition));
-	}
-
-	moveToNextPage(pageOrientation) {
-		let nextPage = this.context().moveToNextPage(pageOrientation);
-
-		// moveToNextPage is called multiple times for table, because is called for each column
-		// and repeatables are inserted only in the first time. If columns are used, is needed
-		// call for table in first column and then for table in the second column (is other repeatables).
-		this.repeatables.forEach(function (rep) {
-			if (rep.insertedOnPages[this.context().page] === undefined) {
-				rep.insertedOnPages[this.context().page] = true;
-				this.addFragment(rep, true);
-			} else {
-				this.context().moveDown(rep.height);
-			}
-		}, this);
-
-		this.emit('pageChanged', {
-			prevPage: nextPage.prevPage,
-			prevY: nextPage.prevY,
-			y: this.context().y
-		});
-	}
-
-	addPage(pageSize, pageOrientation, pageMargin, customProperties = {}) {
-		let prevPage = this.page;
-		let prevY = this.y;
-
-		this.context().addPage(normalizePageSize(pageSize, pageOrientation), normalizePageMargin(pageMargin), customProperties);
-
-		this.emit('pageChanged', {
-			prevPage: prevPage,
-			prevY: prevY,
-			y: this.context().y
-		});
-	}
-
-	beginUnbreakableBlock(width, height) {
-		if (this.transactionLevel++ === 0) {
-			this.originalX = this.context().x;
-			this.pushContext(width, height);
-		}
-	}
-
-	commitUnbreakableBlock(forcedX, forcedY) {
-		if (--this.transactionLevel === 0) {
-			let unbreakableContext = this.context();
-			this.popContext();
-
-			let nbPages = unbreakableContext.pages.length;
-			if (nbPages > 0) {
-				// no support for multi-page unbreakableBlocks
-				let fragment = unbreakableContext.pages[0];
-				fragment.xOffset = forcedX;
-				fragment.yOffset = forcedY;
-
-				//TODO: vectors can influence height in some situations
-				if (nbPages > 1) {
-					// on out-of-context blocs (headers, footers, background) height should be the whole DocumentContext height
-					if (forcedX !== undefined || forcedY !== undefined) {
-						fragment.height = unbreakableContext.getCurrentPage().pageSize.height - unbreakableContext.pageMargins.top - unbreakableContext.pageMargins.bottom;
-					} else {
-						fragment.height = this.context().getCurrentPage().pageSize.height - this.context().pageMargins.top - this.context().pageMargins.bottom;
-						for (let i = 0, l = this.repeatables.length; i < l; i++) {
-							fragment.height -= this.repeatables[i].height;
-						}
-					}
-				} else {
-					fragment.height = unbreakableContext.y;
-				}
-
-				if (forcedX !== undefined || forcedY !== undefined) {
-					super.addFragment(fragment, true, true, true);
-				} else {
-					this.addFragment(fragment);
-				}
-			}
-		}
-	}
-
-	currentBlockToRepeatable() {
-		let unbreakableContext = this.context();
-		let rep = { items: [] };
-
-		unbreakableContext.pages[0].items.forEach(item => {
-			rep.items.push(item);
-		});
-
-		rep.xOffset = this.originalX;
-
-		//TODO: vectors can influence height in some situations
-		rep.height = unbreakableContext.y;
-
-		rep.insertedOnPages = [];
-
-		return rep;
-	}
-
-	pushToRepeatables(rep) {
-		this.repeatables.push(rep);
-	}
-
-	popFromRepeatables() {
-		this.repeatables.pop();
-	}
-
-	_fitOnPage(addFct) {
-		let position = addFct();
-		if (!position) {
-			this.moveToNextPage();
-			position = addFct();
-		}
-		return position;
-	}
-
-}
-
-export default PageElementWriter;
+import ElementWriter from './ElementWriter';
+import { normalizePageSize, normalizePageMargin } from './PageSize';
+import DocumentContext from './DocumentContext';
+
+/**
+ * An extended ElementWriter which can handle:
+ * - page-breaks (it adds new pages when there's not enough space left),
+ * - repeatable fragments (like table-headers, which are repeated everytime
+ *                         a page-break occurs)
+ * - transactions (used for unbreakable-blocks when we want to make sure
+ *                 whole block will be rendered on the same page)
+ */
+class PageElementWriter extends ElementWriter {
+
+	/**
+	 * @param {DocumentContext} context
+	 */
+	constructor(context) {
+		super(context);
+		this.transactionLevel = 0;
+		this.repeatables = [];
+	}
+
+	addLine(line, dontUpdateContextPosition, index) {
+		return this._fitOnPage(() => super.addLine(line, dontUpdateContextPosition, index));
+	}
+
+	addImage(image, index) {
+		return this._fitOnPage(() => super.addImage(image, index));
+	}
+
+	addCanvas(image, index) {
+		return this._fitOnPage(() => super.addCanvas(image, index));
+	}
+
+	addSVG(image, index) {
+		return this._fitOnPage(() => super.addSVG(image, index));
+	}
+
+	addQr(qr, index) {
+		return this._fitOnPage(() => super.addQr(qr, index));
+	}
+
+	addAttachment(attachment, index) {
+		return this._fitOnPage(() => super.addAttachment(attachment, index));
+	}
+
+	addVector(vector, ignoreContextX, ignoreContextY, index, forcePage) {
+		return super.addVector(vector, ignoreContextX, ignoreContextY, index, forcePage);
+	}
+
+	beginClip(width, height) {
+		return super.beginClip(width, height);
+	}
+
+	endClip() {
+		return super.endClip();
+	}
+
+	beginVerticalAlignment(verticalAlignment) {
+		return super.beginVerticalAlignment(verticalAlignment);
+	}
+
+	endVerticalAlignment(verticalAlignment) {
+		return super.endVerticalAlignment(verticalAlignment);
+	}
+
+	addFragment(fragment, useBlockXOffset, useBlockYOffset, dontUpdateContextPosition) {
+		return this._fitOnPage(() => super.addFragment(fragment, useBlockXOffset, useBlockYOffset, dontUpdateContextPosition));
+	}
+
+	moveToNextPage(pageOrientation) {
+		let nextPage = this.context().moveToNextPage(pageOrientation);
+
+		// moveToNextPage is called multiple times for table, because is called for each column
+		// and repeatables are inserted only in the first time. If columns are used, is needed
+		// call for table in first column and then for table in the second column (is other repeatables).
+		this.repeatables.forEach(function (rep) {
+			if (rep.insertedOnPages[this.context().page] === undefined) {
+				rep.insertedOnPages[this.context().page] = true;
+				this.addFragment(rep, true);
+			} else {
+				this.context().moveDown(rep.height);
+			}
+		}, this);
+
+		this.emit('pageChanged', {
+			prevPage: nextPage.prevPage,
+			prevY: nextPage.prevY,
+			y: this.context().y
+		});
+	}
+
+	addPage(pageSize, pageOrientation, pageMargin, customProperties = {}) {
+		let prevPage = this.page;
+		let prevY = this.y;
+
+		this.context().addPage(normalizePageSize(pageSize, pageOrientation), normalizePageMargin(pageMargin), customProperties);
+
+		this.emit('pageChanged', {
+			prevPage: prevPage,
+			prevY: prevY,
+			y: this.context().y
+		});
+	}
+
+	beginUnbreakableBlock(width, height) {
+		if (this.transactionLevel++ === 0) {
+			this.originalX = this.context().x;
+			this.pushContext(width, height);
+		}
+	}
+
+	commitUnbreakableBlock(forcedX, forcedY) {
+		if (--this.transactionLevel === 0) {
+			let unbreakableContext = this.context();
+			this.popContext();
+
+			let nbPages = unbreakableContext.pages.length;
+			if (nbPages > 0) {
+				// no support for multi-page unbreakableBlocks
+				let fragment = unbreakableContext.pages[0];
+				fragment.xOffset = forcedX;
+				fragment.yOffset = forcedY;
+
+				//TODO: vectors can influence height in some situations
+				if (nbPages > 1) {
+					// on out-of-context blocs (headers, footers, background) height should be the whole DocumentContext height
+					if (forcedX !== undefined || forcedY !== undefined) {
+						fragment.height = unbreakableContext.getCurrentPage().pageSize.height - unbreakableContext.pageMargins.top - unbreakableContext.pageMargins.bottom;
+					} else {
+						fragment.height = this.context().getCurrentPage().pageSize.height - this.context().pageMargins.top - this.context().pageMargins.bottom;
+						for (let i = 0, l = this.repeatables.length; i < l; i++) {
+							fragment.height -= this.repeatables[i].height;
+						}
+					}
+				} else {
+					fragment.height = unbreakableContext.y;
+				}
+
+				if (forcedX !== undefined || forcedY !== undefined) {
+					super.addFragment(fragment, true, true, true);
+				} else {
+					this.addFragment(fragment);
+				}
+			}
+		}
+	}
+
+	currentBlockToRepeatable() {
+		let unbreakableContext = this.context();
+		let rep = { items: [] };
+
+		unbreakableContext.pages[0].items.forEach(item => {
+			rep.items.push(item);
+		});
+
+		rep.xOffset = this.originalX;
+
+		//TODO: vectors can influence height in some situations
+		rep.height = unbreakableContext.y;
+
+		rep.insertedOnPages = [];
+
+		return rep;
+	}
+
+	pushToRepeatables(rep) {
+		this.repeatables.push(rep);
+	}
+
+	popFromRepeatables() {
+		this.repeatables.pop();
+	}
+
+	_fitOnPage(addFct) {
+		let position = addFct();
+		if (!position) {
+			this.moveToNextPage();
+			position = addFct();
+		}
+		return position;
+	}
+
+}
+
+export default PageElementWriter;

package/src/PageSize.js

@@ -1,53 +1,53 @@
-import sizes from './standardPageSizes';
-import { isString, isNumber } from './helpers/variableType';
-
-export function normalizePageSize(pageSize, pageOrientation) {
-	function isNeedSwapPageSizes(pageOrientation) {
-		if (isString(pageOrientation)) {
-			pageOrientation = pageOrientation.toLowerCase();
-			return ((pageOrientation === 'portrait') && (size.width > size.height)) ||
-				((pageOrientation === 'landscape') && (size.width < size.height));
-		}
-		return false;
-	}
-
-	function pageSizeToWidthAndHeight(pageSize) {
-		if (isString(pageSize)) {
-			let size = sizes[pageSize.toUpperCase()];
-			if (!size) {
-				throw new Error(`Page size ${pageSize} not recognized`);
-			}
-			return { width: size[0], height: size[1] };
-		}
-
-		return pageSize;
-	}
-
-	// if pageSize.height is set to auto, set the height to infinity so there are no page breaks.
-	if (pageSize && pageSize.height === 'auto') {
-		pageSize.height = Infinity;
-	}
-
-	let size = pageSizeToWidthAndHeight(pageSize || 'A4');
-	if (isNeedSwapPageSizes(pageOrientation)) { // swap page sizes
-		size = { width: size.height, height: size.width };
-	}
-	size.orientation = size.width > size.height ? 'landscape' : 'portrait';
-	return size;
-}
-
-export function normalizePageMargin(margin) {
-	if (isNumber(margin)) {
-		margin = { left: margin, right: margin, top: margin, bottom: margin };
-	} else if (Array.isArray(margin)) {
-		if (margin.length === 2) {
-			margin = { left: margin[0], top: margin[1], right: margin[0], bottom: margin[1] };
-		} else if (margin.length === 4) {
-			margin = { left: margin[0], top: margin[1], right: margin[2], bottom: margin[3] };
-		} else {
-			throw new Error('Invalid pageMargins definition');
-		}
-	}
-
-	return margin;
-}
+import sizes from './standardPageSizes';
+import { isString, isNumber } from './helpers/variableType';
+
+export function normalizePageSize(pageSize, pageOrientation) {
+	function isNeedSwapPageSizes(pageOrientation) {
+		if (isString(pageOrientation)) {
+			pageOrientation = pageOrientation.toLowerCase();
+			return ((pageOrientation === 'portrait') && (size.width > size.height)) ||
+				((pageOrientation === 'landscape') && (size.width < size.height));
+		}
+		return false;
+	}
+
+	function pageSizeToWidthAndHeight(pageSize) {
+		if (isString(pageSize)) {
+			let size = sizes[pageSize.toUpperCase()];
+			if (!size) {
+				throw new Error(`Page size ${pageSize} not recognized`);
+			}
+			return { width: size[0], height: size[1] };
+		}
+
+		return pageSize;
+	}
+
+	// if pageSize.height is set to auto, set the height to infinity so there are no page breaks.
+	if (pageSize && pageSize.height === 'auto') {
+		pageSize.height = Infinity;
+	}
+
+	let size = pageSizeToWidthAndHeight(pageSize || 'A4');
+	if (isNeedSwapPageSizes(pageOrientation)) { // swap page sizes
+		size = { width: size.height, height: size.width };
+	}
+	size.orientation = size.width > size.height ? 'landscape' : 'portrait';
+	return size;
+}
+
+export function normalizePageMargin(margin) {
+	if (isNumber(margin)) {
+		margin = { left: margin, right: margin, top: margin, bottom: margin };
+	} else if (Array.isArray(margin)) {
+		if (margin.length === 2) {
+			margin = { left: margin[0], top: margin[1], right: margin[0], bottom: margin[1] };
+		} else if (margin.length === 4) {
+			margin = { left: margin[0], top: margin[1], right: margin[2], bottom: margin[3] };
+		} else {
+			throw new Error('Invalid pageMargins definition');
+		}
+	}
+
+	return margin;
+}