Fix CIDSet generation only for PDF/A1 subset #1561

foliojs · Dec 14, 2024 · 75a8dbc · 75a8dbc
1 parent 8f97007
commit 75a8dbc
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fix index not counting when rendering ordered lists (#1517)
 - Fix PDF/A3 compliance of attachments
+- Fix CIDSet generation only for PDF/A1 subset
 
 ### [v0.15.1] - 2024-10-30
 

diff --git a/lib/font/embedded.js b/lib/font/embedded.js
@@ -183,7 +183,7 @@ class EmbeddedFont extends PDFFont {
       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);

diff --git a/tests/unit/pdfa1.spec.js b/tests/unit/pdfa1.spec.js
@@ -84,5 +84,24 @@ describe('PDF/A-1', () => {
 
         expect(metadata).toContain('pdfaid:conformance>A');
     });
+
+    test('font data contains CIDSet', () => {
+        let options = {
+            autoFirstPage: false,
+            pdfVersion: '1.4',
+            subset: 'PDF/A-1a'
+        };
+        let doc = new PDFDocument(options);
+        const data = logData(doc);
+        doc.addPage();
+        doc.registerFont('Roboto', 'tests/fonts/Roboto-Regular.ttf');
+        doc.font('Roboto');
+        doc.text('Text');
+        doc.end();
+
+        let fontDescriptor = data[data.length-41];
+
+        expect(fontDescriptor).toContain('/CIDSet');
+    });
 
 });
diff --git a/tests/unit/pdfa2.spec.js b/tests/unit/pdfa2.spec.js
@@ -84,5 +84,24 @@ describe('PDF/A-2', () => {
 
         expect(metadata).toContain('pdfaid:conformance>A');
     });
+
+    test('font data NOT contains CIDSet', () => {
+        let options = {
+            autoFirstPage: false,
+            pdfVersion: '1.4',
+            subset: 'PDF/A-2a'
+        };
+        let doc = new PDFDocument(options);
+        const data = logData(doc);
+        doc.addPage();
+        doc.registerFont('Roboto', 'tests/fonts/Roboto-Regular.ttf');
+        doc.font('Roboto');
+        doc.text('Text');
+        doc.end();
+
+        let fontDescriptor = data[data.length-41];
+
+        expect(fontDescriptor).not.toContain('/CIDSet');
+    });
 
 });
diff --git a/tests/unit/pdfa3.spec.js b/tests/unit/pdfa3.spec.js
@@ -84,5 +84,24 @@ describe('PDF/A-3', () => {
 
         expect(metadata).toContain('pdfaid:conformance>A');
     });
-
+
+    test('font data NOT contains CIDSet', () => {
+        let options = {
+            autoFirstPage: false,
+            pdfVersion: '1.4',
+            subset: 'PDF/A-3a'
+        };
+        let doc = new PDFDocument(options);
+        const data = logData(doc);
+        doc.addPage();
+        doc.registerFont('Roboto', 'tests/fonts/Roboto-Regular.ttf');
+        doc.font('Roboto');
+        doc.text('Text');
+        doc.end();
+
+        let fontDescriptor = data[data.length-41];
+
+        expect(fontDescriptor).not.toContain('/CIDSet');
+    });
+
 });