pdfkit 0.17.1 → 0.17.2

package/js/pdfkit.js

@@ -2956,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;
@@ -2994,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;
@@ -3013,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;
   }
 }
@@ -3021,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);
@@ -3197,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);
@@ -3227,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', () => {
@@ -3274,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;
         }
@@ -3342,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) {