pdfkit 0.14.0 → 0.15.0

package/js/pdfkit.esnext.js

@@ -5,6 +5,7 @@ import CryptoJS from 'crypto-js';
 import fontkit from 'fontkit';
 import { EventEmitter } from 'events';
 import LineBreaker from 'linebreak';
+import exif from 'jpeg-exif';
 import PNG from 'png-js';
 
 /*
@@ -2672,6 +2673,11 @@ var VectorMixin = {
 
   transform(m11, m12, m21, m22, dx, dy) {
     // keep track of the current transformation matrix
+    if (m11 === 1 && m12 === 0 && m21 === 0 && m22 === 1 && dx === 0 && dy === 0) {
+      // Ignore identity transforms
+      return this;
+    }
+
     var m = this._ctm;
     var [m0, m1, m2, m3, m4, m5] = m;
     m[0] = m0 * m11 + m2 * m12;
@@ -3304,7 +3310,17 @@ class EmbeddedFont extends PDFFont {
       entries.push("<".concat(encoded.join(' '), ">"));
     }
 
-    cmap.end("/CIDInit /ProcSet findresource begin\n12 dict begin\nbegincmap\n/CIDSystemInfo <<\n  /Registry (Adobe)\n  /Ordering (UCS)\n  /Supplement 0\n>> def\n/CMapName /Adobe-Identity-UCS def\n/CMapType 2 def\n1 begincodespacerange\n<0000><ffff>\nendcodespacerange\n1 beginbfrange\n<0000> <".concat(toHex(entries.length - 1), "> [").concat(entries.join(' '), "]\nendbfrange\nendcmap\nCMapName currentdict /CMap defineresource pop\nend\nend"));
+    var chunkSize = 256;
+    var chunks = Math.ceil(entries.length / chunkSize);
+    var ranges = [];
+
+    for (var i = 0; i < chunks; i++) {
+      var start = i * chunkSize;
+      var end = Math.min((i + 1) * chunkSize, entries.length);
+      ranges.push("<".concat(toHex(start), "> <").concat(toHex(end - 1), "> [").concat(entries.slice(start, end).join(' '), "]"));
+    }
+
+    cmap.end("/CIDInit /ProcSet findresource begin\n12 dict begin\nbegincmap\n/CIDSystemInfo <<\n  /Registry (Adobe)\n  /Ordering (UCS)\n  /Supplement 0\n>> def\n/CMapName /Adobe-Identity-UCS def\n/CMapType 2 def\n1 begincodespacerange\n<0000><ffff>\nendcodespacerange\n1 beginbfrange\n".concat(ranges.join('\n'), "\nendbfrange\nendcmap\nCMapName currentdict /CMap defineresource pop\nend\nend"));
     return cmap;
   }
 
@@ -3433,6 +3449,9 @@ var FontsMixin = {
 
 };
 
+var SOFT_HYPHEN = '\u00AD';
+var HYPHEN = '-';
+
 class LineWrapper extends EventEmitter {
   constructor(document, options) {
     super();
@@ -3503,6 +3522,14 @@ class LineWrapper extends EventEmitter {
     return this.document.widthOfString(word, this) + this.characterSpacing + this.wordSpacing;
   }
 
+  canFit(word, w) {
+    if (word[word.length - 1] != SOFT_HYPHEN) {
+      return w <= this.spaceLeft;
+    }
+
+    return w + this.wordWidth(HYPHEN) <= this.spaceLeft;
+  }
+
   eachWord(text, fn) {
     // setup a unicode line breaker
     var bk;
@@ -3633,13 +3660,13 @@ class LineWrapper extends EventEmitter {
         this.spaceLeft = this.lineWidth;
       }
 
-      if (w <= this.spaceLeft) {
+      if (this.canFit(word, w)) {
         buffer += word;
         textWidth += w;
         wc++;
       }
 
-      if (bk.required || w > this.spaceLeft) {
+      if (bk.required || !this.canFit(word, w)) {
         // if the user specified a max height and an ellipsis, and is about to pass the
         // max height and max columns after the next line, append the ellipsis
         var lh = this.document.currentLineHeight(true);
@@ -3676,6 +3703,12 @@ class LineWrapper extends EventEmitter {
           }
 
           this.emit('lastLine', options, this);
+        } // Previous entry is a soft hyphen - add visible hyphen.
+
+
+        if (buffer[buffer.length - 1] == SOFT_HYPHEN) {
+          buffer = buffer.slice(0, -1) + HYPHEN;
+          this.spaceLeft -= this.wordWidth(HYPHEN);
         }
 
         emitLine(); // if we've reached the edge of the page,
@@ -3881,8 +3914,8 @@ var TextMixin = {
     var flatten = function flatten(list) {
       var n = 1;
 
-      for (var _i = 0; _i < list.length; _i++) {
-        var item = list[_i];
+      for (var i = 0; i < list.length; i++) {
+        var item = list[i];
 
         if (Array.isArray(item)) {
           level++;
@@ -3914,75 +3947,82 @@ var TextMixin = {
       }
     };
 
-    wrapper = new LineWrapper(this, options);
-    wrapper.on('line', this._line);
-    level = 1;
-    var i = 0;
-    wrapper.on('firstLine', () => {
-      var item, itemType, labelType, bodyType;
+    var drawListItem = function drawListItem(listItem) {
+      wrapper = new LineWrapper(this, options);
+      wrapper.on('line', this._line);
+      level = 1;
+      var i = 0;
+      wrapper.once('firstLine', () => {
+        var item, itemType, labelType, bodyType;
 
-      if (options.structParent) {
-        if (options.structTypes) {
-          [itemType, labelType, bodyType] = options.structTypes;
-        } else {
-          [itemType, labelType, bodyType] = ['LI', 'Lbl', 'LBody'];
+        if (options.structParent) {
+          if (options.structTypes) {
+            [itemType, labelType, bodyType] = options.structTypes;
+          } else {
+            [itemType, labelType, bodyType] = ['LI', 'Lbl', 'LBody'];
+          }
         }
-      }
 
-      if (itemType) {
-        item = this.struct(itemType);
-        options.structParent.add(item);
-      } else if (options.structParent) {
-        item = options.structParent;
-      }
+        if (itemType) {
+          item = this.struct(itemType);
+          options.structParent.add(item);
+        } else if (options.structParent) {
+          item = options.structParent;
+        }
 
-      var l;
+        var l;
 
-      if ((l = levels[i++]) !== level) {
-        var diff = itemIndent * (l - level);
-        this.x += diff;
-        wrapper.lineWidth -= diff;
-        level = l;
-      }
+        if ((l = levels[i++]) !== level) {
+          var diff = itemIndent * (l - level);
+          this.x += diff;
+          wrapper.lineWidth -= diff;
+          level = l;
+        }
 
-      if (item && (labelType || bodyType)) {
-        item.add(this.struct(labelType || bodyType, [this.markStructureContent(labelType || bodyType)]));
-      }
+        if (item && (labelType || bodyType)) {
+          item.add(this.struct(labelType || bodyType, [this.markStructureContent(labelType || bodyType)]));
+        }
 
-      switch (listType) {
-        case 'bullet':
-          this.circle(this.x - indent + r, this.y + midLine, r);
-          this.fill();
-          break;
+        switch (listType) {
+          case 'bullet':
+            this.circle(this.x - indent + r, this.y + midLine, r);
+            this.fill();
+            break;
 
-        case 'numbered':
-        case 'lettered':
-          var text = label(numbers[i - 1]);
+          case 'numbered':
+          case 'lettered':
+            var text = label(numbers[i - 1]);
 
-          this._fragment(text, this.x - indent, this.y, options);
+            this._fragment(text, this.x - indent, this.y, options);
 
-          break;
-      }
+            break;
+        }
 
-      if (item && labelType && bodyType) {
-        item.add(this.struct(bodyType, [this.markStructureContent(bodyType)]));
-      }
+        if (item && labelType && bodyType) {
+          item.add(this.struct(bodyType, [this.markStructureContent(bodyType)]));
+        }
+
+        if (item && item !== options.structParent) {
+          item.end();
+        }
+      });
+      wrapper.on('sectionStart', () => {
+        var pos = indent + itemIndent * (level - 1);
+        this.x += pos;
+        return wrapper.lineWidth -= pos;
+      });
+      wrapper.on('sectionEnd', () => {
+        var pos = indent + itemIndent * (level - 1);
+        this.x -= pos;
+        return wrapper.lineWidth += pos;
+      });
+      wrapper.wrap(listItem, options);
+    };
+
+    for (var i = 0; i < items.length; i++) {
+      drawListItem.call(this, items[i]);
+    }
 
-      if (item && item !== options.structParent) {
-        item.end();
-      }
-    });
-    wrapper.on('sectionStart', () => {
-      var pos = indent + itemIndent * (level - 1);
-      this.x += pos;
-      return wrapper.lineWidth -= pos;
-    });
-    wrapper.on('sectionEnd', () => {
-      var pos = indent + itemIndent * (level - 1);
-      this.x -= pos;
-      return wrapper.lineWidth += pos;
-    });
-    wrapper.wrap(items.join('\n'), options);
     return this;
   },
 
@@ -4337,8 +4377,10 @@ class JPEG {
 
     if (this.data.readUInt16BE(0) !== 0xffd8) {
       throw 'SOI not found in JPEG';
-    }
+    } // Parse the EXIF orientation
+
 
+    this.orientation = exif.fromBuffer(this.data).Orientation || 1;
     var pos = 2;
 
     while (pos < this.data.length) {
@@ -4576,7 +4618,7 @@ class PDFImage {
     } else {
       var match;
 
-      if (match = /^data:.+;base64,(.*)$/.exec(src)) {
+      if (match = /^data:.+?;base64,(.*)$/.exec(src)) {
         data = Buffer.from(match[1], 'base64');
       } else {
         data = fs.readFileSync(src);
@@ -4606,13 +4648,15 @@ var ImagesMixin = {
 
   image(src, x, y) {
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-    var bh, bp, bw, image, ip, left, left1;
+    var bh, bp, bw, image, ip, left, left1, rotateAngle, originX, originY;
 
     if (typeof x === 'object') {
       options = x;
       x = null;
-    }
+    } // Ignore orientation based on document options or image options
 
+
+    var ignoreOrientation = options.ignoreOrientation || options.ignoreOrientation !== false && this.options.ignoreOrientation;
     x = (left = x != null ? x : options.x) != null ? left : this.x;
     y = (left1 = y != null ? y : options.y) != null ? left1 : this.y;
 
@@ -4636,24 +4680,33 @@ var ImagesMixin = {
       this.page.xobjects[image.label] = image.obj;
     }
 
-    var w = options.width || image.width;
-    var h = options.height || image.height;
+    var {
+      width,
+      height
+    } = image; // If EXIF orientation calls for it, swap width and height
+
+    if (!ignoreOrientation && image.orientation > 4) {
+      [width, height] = [height, width];
+    }
+
+    var w = options.width || width;
+    var h = options.height || height;
 
     if (options.width && !options.height) {
-      var wp = w / image.width;
-      w = image.width * wp;
-      h = image.height * wp;
+      var wp = w / width;
+      w = width * wp;
+      h = height * wp;
     } else if (options.height && !options.width) {
-      var hp = h / image.height;
-      w = image.width * hp;
-      h = image.height * hp;
+      var hp = h / height;
+      w = width * hp;
+      h = height * hp;
     } else if (options.scale) {
-      w = image.width * options.scale;
-      h = image.height * options.scale;
+      w = width * options.scale;
+      h = height * options.scale;
     } else if (options.fit) {
       [bw, bh] = options.fit;
       bp = bw / bh;
-      ip = image.width / image.height;
+      ip = width / height;
 
       if (ip > bp) {
         w = bw;
@@ -4665,7 +4718,7 @@ var ImagesMixin = {
     } else if (options.cover) {
       [bw, bh] = options.cover;
       bp = bw / bh;
-      ip = image.width / image.height;
+      ip = width / height;
 
       if (ip > bp) {
         h = bh;
@@ -4688,6 +4741,85 @@ var ImagesMixin = {
       } else if (options.valign === 'bottom') {
         y = y + bh - h;
       }
+    }
+
+    if (!ignoreOrientation) {
+      switch (image.orientation) {
+        // No orientation (need to flip image, though, because of the default transform matrix on the document)
+        default:
+        case 1:
+          h = -h;
+          y -= h;
+          rotateAngle = 0;
+          break;
+        // Flip Horizontal
+
+        case 2:
+          w = -w;
+          h = -h;
+          x -= w;
+          y -= h;
+          rotateAngle = 0;
+          break;
+        // Rotate 180 degrees
+
+        case 3:
+          originX = x;
+          originY = y;
+          h = -h;
+          x -= w;
+          rotateAngle = 180;
+          break;
+        // Flip vertical
+
+        case 4:
+          // Do nothing, image will be flipped
+          break;
+        // Flip horizontally and rotate 270 degrees CW
+
+        case 5:
+          originX = x;
+          originY = y;
+          [w, h] = [h, w];
+          y -= h;
+          rotateAngle = 90;
+          break;
+        // Rotate 90 degrees CW
+
+        case 6:
+          originX = x;
+          originY = y;
+          [w, h] = [h, w];
+          h = -h;
+          rotateAngle = 90;
+          break;
+        // Flip horizontally and rotate 90 degrees CW
+
+        case 7:
+          originX = x;
+          originY = y;
+          [w, h] = [h, w];
+          h = -h;
+          w = -w;
+          x -= w;
+          rotateAngle = 90;
+          break;
+        // Rotate 270 degrees CW
+
+        case 8:
+          originX = x;
+          originY = y;
+          [w, h] = [h, w];
+          h = -h;
+          x -= w;
+          y -= h;
+          rotateAngle = -90;
+          break;
+      }
+    } else {
+      h = -h;
+      y -= h;
+      rotateAngle = 0;
     } // create link annotations if the link option is given
 
 
@@ -4709,7 +4841,14 @@ var ImagesMixin = {
     }
 
     this.save();
-    this.transform(w, 0, 0, -h, x, y + h);
+
+    if (rotateAngle) {
+      this.rotate(rotateAngle, {
+        origin: [originX, originY]
+      });
+    }
+
+    this.transform(w, 0, 0, h, x, y);
     this.addContent("/".concat(image.label, " Do"));
     this.restore();
     return this;
@@ -5827,7 +5966,10 @@ var AcroFormMixin = {
     var result = 0;
     Object.keys(options).forEach(key => {
       if (FIELD_FLAGS[key]) {
-        result |= FIELD_FLAGS[key];
+        if (options[key]) {
+          result |= FIELD_FLAGS[key];
+        }
+
         delete options[key];
       }
     });
@@ -5964,7 +6106,7 @@ var AttachmentsMixin = {
     } else {
       var match;
 
-      if (match = /^data:(.*);base64,(.*)$/.exec(src)) {
+      if (match = /^data:(.*?);base64,(.*)$/.exec(src)) {
         if (match[1]) {
           refBody.Subtype = match[1].replace('/', '#2F');
         }
@@ -6102,6 +6244,25 @@ var PDFA = {
 
 };
 
+var PDFUA = {
+  initPDFUA() {
+    this.subset = 1;
+  },
+
+  endSubset() {
+    this._addPdfuaMetadata();
+  },
+
+  _addPdfuaMetadata() {
+    this.appendXML(this._getPdfuaid());
+  },
+
+  _getPdfuaid() {
+    return "\n        <rdf:Description xmlns:pdfuaid=\"http://www.aiim.org/pdfua/ns/id/\" rdf:about=\"\">\n            <pdfuaid:part>".concat(this.subset, "</pdfuaid:part>\n        </rdf:Description>\n        ");
+  }
+
+};
+
 var SubsetMixin = {
   _importSubset(subset) {
     Object.assign(this, subset);
@@ -6122,6 +6283,12 @@ var SubsetMixin = {
 
         this.initPDFA(options.subset);
         break;
+
+      case 'PDF/UA':
+        this._importSubset(PDFUA);
+
+        this.initPDFUA();
+        break;
     }
   }