pdfkit 0.15.0 → 0.15.2

package/CHANGELOG.md

@@ -1,6 +1,17 @@
 ## pdfkit changelog
 
-### Unreleased
+### [v0.15.2] - 2024-12-15
+
+- Fix index not counting when rendering ordered lists (#1517)
+- Fix PDF/A3 compliance of attachments
+- Fix CIDSet generation only for PDF/A1 subset
+- Fix missing acroform font dictionary
+- Fix modify time comparison check equality embedded files
+
+### [v0.15.1] - 2024-10-30
+
+- Fix browserify transform sRGB_IEC61966_2_1.icc file
+- Fix time comparison check equality embedded files
 
 ### [v0.15.0] - 2024-03-23
 

package/README.md

@@ -129,7 +129,7 @@ complex documents with a very small amount of code. For more, see the `demo` fol
 There are three ways to use PDFKit in the browser:
 
 - Use [Browserify](http://browserify.org/). See demo [source code](demo/browser.js) and [build script](https://github.com/foliojs/pdfkit/blob/master/package.json#L56)
-- Use [webpack](https://webpack.js.org/). See [complete example](https://github.com/blikblum/pdfkit-webpack-example).
+- Use [webpack](https://webpack.js.org/). See [complete example](examples/webpack).
 - Use prebuilt version. Distributed as `pdfkit.standalone.js` file in the [releases](https://github.com/foliojs/pdfkit/releases) or in the package `js` folder.
 
 In addition to PDFKit, you'll need somewhere to stream the output to. HTML5 has a

package/js/pdfkit.es.js

@@ -2734,7 +2734,7 @@ class EmbeddedFont extends PDFFont {
     } else {
       descriptor.data.FontFile2 = fontFile;
     }
-    if (this.document.subset) {
+    if (this.document.subset && this.document.subset === 1) {
       const CIDSet = Buffer.from('FFFFFFFFC0', 'hex');
       const CIDSetRef = this.document.ref();
       CIDSetRef.write(CIDSet);
@@ -3375,11 +3375,10 @@ var TextMixin = {
           return `${text}.`;
       }
     };
-    const drawListItem = function (listItem) {
+    const drawListItem = function (listItem, i) {
       wrapper = new LineWrapper(this, options);
       wrapper.on('line', this._line);
       level = 1;
-      let i = 0;
       wrapper.once('firstLine', () => {
         let item, itemType, labelType, bodyType;
         if (options.structParent) {
@@ -3436,7 +3435,7 @@ var TextMixin = {
       wrapper.wrap(listItem, options);
     };
     for (let i = 0; i < items.length; i++) {
-      drawListItem.call(this, items[i]);
+      drawListItem.call(this, items[i], i);
     }
     return this;
   },
@@ -4958,7 +4957,7 @@ var AcroFormMixin = {
   _fieldDict(name, type) {
     let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     if (!this._acroform) {
-      throw new Error('Call document.initForms() method before adding form elements to document');
+      throw new Error('Call document.initForm() method before adding form elements to document');
     }
     let opts = Object.assign({}, options);
     if (type !== null) {
@@ -5088,7 +5087,7 @@ var AcroFormMixin = {
   },
   _resolveFont(options) {
     // add current font to document-level AcroForm dict if necessary
-    if (this._acroform.fonts[this._font.id] === null) {
+    if (this._acroform.fonts[this._font.id] == null) {
       this._acroform.fonts[this._font.id] = this._font.ref();
     }
 
@@ -5160,11 +5159,13 @@ var AttachmentsMixin = {
    *  * options.hidden: if true, do not add attachment to EmbeddedFiles dictionary. Useful for file attachment annotations
    *  * options.creationDate: override creation date
    *  * options.modifiedDate: override modified date
+   *  * options.relationship: Relationship between the PDF document and its attached file. Can be 'Alternative', 'Data', 'Source', 'Supplement' or 'Unspecified'.
    * @returns filespec reference
    */
   file(src) {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     options.name = options.name || src;
+    options.relationship = options.relationship || 'Unspecified';
     const refBody = {
       Type: 'EmbeddedFile',
       Params: {}
@@ -5235,6 +5236,7 @@ var AttachmentsMixin = {
     // add filespec for embedded file
     const fileSpecBody = {
       Type: 'Filespec',
+      AFRelationship: options.relationship,
       F: new String(options.name),
       EF: {
         F: ref
@@ -5249,13 +5251,20 @@ var AttachmentsMixin = {
     if (!options.hidden) {
       this.addNamedEmbeddedFile(options.name, filespec);
     }
+
+    // Add file to the catalogue to be PDF/A3 compliant
+    if (this._root.data.AF) {
+      this._root.data.AF.push(filespec);
+    } else {
+      this._root.data.AF = [filespec];
+    }
     return filespec;
   }
 };
 
 /** check two embedded file metadata objects for equality */
 function isEqual(a, b) {
-  return a.Subtype === b.Subtype && a.Params.CheckSum.toString() === b.Params.CheckSum.toString() && a.Params.Size === b.Params.Size && a.Params.CreationDate === b.Params.CreationDate && a.Params.ModDate === b.Params.ModDate;
+  return a.Subtype === b.Subtype && a.Params.CheckSum.toString() === b.Params.CheckSum.toString() && a.Params.Size === b.Params.Size && a.Params.CreationDate.getTime() === b.Params.CreationDate.getTime() && (a.Params.ModDate === undefined && b.Params.ModDate === undefined || a.Params.ModDate.getTime() === b.Params.ModDate.getTime());
 }
 
 var PDFA = {
@@ -5271,10 +5280,10 @@ var PDFA = {
   },
   endSubset() {
     this._addPdfaMetadata();
-    this._addColorOutputIntent(`${__dirname}/data/sRGB_IEC61966_2_1.icc`);
+    this._addColorOutputIntent();
   },
-  _addColorOutputIntent(pICCPath) {
-    const iccProfile = fs.readFileSync(pICCPath);
+  _addColorOutputIntent() {
+    const iccProfile = fs.readFileSync(`${__dirname}/data/sRGB_IEC61966_2_1.icc`);
     const colorProfileRef = this.ref({
       Length: iccProfile.length,
       N: 3