pdfmake 0.2.2 → 0.2.3

package/src/svgMeasure.js

@@ -14,7 +14,7 @@ function stripUnits(textVal) {
 /** 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) {

package/src/tableProcessor.js

@@ -426,8 +426,10 @@ TableProcessor.prototype.endRow = function (rowIndex, writer, pageBreaks) {
 				}
 				if (!isNumber(fillOpacity)) {
 					fillOpacity = isFunction(this.layout.fillOpacity) ? this.layout.fillOpacity(rowIndex, this.tableNode, colIndex) : this.layout.fillOpacity;
-                                }
-				if (fillColor) {
+				}
+				var overlayPattern = body[rowIndex][colIndex].overlayPattern;
+				var overlayOpacity = body[rowIndex][colIndex].overlayOpacity;
+				if (fillColor || overlayPattern) {
 					var widthLeftBorder = leftCellBorder ? this.layout.vLineWidth(colIndex, this.tableNode) : 0;
 					var widthRightBorder;
 					if ((colIndex === 0 || colIndex + 1 == body[rowIndex].length) && !rightCellBorder) {
@@ -442,16 +444,33 @@ TableProcessor.prototype.endRow = function (rowIndex, writer, pageBreaks) {
 					var y1f = this.dontBreakRows ? y1 : y1 - (hzLineOffset / 2);
 					var x2f = xs[i + 1].x + widthRightBorder;
 					var y2f = this.dontBreakRows ? y2 + this.bottomLineWidth : y2 + (this.bottomLineWidth / 2);
-					writer.addVector({
-						type: 'rect',
-						x: x1f,
-						y: y1f,
-						w: x2f - x1f,
-						h: y2f - y1f,
-						lineWidth: 0,
-						color: fillColor,
-						fillOpacity: fillOpacity
-					}, false, true, writer.context().backgroundLength[writer.context().page]);
+					var bgWidth = x2f - x1f;
+					var bgHeight = y2f - y1f;
+					if (fillColor) {
+						writer.addVector({
+							type: 'rect',
+							x: x1f,
+							y: y1f,
+							w: bgWidth,
+							h: bgHeight,
+							lineWidth: 0,
+							color: fillColor,
+							fillOpacity: fillOpacity
+						}, false, true, writer.context().backgroundLength[writer.context().page]);
+					}
+
+					if (overlayPattern) {
+						writer.addVector({
+							type: 'rect',
+							x: x1f,
+							y: y1f,
+							w: bgWidth,
+							h: bgHeight,
+							lineWidth: 0,
+							color: overlayPattern,
+							fillOpacity: overlayOpacity
+						}, false, true);
+					}
 				}
 			}
 		}

package/src/textDecorator.js

@@ -1,6 +1,8 @@
 'use strict';
 
 var isArray = require('./helpers').isArray;
+var isPattern = require('./helpers').isPattern;
+var getPattern = require('./helpers').getPattern;
 
 function groupDecorations(line) {
 	var groups = [], currentGroup = null;
@@ -131,15 +133,19 @@ function drawDecorations(line, x, y, pdfKitDoc) {
 	}
 }
 
-function drawBackground(line, x, y, pdfKitDoc) {
+function drawBackground(line, x, y, patterns, pdfKitDoc) {
 	var height = line.getHeight();
 	for (var i = 0, l = line.inlines.length; i < l; i++) {
 		var inline = line.inlines[i];
 		if (!inline.background) {
 			continue;
 		}
+		var color = inline.background;
+		if (isPattern(inline.background)) {
+			color = getPattern(inline.background, patterns);
+		}
 		var justifyShift = (inline.justifyShift || 0);
-		pdfKitDoc.fillColor(inline.background)
+		pdfKitDoc.fillColor(color)
 			.rect(x + inline.x - justifyShift, y, inline.width + justifyShift, height)
 			.fill();
 	}