pdfkit 0.17.0 → 0.17.2

package/js/pdfkit.js

@@ -221,8 +221,18 @@ class PDFReference extends PDFAbstractReference {
   }
 }
 
+const fArray = new Float32Array(1);
+const uArray = new Uint32Array(fArray.buffer);
 function PDFNumber(n) {
-  return Math.fround(n);
+  const rounded = Math.fround(n);
+  if (rounded <= n) return rounded;
+  fArray[0] = n;
+  if (n <= 0) {
+    uArray[0] += 1;
+  } else {
+    uArray[0] -= 1;
+  }
+  return fArray[0];
 }
 function normalizeSides(sides, defaultDefinition = undefined, transformer = v => v) {
   if (sides == null || typeof sides === 'object' && Object.keys(sides).length === 0) {
@@ -2137,20 +2147,12 @@ oslash        ugrave         uacute         ucircumflex
 udieresis     yacute         thorn          ydieresis\
 `.split(/\s+/);
 class AFMFont {
-  static open(filename) {
-    return new AFMFont(fs.readFileSync(filename, 'utf8'));
-  }
   constructor(contents) {
-    this.contents = contents;
     this.attributes = {};
     this.glyphWidths = {};
     this.boundingBoxes = {};
     this.kernPairs = {};
-    this.parse();
-    this.charWidths = new Array(256);
-    for (let char = 0; char <= 255; char++) {
-      this.charWidths[char] = this.glyphWidths[characters[char]];
-    }
+    this.parse(contents);
     this.bbox = this.attributes['FontBBox'].split(/\s+/).map(e => +e);
     this.ascender = +(this.attributes['Ascender'] || 0);
     this.descender = +(this.attributes['Descender'] || 0);
@@ -2158,9 +2160,9 @@ class AFMFont {
     this.capHeight = +(this.attributes['CapHeight'] || 0);
     this.lineGap = this.bbox[3] - this.bbox[1] - (this.ascender - this.descender);
   }
-  parse() {
+  parse(contents) {
     let section = '';
-    for (let line of this.contents.split('\n')) {
+    for (let line of contents.split('\n')) {
       var match;
       var a;
       if (match = line.match(/^Start(\w+)/)) {
@@ -2813,7 +2815,7 @@ class LineWrapper extends events.EventEmitter {
     });
   }
   wordWidth(word) {
-    return this.document.widthOfString(word, this) + this.characterSpacing + this.wordSpacing;
+    return PDFNumber(this.document.widthOfString(word, this) + this.characterSpacing + this.wordSpacing);
   }
   canFit(word, w) {
     if (word[word.length - 1] != SOFT_HYPHEN) {
@@ -2954,12 +2956,14 @@ class LineWrapper extends events.EventEmitter {
         }
         emitLine();
         if (PDFNumber(this.document.y + lh) > this.maxY) {
+          this.emit('sectionEnd', options, this);
           const shouldContinue = this.nextSection();
           if (!shouldContinue) {
             wc = 0;
             buffer = '';
             return false;
           }
+          this.emit('sectionStart', options, this);
         }
         if (bk.required) {
           this.spaceLeft = this.lineWidth;
@@ -2992,7 +2996,6 @@ class LineWrapper extends events.EventEmitter {
     }
   }
   nextSection(options) {
-    this.emit('sectionEnd', options, this);
     if (++this.column > this.columns) {
       if (this.height != null) {
         return false;
@@ -3011,7 +3014,6 @@ class LineWrapper extends events.EventEmitter {
       this.document.y = this.startY;
       this.emit('columnBreak', options, this);
     }
-    this.emit('sectionStart', options, this);
     return true;
   }
 }
@@ -3019,6 +3021,15 @@ class LineWrapper extends events.EventEmitter {
 const {
   number
 } = PDFObject;
+function formatListLabel(n, listType) {
+  if (listType === 'numbered') {
+    return `${n}.`;
+  }
+  var letter = String.fromCharCode((n - 1) % 26 + 65);
+  var times = Math.floor((n - 1) / 26 + 1);
+  var text = Array(times + 1).join(letter);
+  return `${text}.`;
+}
 var TextMixin = {
   initText() {
     this._line = this._line.bind(this);
@@ -3195,7 +3206,7 @@ var TextMixin = {
     this.y = y;
     return height;
   },
-  list(list, x, y, options, wrapper) {
+  list(list, x, y, options) {
     options = this._initOptions(x, y, options);
     const listType = options.listType || 'bullet';
     const unit = Math.round(this._font.ascender / 1000 * this._fontSize);
@@ -3225,19 +3236,8 @@ var TextMixin = {
       }
     };
     flatten(list);
-    const label = function (n) {
-      switch (listType) {
-        case 'numbered':
-          return `${n}.`;
-        case 'lettered':
-          var letter = String.fromCharCode((n - 1) % 26 + 65);
-          var times = Math.floor((n - 1) / 26 + 1);
-          var text = Array(times + 1).join(letter);
-          return `${text}.`;
-      }
-    };
     const drawListItem = function (listItem, i) {
-      wrapper = new LineWrapper(this, options);
+      const wrapper = new LineWrapper(this, options);
       wrapper.on('line', this._line);
       level = 1;
       wrapper.once('firstLine', () => {
@@ -3272,7 +3272,7 @@ var TextMixin = {
             break;
           case 'numbered':
           case 'lettered':
-            var text = label(numbers[i - 1]);
+            var text = formatListLabel(numbers[i - 1], listType);
             this._fragment(text, this.x - indent, this.y, options);
             break;
         }
@@ -3340,11 +3340,11 @@ var TextMixin = {
   },
   _line(text, options = {}, wrapper) {
     this._fragment(text, this.x, this.y, options);
-    const lineGap = options.lineGap || this._lineGap || 0;
-    if (!wrapper) {
-      this.x += this.widthOfString(text, options);
-    } else {
+    if (wrapper) {
+      const lineGap = options.lineGap || this._lineGap || 0;
       this.y += this.currentLineHeight(true) + lineGap;
+    } else {
+      this.x += this.widthOfString(text, options);
     }
   },
   _fragment(text, x, y, options) {
@@ -3731,8 +3731,8 @@ class PDFImage {
     } else if (src instanceof ArrayBuffer) {
       data = Buffer.from(new Uint8Array(src));
     } else {
-      let match;
-      if (match = /^data:.+?;base64,(.*)$/.exec(src)) {
+      const match = /^data:.+?;base64,(.*)$/.exec(src);
+      if (match) {
         data = Buffer.from(match[1], 'base64');
       } else {
         data = fs.readFileSync(src);
@@ -4819,8 +4819,8 @@ var AttachmentsMixin = {
     } else if (src instanceof ArrayBuffer) {
       data = Buffer.from(new Uint8Array(src));
     } else {
-      let match;
-      if (match = /^data:(.*?);base64,(.*)$/.exec(src)) {
+      const match = /^data:(.*?);base64,(.*)$/.exec(src);
+      if (match) {
         if (match[1]) {
           refBody.Subtype = match[1].replace('/', '#2F');
         }
@@ -5017,7 +5017,7 @@ function deepMerge(target, ...sources) {
 }
 function deepClone(obj) {
   let result = obj;
-  if (typeof obj == 'object') {
+  if (obj && typeof obj == 'object') {
     result = Array.isArray(obj) ? [] : {};
     for (const key in obj) result[key] = deepClone(obj[key]);
   }