pdfmake 0.3.11 → 0.3.13

package/build/standard-fonts/ZapfDingbats.js

@@ -1,21 +1,9 @@
-
-
-var fontContainer = {
-	vfs: {
-		'data/ZapfDingbats.afm': { data: "StartFontMetrics 4.1\nComment Copyright (c) 1985, 1987, 1988, 1989, 1997 Adobe Systems Incorporated. All Rights Reserved.\nComment Creation Date: Thu May  1 15:14:13 1997\nComment UniqueID 43082\nComment VMusage 45775 55535\nFontName ZapfDingbats\nFullName ITC Zapf Dingbats\nFamilyName ZapfDingbats\nWeight Medium\nItalicAngle 0\nIsFixedPitch false\nCharacterSet Special\nFontBBox -1 -143 981 820 \nUnderlinePosition -100\nUnderlineThickness 50\nVersion 002.000\nNotice Copyright (c) 1985, 1987, 1988, 1989, 1997 Adobe Systems Incorporated. All Rights Reserved.ITC Zapf Dingbats is a registered trademark of International Typeface Corporation.\nEncodingScheme FontSpecific\nStdHW 28\nStdVW 90\nStartCharMetrics 202\nC 32 ; WX 278 ; N space ; B 0 0 0 0 ;\nC 33 ; WX 974 ; N a1 ; B 35 72 939 621 ;\nC 34 ; WX 961 ; N a2 ; B 35 81 927 611 ;\nC 35 ; WX 974 ; N a202 ; B 35 72 939 621 ;\nC 36 ; WX 980 ; N a3 ; B 35 0 945 692 ;\nC 37 ; WX 719 ; N a4 ; B 34 139 685 566 ;\nC 38 ; WX 789 ; N a5 ; B 35 -14 755 705 ;\nC 39 ; WX 790 ; N a119 ; B 35 -14 755 705 ;\nC 40 ; WX 791 ; N a118 ; B 35 -13 761 705 ;\nC 41 ; WX 690 ; N a117 ; B 34 138 655 553 ;\nC 42 ; WX 960 ; N a11 ; B 35 123 925 568 ;\nC 43 ; WX 939 ; N a12 ; B 35 134 904 559 ;\nC 44 ; WX 549 ; N a13 ; B 29 -11 516 705 ;\nC 45 ; WX 855 ; N a14 ; B 34 59 820 632 ;\nC 46 ; WX 911 ; N a15 ; B 35 50 876 642 ;\nC 47 ; WX 933 ; N a16 ; B 35 139 899 550 ;\nC 48 ; WX 911 ; N a105 ; B 35 50 876 642 ;\nC 49 ; WX 945 ; N a17 ; B 35 139 909 553 ;\nC 50 ; WX 974 ; N a18 ; B 35 104 938 587 ;\nC 51 ; WX 755 ; N a19 ; B 34 -13 721 705 ;\nC 52 ; WX 846 ; N a20 ; B 36 -14 811 705 ;\nC 53 ; WX 762 ; N a21 ; B 35 0 727 692 ;\nC 54 ; WX 761 ; N a22 ; B 35 0 727 692 ;\nC 55 ; WX 571 ; N a23 ; B -1 -68 571 661 ;\nC 56 ; WX 677 ; N a24 ; B 36 -13 642 705 ;\nC 57 ; WX 763 ; N a25 ; B 35 0 728 692 ;\nC 58 ; WX 760 ; N a26 ; B 35 0 726 692 ;\nC 59 ; WX 759 ; N a27 ; B 35 0 725 692 ;\nC 60 ; WX 754 ; N a28 ; B 35 0 720 692 ;\nC 61 ; WX 494 ; N a6 ; B 35 0 460 692 ;\nC 62 ; WX 552 ; N a7 ; B 35 0 517 692 ;\nC 63 ; WX 537 ; N a8 ; B 35 0 503 692 ;\nC 64 ; WX 577 ; N a9 ; B 35 96 542 596 ;\nC 65 ; WX 692 ; N a10 ; B 35 -14 657 705 ;\nC 66 ; WX 786 ; N a29 ; B 35 -14 751 705 ;\nC 67 ; WX 788 ; N a30 ; B 35 -14 752 705 ;\nC 68 ; WX 788 ; N a31 ; B 35 -14 753 705 ;\nC 69 ; WX 790 ; N a32 ; B 35 -14 756 705 ;\nC 70 ; WX 793 ; N a33 ; B 35 -13 759 705 ;\nC 71 ; WX 794 ; N a34 ; B 35 -13 759 705 ;\nC 72 ; WX 816 ; N a35 ; B 35 -14 782 705 ;\nC 73 ; WX 823 ; N a36 ; B 35 -14 787 705 ;\nC 74 ; WX 789 ; N a37 ; B 35 -14 754 705 ;\nC 75 ; WX 841 ; N a38 ; B 35 -14 807 705 ;\nC 76 ; WX 823 ; N a39 ; B 35 -14 789 705 ;\nC 77 ; WX 833 ; N a40 ; B 35 -14 798 705 ;\nC 78 ; WX 816 ; N a41 ; B 35 -13 782 705 ;\nC 79 ; WX 831 ; N a42 ; B 35 -14 796 705 ;\nC 80 ; WX 923 ; N a43 ; B 35 -14 888 705 ;\nC 81 ; WX 744 ; N a44 ; B 35 0 710 692 ;\nC 82 ; WX 723 ; N a45 ; B 35 0 688 692 ;\nC 83 ; WX 749 ; N a46 ; B 35 0 714 692 ;\nC 84 ; WX 790 ; N a47 ; B 34 -14 756 705 ;\nC 85 ; WX 792 ; N a48 ; B 35 -14 758 705 ;\nC 86 ; WX 695 ; N a49 ; B 35 -14 661 706 ;\nC 87 ; WX 776 ; N a50 ; B 35 -6 741 699 ;\nC 88 ; WX 768 ; N a51 ; B 35 -7 734 699 ;\nC 89 ; WX 792 ; N a52 ; B 35 -14 757 705 ;\nC 90 ; WX 759 ; N a53 ; B 35 0 725 692 ;\nC 91 ; WX 707 ; N a54 ; B 35 -13 672 704 ;\nC 92 ; WX 708 ; N a55 ; B 35 -14 672 705 ;\nC 93 ; WX 682 ; N a56 ; B 35 -14 647 705 ;\nC 94 ; WX 701 ; N a57 ; B 35 -14 666 705 ;\nC 95 ; WX 826 ; N a58 ; B 35 -14 791 705 ;\nC 96 ; WX 815 ; N a59 ; B 35 -14 780 705 ;\nC 97 ; WX 789 ; N a60 ; B 35 -14 754 705 ;\nC 98 ; WX 789 ; N a61 ; B 35 -14 754 705 ;\nC 99 ; WX 707 ; N a62 ; B 34 -14 673 705 ;\nC 100 ; WX 687 ; N a63 ; B 36 0 651 692 ;\nC 101 ; WX 696 ; N a64 ; B 35 0 661 691 ;\nC 102 ; WX 689 ; N a65 ; B 35 0 655 692 ;\nC 103 ; WX 786 ; N a66 ; B 34 -14 751 705 ;\nC 104 ; WX 787 ; N a67 ; B 35 -14 752 705 ;\nC 105 ; WX 713 ; N a68 ; B 35 -14 678 705 ;\nC 106 ; WX 791 ; N a69 ; B 35 -14 756 705 ;\nC 107 ; WX 785 ; N a70 ; B 36 -14 751 705 ;\nC 108 ; WX 791 ; N a71 ; B 35 -14 757 705 ;\nC 109 ; WX 873 ; N a72 ; B 35 -14 838 705 ;\nC 110 ; WX 761 ; N a73 ; B 35 0 726 692 ;\nC 111 ; WX 762 ; N a74 ; B 35 0 727 692 ;\nC 112 ; WX 762 ; N a203 ; B 35 0 727 692 ;\nC 113 ; WX 759 ; N a75 ; B 35 0 725 692 ;\nC 114 ; WX 759 ; N a204 ; B 35 0 725 692 ;\nC 115 ; WX 892 ; N a76 ; B 35 0 858 705 ;\nC 116 ; WX 892 ; N a77 ; B 35 -14 858 692 ;\nC 117 ; WX 788 ; N a78 ; B 35 -14 754 705 ;\nC 118 ; WX 784 ; N a79 ; B 35 -14 749 705 ;\nC 119 ; WX 438 ; N a81 ; B 35 -14 403 705 ;\nC 120 ; WX 138 ; N a82 ; B 35 0 104 692 ;\nC 121 ; WX 277 ; N a83 ; B 35 0 242 692 ;\nC 122 ; WX 415 ; N a84 ; B 35 0 380 692 ;\nC 123 ; WX 392 ; N a97 ; B 35 263 357 705 ;\nC 124 ; WX 392 ; N a98 ; B 34 263 357 705 ;\nC 125 ; WX 668 ; N a99 ; B 35 263 633 705 ;\nC 126 ; WX 668 ; N a100 ; B 36 263 634 705 ;\nC 128 ; WX 390 ; N a89 ; B 35 -14 356 705 ;\nC 129 ; WX 390 ; N a90 ; B 35 -14 355 705 ;\nC 130 ; WX 317 ; N a93 ; B 35 0 283 692 ;\nC 131 ; WX 317 ; N a94 ; B 35 0 283 692 ;\nC 132 ; WX 276 ; N a91 ; B 35 0 242 692 ;\nC 133 ; WX 276 ; N a92 ; B 35 0 242 692 ;\nC 134 ; WX 509 ; N a205 ; B 35 0 475 692 ;\nC 135 ; WX 509 ; N a85 ; B 35 0 475 692 ;\nC 136 ; WX 410 ; N a206 ; B 35 0 375 692 ;\nC 137 ; WX 410 ; N a86 ; B 35 0 375 692 ;\nC 138 ; WX 234 ; N a87 ; B 35 -14 199 705 ;\nC 139 ; WX 234 ; N a88 ; B 35 -14 199 705 ;\nC 140 ; WX 334 ; N a95 ; B 35 0 299 692 ;\nC 141 ; WX 334 ; N a96 ; B 35 0 299 692 ;\nC 161 ; WX 732 ; N a101 ; B 35 -143 697 806 ;\nC 162 ; WX 544 ; N a102 ; B 56 -14 488 706 ;\nC 163 ; WX 544 ; N a103 ; B 34 -14 508 705 ;\nC 164 ; WX 910 ; N a104 ; B 35 40 875 651 ;\nC 165 ; WX 667 ; N a106 ; B 35 -14 633 705 ;\nC 166 ; WX 760 ; N a107 ; B 35 -14 726 705 ;\nC 167 ; WX 760 ; N a108 ; B 0 121 758 569 ;\nC 168 ; WX 776 ; N a112 ; B 35 0 741 705 ;\nC 169 ; WX 595 ; N a111 ; B 34 -14 560 705 ;\nC 170 ; WX 694 ; N a110 ; B 35 -14 659 705 ;\nC 171 ; WX 626 ; N a109 ; B 34 0 591 705 ;\nC 172 ; WX 788 ; N a120 ; B 35 -14 754 705 ;\nC 173 ; WX 788 ; N a121 ; B 35 -14 754 705 ;\nC 174 ; WX 788 ; N a122 ; B 35 -14 754 705 ;\nC 175 ; WX 788 ; N a123 ; B 35 -14 754 705 ;\nC 176 ; WX 788 ; N a124 ; B 35 -14 754 705 ;\nC 177 ; WX 788 ; N a125 ; B 35 -14 754 705 ;\nC 178 ; WX 788 ; N a126 ; B 35 -14 754 705 ;\nC 179 ; WX 788 ; N a127 ; B 35 -14 754 705 ;\nC 180 ; WX 788 ; N a128 ; B 35 -14 754 705 ;\nC 181 ; WX 788 ; N a129 ; B 35 -14 754 705 ;\nC 182 ; WX 788 ; N a130 ; B 35 -14 754 705 ;\nC 183 ; WX 788 ; N a131 ; B 35 -14 754 705 ;\nC 184 ; WX 788 ; N a132 ; B 35 -14 754 705 ;\nC 185 ; WX 788 ; N a133 ; B 35 -14 754 705 ;\nC 186 ; WX 788 ; N a134 ; B 35 -14 754 705 ;\nC 187 ; WX 788 ; N a135 ; B 35 -14 754 705 ;\nC 188 ; WX 788 ; N a136 ; B 35 -14 754 705 ;\nC 189 ; WX 788 ; N a137 ; B 35 -14 754 705 ;\nC 190 ; WX 788 ; N a138 ; B 35 -14 754 705 ;\nC 191 ; WX 788 ; N a139 ; B 35 -14 754 705 ;\nC 192 ; WX 788 ; N a140 ; B 35 -14 754 705 ;\nC 193 ; WX 788 ; N a141 ; B 35 -14 754 705 ;\nC 194 ; WX 788 ; N a142 ; B 35 -14 754 705 ;\nC 195 ; WX 788 ; N a143 ; B 35 -14 754 705 ;\nC 196 ; WX 788 ; N a144 ; B 35 -14 754 705 ;\nC 197 ; WX 788 ; N a145 ; B 35 -14 754 705 ;\nC 198 ; WX 788 ; N a146 ; B 35 -14 754 705 ;\nC 199 ; WX 788 ; N a147 ; B 35 -14 754 705 ;\nC 200 ; WX 788 ; N a148 ; B 35 -14 754 705 ;\nC 201 ; WX 788 ; N a149 ; B 35 -14 754 705 ;\nC 202 ; WX 788 ; N a150 ; B 35 -14 754 705 ;\nC 203 ; WX 788 ; N a151 ; B 35 -14 754 705 ;\nC 204 ; WX 788 ; N a152 ; B 35 -14 754 705 ;\nC 205 ; WX 788 ; N a153 ; B 35 -14 754 705 ;\nC 206 ; WX 788 ; N a154 ; B 35 -14 754 705 ;\nC 207 ; WX 788 ; N a155 ; B 35 -14 754 705 ;\nC 208 ; WX 788 ; N a156 ; B 35 -14 754 705 ;\nC 209 ; WX 788 ; N a157 ; B 35 -14 754 705 ;\nC 210 ; WX 788 ; N a158 ; B 35 -14 754 705 ;\nC 211 ; WX 788 ; N a159 ; B 35 -14 754 705 ;\nC 212 ; WX 894 ; N a160 ; B 35 58 860 634 ;\nC 213 ; WX 838 ; N a161 ; B 35 152 803 540 ;\nC 214 ; WX 1016 ; N a163 ; B 34 152 981 540 ;\nC 215 ; WX 458 ; N a164 ; B 35 -127 422 820 ;\nC 216 ; WX 748 ; N a196 ; B 35 94 698 597 ;\nC 217 ; WX 924 ; N a165 ; B 35 140 890 552 ;\nC 218 ; WX 748 ; N a192 ; B 35 94 698 597 ;\nC 219 ; WX 918 ; N a166 ; B 35 166 884 526 ;\nC 220 ; WX 927 ; N a167 ; B 35 32 892 660 ;\nC 221 ; WX 928 ; N a168 ; B 35 129 891 562 ;\nC 222 ; WX 928 ; N a169 ; B 35 128 893 563 ;\nC 223 ; WX 834 ; N a170 ; B 35 155 799 537 ;\nC 224 ; WX 873 ; N a171 ; B 35 93 838 599 ;\nC 225 ; WX 828 ; N a172 ; B 35 104 791 588 ;\nC 226 ; WX 924 ; N a173 ; B 35 98 889 594 ;\nC 227 ; WX 924 ; N a162 ; B 35 98 889 594 ;\nC 228 ; WX 917 ; N a174 ; B 35 0 882 692 ;\nC 229 ; WX 930 ; N a175 ; B 35 84 896 608 ;\nC 230 ; WX 931 ; N a176 ; B 35 84 896 608 ;\nC 231 ; WX 463 ; N a177 ; B 35 -99 429 791 ;\nC 232 ; WX 883 ; N a178 ; B 35 71 848 623 ;\nC 233 ; WX 836 ; N a179 ; B 35 44 802 648 ;\nC 234 ; WX 836 ; N a193 ; B 35 44 802 648 ;\nC 235 ; WX 867 ; N a180 ; B 35 101 832 591 ;\nC 236 ; WX 867 ; N a199 ; B 35 101 832 591 ;\nC 237 ; WX 696 ; N a181 ; B 35 44 661 648 ;\nC 238 ; WX 696 ; N a200 ; B 35 44 661 648 ;\nC 239 ; WX 874 ; N a182 ; B 35 77 840 619 ;\nC 241 ; WX 874 ; N a201 ; B 35 73 840 615 ;\nC 242 ; WX 760 ; N a183 ; B 35 0 725 692 ;\nC 243 ; WX 946 ; N a184 ; B 35 160 911 533 ;\nC 244 ; WX 771 ; N a197 ; B 34 37 736 655 ;\nC 245 ; WX 865 ; N a185 ; B 35 207 830 481 ;\nC 246 ; WX 771 ; N a194 ; B 34 37 736 655 ;\nC 247 ; WX 888 ; N a198 ; B 34 -19 853 712 ;\nC 248 ; WX 967 ; N a186 ; B 35 124 932 568 ;\nC 249 ; WX 888 ; N a195 ; B 34 -19 853 712 ;\nC 250 ; WX 831 ; N a187 ; B 35 113 796 579 ;\nC 251 ; WX 873 ; N a188 ; B 36 118 838 578 ;\nC 252 ; WX 927 ; N a189 ; B 35 150 891 542 ;\nC 253 ; WX 970 ; N a190 ; B 35 76 931 616 ;\nC 254 ; WX 918 ; N a191 ; B 34 99 884 593 ;\nEndCharMetrics\nEndFontMetrics\n", encoding: 'utf8' }
-	},
-	fonts: {
-		ZapfDingbats: {
-			normal: 'ZapfDingbats'
-		}
-	}
-};
+var fontContainer = {"standardFonts":[{"name":"ZapfDingbats","bbox":[-1,-143,981,820],"ascender":0,"descender":0,"xHeight":0,"capHeight":0,"glyphNames":"space","glyphWidths":[278],"kernPairs":[]}],"fonts":{"ZapfDingbats":{"normal":"ZapfDingbats"}}};
 
 var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : this;
 if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
 	_global.pdfMake.addFontContainer(fontContainer);
 }
-
 if (typeof module !== 'undefined') {
 	module.exports = fontContainer;
 }

package/js/DocumentContext.js

@@ -458,7 +458,9 @@ class DocumentContext extends _events.EventEmitter {
     }
     let page = {
       items: [],
-      pageSize: pageSize,
+      pageSize: {
+        ...pageSize
+      },
       pageMargins: this.pageMargins,
       customProperties: customProperties
     };

package/js/ElementWriter.js

@@ -277,6 +277,7 @@ class ElementWriter extends _events.EventEmitter {
     if (!useBlockXOffset && block.height > ctx.availableHeight) {
       return false;
     }
+    let unbreakableFillsInserted = 0;
     block.items.forEach(item => {
       switch (item.type) {
         case 'line':
@@ -296,9 +297,11 @@ class ElementWriter extends _events.EventEmitter {
           (0, _tools.offsetVector)(v, useBlockXOffset ? block.xOffset || 0 : ctx.x, useBlockYOffset ? block.yOffset || 0 : ctx.y);
           if (v._isFillColorFromUnbreakable) {
             // If the item is a fillColor from an unbreakable block
-            // We have to add it at the beginning of the items body array of the page
+            // We have to add it at the beginning of the items body array of the page,
+            // after the fills already inserted from this block so that they keep their draw order
             delete v._isFillColorFromUnbreakable;
-            const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page];
+            const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page] + unbreakableFillsInserted;
+            unbreakableFillsInserted++;
             page.items.splice(endOfBackgroundItemsIndex, 0, {
               type: 'vector',
               item: v

package/js/LayoutBuilder.js

@@ -490,8 +490,9 @@ class LayoutBuilder {
    * When in snaking columns, first tries moving to next column.
    * If no columns available, moves to next page and resets x to left margin.
    * @param {string} pageOrientation - Optional page orientation for the new page
+   * @param {TableProcessor} [tableProcessor] - Reapply table alignment in the new column
    */
-  snakingAwarePageBreak(pageOrientation) {
+  snakingAwarePageBreak(pageOrientation, tableProcessor) {
     let ctx = this.writer.context();
     let snakingSnapshot = ctx.getSnakingSnapshot();
     if (!snakingSnapshot) {
@@ -500,7 +501,7 @@ class LayoutBuilder {
 
     // Try flowing to next column first
     if (this.writer.canMoveToNextColumn()) {
-      this.writer.moveToNextColumn();
+      this.writer.moveToNextColumn(tableProcessor ? context => tableProcessor.alignTable(context) : undefined);
       return;
     }
 
@@ -514,6 +515,9 @@ class LayoutBuilder {
     let savedLastColumnWidth = ctx.lastColumnWidth;
     ctx.resetSnakingColumnsForNewPage();
     ctx.lastColumnWidth = savedLastColumnWidth;
+    if (tableProcessor) {
+      tableProcessor.alignTable(ctx);
+    }
   }
 
   // vertical container
@@ -964,7 +968,7 @@ class LayoutBuilder {
               let rowTopPageY = this.cell._leftEndingCell._startingRowSpanY + this.cell._leftEndingCell._rowTopPageYPadding;
               return this.cell._leftEndingCell._rowTopPageY - rowTopPageY + this.cell._leftEndingCell._bottomY;
             } else {
-              if (this.cell.positions[0].pageNumber !== this.cell._leftEndingCell._lastPageNumber) {
+              if (this.cell._lastPageNumber !== this.cell._leftEndingCell._lastPageNumber) {
                 return this.bottomY - this.cell._leftEndingCell._bottomY;
               }
               return this.viewHeight + this.cell._leftEndingCell._bottomY - this.bottomY;
@@ -1038,7 +1042,11 @@ class LayoutBuilder {
         // or fall back to a minimum of padding + line height + border
         let minRowHeight = lastRowHeight > 0 ? lastRowHeight : processor.rowPaddingTop + 14 + processor.rowPaddingBottom + processor.bottomLineWidth + processor.topLineWidth;
         if (this.writer.context().availableHeight < minRowHeight) {
-          this.snakingAwarePageBreak();
+          // Column selection needs the container origin, before table alignment.
+          if (processor.alignmentOffset) {
+            this.writer.context().addMargin(-processor.alignmentOffset, processor.alignmentOffset);
+          }
+          this.snakingAwarePageBreak(undefined, processor);
 
           // Skip border when headerRows present (header repeat includes it)
           if (processor.layout.hLineWhenBroken !== false && !processor.headerRows) {

package/js/OutputDocument.js

@@ -7,16 +7,27 @@ class OutputDocument {
    * @param {Promise<object>} pdfDocumentPromise
    */
   constructor(pdfDocumentPromise) {
-    this.bufferSize = 1073741824;
     this.pdfDocumentPromise = pdfDocumentPromise;
     this.bufferPromise = null;
+    this.streamEnded = false;
+    this.streamEndListenerAttached = false;
   }
 
   /**
    * @returns {Promise<object>}
    */
-  getStream() {
-    return this.pdfDocumentPromise;
+  async getStream() {
+    const stream = await this.pdfDocumentPromise;
+    if (this.streamEnded) {
+      throw new Error('PDF stream has already been consumed.');
+    }
+    if (!this.streamEndListenerAttached) {
+      stream.once('end', () => {
+        this.streamEnded = true;
+      });
+      this.streamEndListenerAttached = true;
+    }
+    return stream;
   }
 
   /**
@@ -25,17 +36,15 @@ class OutputDocument {
   getBuffer() {
     const getBufferInternal = async () => {
       const stream = await this.getStream();
-      return new Promise(resolve => {
+      return new Promise((resolve, reject) => {
         let chunks = [];
-        stream.on('readable', () => {
-          let chunk;
-          while ((chunk = stream.read(this.bufferSize)) !== null) {
-            chunks.push(chunk);
-          }
+        stream.on('data', chunk => {
+          chunks.push(chunk);
         });
         stream.on('end', () => {
           resolve(Buffer.concat(chunks));
         });
+        stream.on('error', reject);
         stream.end();
       });
     };

package/js/OutputDocumentServer.js

@@ -11,6 +11,11 @@ class OutputDocumentServer extends _OutputDocument.default {
    * @returns {Promise}
    */
   async write(filename) {
+    await this.pdfDocumentPromise;
+    if (this.bufferPromise !== null) {
+      await _fs.default.promises.writeFile(filename, await this.getBuffer());
+      return;
+    }
     const stream = await this.getStream();
     const writeStream = _fs.default.createWriteStream(filename);
     const streamEnded = new Promise((resolve, reject) => {

package/js/PDFDocument.js

@@ -2,9 +2,8 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _pdfkit = _interopRequireDefault(require("pdfkit"));
+var _pdfkit = require("pdfkit");
 var _variableType = require("./helpers/variableType");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const typeName = (bold, italics) => {
   let type = 'normal';
   if (bold && italics) {
@@ -16,7 +15,7 @@ const typeName = (bold, italics) => {
   }
   return type;
 };
-class PDFDocument extends _pdfkit.default {
+class PDFDocument extends _pdfkit.PDFDocument {
   constructor(fonts = {}, images = {}, patterns = {}, attachments = {}, options = {}, virtualfs = null, localAccessPolicy = undefined) {
     super(options);
     this.fonts = {};
@@ -130,12 +129,12 @@ class PDFDocument extends _pdfkit.default {
       }
       return obj;
     };
-    if (typeof src === 'object') {
-      return checkRequired(src);
-    }
-    let attachment = checkRequired(this.attachments[src]);
+    let attachment = checkRequired(typeof src === 'object' ? src : this.attachments[src]);
     if (this.virtualfs && this.virtualfs.existsSync(attachment.src)) {
-      return this.virtualfs.readFileSync(attachment.src);
+      return {
+        ...attachment,
+        src: this.virtualfs.readFileSync(attachment.src)
+      };
     }
     this.validateLocalFile(attachment.src);
     return attachment;

package/js/PageElementWriter.js

@@ -153,9 +153,13 @@ class PageElementWriter extends _ElementWriter.default {
   /**
    * Move to the next column in a column group (snaking columns).
    * Handles repeatables and emits columnChanged event.
+   * @param {Function} [updateContext] - Adjust the new column before inserting repeatables
    */
-  moveToNextColumn() {
+  moveToNextColumn(updateContext) {
     let nextColumn = this.context().moveToNextColumn();
+    if (updateContext) {
+      updateContext(this.context());
+    }
 
     // Handle repeatables (like table headers) for the new column
     this.repeatables.forEach(function (rep) {

package/js/Renderer.js

@@ -348,6 +348,11 @@ class Renderer {
       }
       return fontFile;
     };
+    options.imageCallback = link => {
+      let src = link.replace(/\s+/g, '');
+      this.pdfDocument.validateLocalFile(src);
+      return src;
+    };
     (0, _svgToPdfkit.default)(this.pdfDocument, svg.svg, svg.x, svg.y, options);
     if (svg.link) {
       this.pdfDocument.link(svg.x, svg.y, svg._width, svg._height, svg.link);

package/js/TableProcessor.js

@@ -102,6 +102,7 @@ class TableProcessor {
     availableWidth = writer.context().availableWidth - this.offsets.total;
     _columnCalculator.default.buildColumnWidths(tableNode.table.widths, availableWidth, this.offsets.total, tableNode);
     this.tableWidth = tableNode._offsets.total + getTableInnerContentWidth();
+    this.alignTable(writer.context());
     this.rowSpanData = prepareRowSpanData();
     this.cleanUpRepeatables = false;
 
@@ -134,6 +135,15 @@ class TableProcessor {
     // update the border properties of all cells before drawing any lines
     prepareCellBorders(this.tableNode.table.body);
   }
+  alignTable(context) {
+    const freeWidth = Math.max(0, context.availableWidth - this.tableWidth);
+    this.alignmentOffset = this.tableNode.tableAlignment === 'center' ? freeWidth / 2 : this.tableNode.tableAlignment === 'right' ? freeWidth : 0;
+    if (this.alignmentOffset) {
+      // Keep the container width intact: column widths have already been resolved.
+      // Row snapshots preserve this origin across page breaks.
+      context.addMargin(this.alignmentOffset, -this.alignmentOffset);
+    }
+  }
   onRowBreak(rowIndex, writer) {
     return () => {
       let offset = this.rowPaddingTop + (!this.headerRows ? this.topLineWidth : 0);
@@ -340,6 +350,9 @@ class TableProcessor {
     if (this.cleanUpRepeatables) {
       writer.popFromRepeatables();
     }
+    if (this.alignmentOffset) {
+      writer.context().addMargin(-this.alignmentOffset, this.alignmentOffset);
+    }
   }
   endRow(rowIndex, writer, pageBreaks) {
     const getLineXs = () => {

package/js/TextDecorator.js

@@ -21,7 +21,7 @@ const groupDecorations = (line, pdfDocument) => {
     let thickness = (0, _variableType.isNumber)(inline.decorationThickness) ? inline.decorationThickness : null;
     for (let ii = 0, ll = decoration.length; ii < ll; ii++) {
       let decorationItem = decoration[ii];
-      if (!currentGroup || decorationItem !== currentGroup.decoration || style !== currentGroup.decorationStyle || color !== currentGroup.decorationColor) {
+      if (!currentGroup || decorationItem !== currentGroup.decoration || style !== currentGroup.decorationStyle || color !== currentGroup.decorationColor || thickness !== currentGroup.decorationThickness) {
         currentGroup = {
           line: line,
           decoration: decorationItem,
@@ -69,7 +69,7 @@ class TextDecorator {
       let max = 0;
       for (let i = 0, l = group.inlines.length; i < l; i++) {
         let inline = group.inlines[i];
-        max = inline.fontSize > max ? i : max;
+        max = inline.fontSize > group.inlines[max].fontSize ? i : max;
       }
       return group.inlines[max];
     };
@@ -135,7 +135,7 @@ class TextDecorator {
         sv = 1;
       let nbWaves = Math.ceil(totalWidth / (sh * 2)) + 1;
       let rwx = x + firstInline.x - 1;
-      this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, y + sv).clip();
+      this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, 2 * sv).clip();
       this.pdfDocument.lineWidth(lw / 3);
       this.pdfDocument.moveTo(rwx, y);
       for (let i = 0; i < nbWaves; i++) {

package/js/browser-extensions/index.js

@@ -6,6 +6,7 @@ var _base = _interopRequireDefault(require("../base"));
 var _OutputDocumentBrowser = _interopRequireDefault(require("./OutputDocumentBrowser"));
 var _fs = _interopRequireDefault(require("fs"));
 var _configurator = _interopRequireDefault(require("core-js/configurator"));
+var _pdfkit = require("pdfkit");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // core-js: Polyfills will be used only if natives completely unavailable.
 (0, _configurator.default)({
@@ -25,7 +26,12 @@ class pdfmake extends _base.default {
     this.fonts = defaultClientFonts;
   }
   addFontContainer(fontContainer) {
-    this.addVirtualFileSystem(fontContainer.vfs);
+    if (fontContainer.standardFonts) {
+      (0, _pdfkit.registerStdFonts)(...fontContainer.standardFonts);
+    }
+    if (fontContainer.vfs) {
+      this.addVirtualFileSystem(fontContainer.vfs);
+    }
     this.addFonts(fontContainer.fonts);
   }
   addVirtualFileSystem(vfs) {

package/js/browser-extensions/standard-fonts/Courier.js

@@ -1,25 +1,7 @@
 "use strict";
 
-var fs = require('fs');
 var fontContainer = {
-  vfs: {
-    'data/Courier.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier.afm', 'utf8'),
-      encoding: 'utf8'
-    },
-    'data/Courier-Bold.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier-Bold.afm', 'utf8'),
-      encoding: 'utf8'
-    },
-    'data/Courier-Oblique.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier-Oblique.afm', 'utf8'),
-      encoding: 'utf8'
-    },
-    'data/Courier-BoldOblique.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier-BoldOblique.afm', 'utf8'),
-      encoding: 'utf8'
-    }
-  },
+  standardFonts: [require('pdfkit/standard-fonts/Courier'), require('pdfkit/standard-fonts/CourierBold'), require('pdfkit/standard-fonts/CourierOblique'), require('pdfkit/standard-fonts/CourierBoldOblique')],
   fonts: {
     Courier: {
       normal: 'Courier',

package/js/browser-extensions/standard-fonts/Helvetica.js

@@ -1,25 +1,7 @@
 "use strict";
 
-var fs = require('fs');
 var fontContainer = {
-  vfs: {
-    'data/Helvetica.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica.afm', 'utf8'),
-      encoding: 'utf8'
-    },
-    'data/Helvetica-Bold.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica-Bold.afm', 'utf8'),
-      encoding: 'utf8'
-    },
-    'data/Helvetica-Oblique.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica-Oblique.afm', 'utf8'),
-      encoding: 'utf8'
-    },
-    'data/Helvetica-BoldOblique.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica-BoldOblique.afm', 'utf8'),
-      encoding: 'utf8'
-    }
-  },
+  standardFonts: [require('pdfkit/standard-fonts/Helvetica'), require('pdfkit/standard-fonts/HelveticaBold'), require('pdfkit/standard-fonts/HelveticaOblique'), require('pdfkit/standard-fonts/HelveticaBoldOblique')],
   fonts: {
     Helvetica: {
       normal: 'Helvetica',

package/js/browser-extensions/standard-fonts/Symbol.js

@@ -1,13 +1,7 @@
 "use strict";
 
-var fs = require('fs');
 var fontContainer = {
-  vfs: {
-    'data/Symbol.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Symbol.afm', 'utf8'),
-      encoding: 'utf8'
-    }
-  },
+  standardFonts: [require('pdfkit/standard-fonts/Symbol')],
   fonts: {
     Symbol: {
       normal: 'Symbol'

package/js/browser-extensions/standard-fonts/Times.js

@@ -1,25 +1,7 @@
 "use strict";
 
-var fs = require('fs');
 var fontContainer = {
-  vfs: {
-    'data/Times-Roman.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-Roman.afm', 'utf8'),
-      encoding: 'utf8'
-    },
-    'data/Times-Bold.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-Bold.afm', 'utf8'),
-      encoding: 'utf8'
-    },
-    'data/Times-Italic.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-Italic.afm', 'utf8'),
-      encoding: 'utf8'
-    },
-    'data/Times-BoldItalic.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-BoldItalic.afm', 'utf8'),
-      encoding: 'utf8'
-    }
-  },
+  standardFonts: [require('pdfkit/standard-fonts/TimesRoman'), require('pdfkit/standard-fonts/TimesBold'), require('pdfkit/standard-fonts/TimesItalic'), require('pdfkit/standard-fonts/TimesBoldItalic')],
   fonts: {
     Times: {
       normal: 'Times-Roman',

package/js/browser-extensions/standard-fonts/ZapfDingbats.js

@@ -1,13 +1,7 @@
 "use strict";
 
-var fs = require('fs');
 var fontContainer = {
-  vfs: {
-    'data/ZapfDingbats.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/ZapfDingbats.afm', 'utf8'),
-      encoding: 'utf8'
-    }
-  },
+  standardFonts: [require('pdfkit/standard-fonts/ZapfDingbats')],
   fonts: {
     ZapfDingbats: {
       normal: 'ZapfDingbats'

package/js/columnCalculator.js

@@ -12,7 +12,7 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
   let starMaxMax = 0;
   let fixedColumns = [];
   let initial_availableWidth = availableWidth;
-  columns.forEach(column => {
+  columns.forEach((column, colIndex) => {
     if (isAutoColumn(column)) {
       autoColumns.push(column);
       autoMin += column._minWidth;
@@ -22,10 +22,16 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
       starMaxMin = Math.max(starMaxMin, column._minWidth);
       starMaxMax = Math.max(starMaxMax, column._maxWidth);
     } else {
-      fixedColumns.push(column);
+      fixedColumns.push({
+        column,
+        colIndex
+      });
     }
   });
-  fixedColumns.forEach((col, colIndex) => {
+  fixedColumns.forEach(({
+    column: col,
+    colIndex
+  }) => {
     // width specified as %
     if ((0, _variableType.isString)(col.width) && /\d+%/.test(col.width)) {
       // In tables we have to take into consideration the reserved width for paddings and borders
@@ -38,7 +44,7 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
         if (colIndex === 0) {
           // first column assumes whole borderLeft and half of border right
           reservedWidth = paddingLeft + paddingRight + borderLeft + borderRight / 2;
-        } else if (colIndex === fixedColumns.length - 1) {
+        } else if (colIndex === columns.length - 1) {
           // last column assumes whole borderRight and half of border left
           reservedWidth = paddingLeft + paddingRight + borderLeft / 2 + borderRight;
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "js/index.js",
   "esnext": "src/index.js",
@@ -10,19 +10,16 @@
   },
   "dependencies": {
     "linebreak": "^1.1.0",
-    "pdfkit": "^0.19.1",
+    "pdfkit": "^0.20.2",
     "xmldoc": "^2.0.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.29.7",
     "@babel/core": "^7.29.7",
-    "@babel/plugin-transform-modules-commonjs": "^7.29.7",
     "@babel/preset-env": "^7.29.7",
     "@eslint/js": "^10.0.1",
-    "assert": "^2.1.0",
     "babel-loader": "^10.1.1",
     "brfs": "^2.0.2",
-    "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "core-js": "^3.49.0",
     "eslint": "^10.4.1",
@@ -37,12 +34,9 @@
     "shx": "^0.4.0",
     "sinon": "^22.0.0",
     "source-map-loader": "^5.0.0",
-    "stream-browserify": "^3.0.0",
     "string-replace-webpack-plugin": "^0.1.3",
     "svg-to-pdfkit": "github:alafr/SVG-to-PDFKit#b091ebd4e7b7d2310eb1003511cd5de480f7e0e1",
     "terser-webpack-plugin": "^5.6.1",
-    "transform-loader": "^0.2.4",
-    "util": "^0.12.5",
     "webpack": "^5.107.2",
     "webpack-cli": "^7.0.3"
   },
@@ -58,7 +52,7 @@
     "build:browser": "webpack",
     "build:vfs": "node build-vfs.js \"./fonts/Roboto\"",
     "build:examples": "node build-examples.js",
-    "build:standard-fonts": "shx mkdir -p build/standard-fonts && brfs \"./src/browser-extensions/standard-fonts/Courier.js\" > build/standard-fonts/Courier.js && brfs \"./src/browser-extensions/standard-fonts/Helvetica.js\" > build/standard-fonts/Helvetica.js && brfs \"./src/browser-extensions/standard-fonts/Times.js\" > build/standard-fonts/Times.js && brfs \"./src/browser-extensions/standard-fonts/Symbol.js\" > build/standard-fonts/Symbol.js && brfs \"./src/browser-extensions/standard-fonts/ZapfDingbats.js\" > build/standard-fonts/ZapfDingbats.js",
+    "build:standard-fonts": "node build-standard-fonts.js",
     "build:fonts": "shx mkdir -p build/fonts && shx mkdir -p build/fonts/Roboto && shx cp -r fonts/Roboto/*.* build/fonts/Roboto && brfs \"./src/browser-extensions/fonts/Roboto.js\" > build/fonts/Roboto.js",
     "lint": "eslint \"./src/**/*.js\" \"./tests/**/*.js\" \"./examples/**/*.js\" \"./standard-fonts/**/*.js\" \"./fonts/**/*.js\"",
     "mocha": "mocha --reporter spec \"./tests/**/*.spec.js\"",

package/src/DocumentContext.js

@@ -493,7 +493,7 @@ class DocumentContext extends EventEmitter {
 			this.availableWidth = pageSize.width - pageMargin.left - pageMargin.right;
 		}
 
-		let page = { items: [], pageSize: pageSize, pageMargins: this.pageMargins, customProperties: customProperties };
+		let page = { items: [], pageSize: { ...pageSize }, pageMargins: this.pageMargins, customProperties: customProperties };
 		this.pages.push(page);
 		this.backgroundLength.push(0);
 		this.page = this.pages.length - 1;

package/src/ElementWriter.js

@@ -331,6 +331,8 @@ class ElementWriter extends EventEmitter {
 			return false;
 		}
 
+		let unbreakableFillsInserted = 0;
+
 		block.items.forEach(item => {
 			switch (item.type) {
 				case 'line':
@@ -354,9 +356,11 @@ class ElementWriter extends EventEmitter {
 					offsetVector(v, useBlockXOffset ? (block.xOffset || 0) : ctx.x, useBlockYOffset ? (block.yOffset || 0) : ctx.y);
 					if (v._isFillColorFromUnbreakable) {
 						// If the item is a fillColor from an unbreakable block
-						// We have to add it at the beginning of the items body array of the page
+						// We have to add it at the beginning of the items body array of the page,
+						// after the fills already inserted from this block so that they keep their draw order
 						delete v._isFillColorFromUnbreakable;
-						const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page];
+						const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page] + unbreakableFillsInserted;
+						unbreakableFillsInserted++;
 						page.items.splice(endOfBackgroundItemsIndex, 0, {
 							type: 'vector',
 							item: v

package/src/LayoutBuilder.js

@@ -566,8 +566,9 @@ class LayoutBuilder {
 	 * When in snaking columns, first tries moving to next column.
 	 * If no columns available, moves to next page and resets x to left margin.
 	 * @param {string} pageOrientation - Optional page orientation for the new page
+	 * @param {TableProcessor} [tableProcessor] - Reapply table alignment in the new column
 	 */
-	snakingAwarePageBreak(pageOrientation) {
+	snakingAwarePageBreak(pageOrientation, tableProcessor) {
 		let ctx = this.writer.context();
 		let snakingSnapshot = ctx.getSnakingSnapshot();
 		if (!snakingSnapshot) {
@@ -576,7 +577,7 @@ class LayoutBuilder {
 
 		// Try flowing to next column first
 		if (this.writer.canMoveToNextColumn()) {
-			this.writer.moveToNextColumn();
+			this.writer.moveToNextColumn(tableProcessor ? context => tableProcessor.alignTable(context) : undefined);
 			return;
 		}
 
@@ -590,6 +591,9 @@ class LayoutBuilder {
 		let savedLastColumnWidth = ctx.lastColumnWidth;
 		ctx.resetSnakingColumnsForNewPage();
 		ctx.lastColumnWidth = savedLastColumnWidth;
+		if (tableProcessor) {
+			tableProcessor.alignTable(ctx);
+		}
 	}
 
 	// vertical container
@@ -1072,7 +1076,7 @@ class LayoutBuilder {
 							let rowTopPageY = this.cell._leftEndingCell._startingRowSpanY + this.cell._leftEndingCell._rowTopPageYPadding;
 							return this.cell._leftEndingCell._rowTopPageY - rowTopPageY + this.cell._leftEndingCell._bottomY;
 						} else {
-							if (this.cell.positions[0].pageNumber !== this.cell._leftEndingCell._lastPageNumber) {
+							if (this.cell._lastPageNumber !== this.cell._leftEndingCell._lastPageNumber) {
 								return this.bottomY - this.cell._leftEndingCell._bottomY;
 							}
 
@@ -1165,7 +1169,11 @@ class LayoutBuilder {
 					processor.bottomLineWidth + processor.topLineWidth
 				);
 				if (this.writer.context().availableHeight < minRowHeight) {
-					this.snakingAwarePageBreak();
+					// Column selection needs the container origin, before table alignment.
+					if (processor.alignmentOffset) {
+						this.writer.context().addMargin(-processor.alignmentOffset, processor.alignmentOffset);
+					}
+					this.snakingAwarePageBreak(undefined, processor);
 
 					// Skip border when headerRows present (header repeat includes it)
 					if (processor.layout.hLineWhenBroken !== false && !processor.headerRows) {