Revert "Fix for PDF accessibility check. (foliojs#1265)"

This reverts commit 4700537.

Revert "Add option to define AcroForm fontSize. Fixes foliojs#1088"

This reverts commit 131df9e.

CHANGELOG.md

@@ -2,9 +2,6 @@
 
 ### Unreleased
 
-- Allow applying 'underline' and 'strike' text styling together on a text
-- Allow to specify the AcroForm text fontSize
-
 ### [v0.12.1] - 2021-04-10
 
 - Update crypto-js to v3.3 (fix security issue)

docs/forms.md

@@ -62,7 +62,6 @@ a hex color, or a named CSS color value for that option.
 - `password` [_boolean_] - The text will be masked (_e.g._ with asterisks).
 - `noSpell` [_boolean_] - If set, text entered in the field is not spell-checked
 - `format` [_object_] - See the section on **Text Field Formatting** below.
-- `fontSize` [_number_] - Sets the fontSize (default or 0 means auto sizing)
 
 ```js
 doc.formText('leaf2', 10, 60, 200, 40, {

lib/mixins/acroform.js

@@ -333,12 +333,8 @@ export default {
     // add current font to field's resource dict (RD) if not the default acroform font
     if (this._acroform.defaultFont !== this._font.name) {
       options.DR = { Font: {} };
-
-      // Get the fontSize option. If not set use auto sizing
-      const fontSize = options.fontSize || 0;
-
       options.DR.Font[this._font.id] = this._font.ref();
-      options.DA = new String(`/${this._font.id} ${fontSize} Tf 0 g`);
+      options.DA = new String(`/${this._font.id} 0 Tf 0 g`);
     }
     return options;
   },

lib/mixins/markings.js

@@ -14,8 +14,7 @@ export default {
     this.structChildren = [];
 
     if (options.tagged) {
-      this.getMarkInfoDictionary().data.Marked = true;
-      this.getStructTreeRoot();
+      this.getMarkingsDictionary().data.Marked = true;
     }
   },
 
@@ -131,17 +130,17 @@ export default {
     return pageMarkings;
   },
 
-  getMarkInfoDictionary() {
-    if (!this._root.data.MarkInfo) {
-      this._root.data.MarkInfo = this.ref({});
+  getMarkingsDictionary() {
+    if (!this._root.data.Markings) {
+      this._root.data.Markings = this.ref({});
     }
-    return this._root.data.MarkInfo;
+    return this._root.data.Markings;
   },
 
   getStructTreeRoot() {
     if (!this._root.data.StructTreeRoot) {
       this._root.data.StructTreeRoot = this.ref({
-        Type: 'StructTreeRoot',
+        Type: "StructTreeRoot",
         ParentTree: new PDFNumberTree(),
         ParentTreeNextKey: 0
       });
@@ -154,8 +153,8 @@ export default {
   },
 
   createStructParentTreeNextKey() {
-    // initialise the MarkInfo dictionary
-    this.getMarkInfoDictionary();
+    // initialise the Markings dictionary
+    this.getMarkingsDictionary();
 
     const structTreeRoot = this.getStructTreeRoot();
     const key = structTreeRoot.data.ParentTreeNextKey++;
@@ -169,8 +168,8 @@ export default {
       structTreeRoot.end();
       this.structChildren.forEach((structElem) => structElem.end());
     }
-    if (this._root.data.MarkInfo) {
-      this._root.data.MarkInfo.end();
+    if (this._root.data.Markings) {
+      this._root.data.Markings.end();
     }
   }
 

lib/mixins/text.js

@@ -371,8 +371,8 @@ export default {
       this.addNamedDestination(options.destination, 'XYZ', x, y, null);
     }
 
-    // create underline
-    if (options.underline) {
+    // create underline or strikethrough line
+    if (options.underline || options.strike) {
       this.save();
       if (!options.stroke) {
         this.strokeColor(...(this._fillColor || []));
@@ -382,25 +382,12 @@ export default {
         this._fontSize < 10 ? 0.5 : Math.floor(this._fontSize / 10);
       this.lineWidth(lineWidth);
 
-      let lineY = (y + this.currentLineHeight())  - lineWidth
-      this.moveTo(x, lineY);
-      this.lineTo(x + renderedWidth, lineY);
-      this.stroke();
-      this.restore();
-    }
-
-    // create strikethrough line
-    if (options.strike) {
-      this.save();
-      if (!options.stroke) {
-        this.strokeColor(...(this._fillColor || []));
+      const d = options.underline ? 1 : 2;
+      let lineY = y + this.currentLineHeight() / d;
+      if (options.underline) {
+        lineY -= lineWidth;
       }
 
-      const lineWidth =
-        this._fontSize < 10 ? 0.5 : Math.floor(this._fontSize / 10);
-      this.lineWidth(lineWidth);
-
-      let lineY = y + this.currentLineHeight() / 2;
       this.moveTo(x, lineY);
       this.lineTo(x + renderedWidth, lineY);
       this.stroke();

tests/unit/acroform.spec.js

@@ -222,40 +222,6 @@ describe('acroform', () => {
     expect(docData).toContainChunk(expected);
   });
 
-  test('font size', () => {
-    const expected = [
-      '11 0 obj',
-      '<<\n' +
-        '/fontSize 16\n' +
-        '/FT /Tx\n' +
-        '/DR <<\n' +
-        '/Font <<\n' +
-        '/F2 10 0 R\n' +
-        '>>\n' +
-        '>>\n' +
-        '/DA (/F2 16 Tf 0 g)\n' +
-        '/T (text)\n' +
-        '/Subtype /Widget\n' +
-        '/F 4\n' +
-        '/Type /Annot\n' +
-        '/Rect [20 752 70 772]\n' +
-        '/Border [0 0 0]\n' +
-        '/C [0 0 0]\n' +
-        '/FontSize 16\n' +
-        '>>',
-      'endobj'
-    ];
-    doc.registerFont('myfont1', 'tests/fonts/Roboto-Regular.ttf');
-    doc.initForm();
-    const docData = logData(doc);
-    let opts = {
-      fontSize: 16
-    };
-    doc.font('myfont1').formText('text', 20, 20, 50, 20, opts);
-    expect(docData.length).toBe(3);
-    expect(docData).toContainChunk(expected);
-  });
-
   test('field heirarchy', () => {
     const expected = [
       '13 0 obj',

tests/unit/markings.spec.js

@@ -289,7 +289,7 @@ EMC
       ]);
       expect(docData).toContainChunk([
         `3 0 obj`,
-        /\/MarkInfo 9 0 R/,
+        /\/Markings 9 0 R/,
         `endobj`
       ]);
       expect(docData).toContainChunk([
@@ -369,7 +369,7 @@ EMC
       ]);
       expect(docData).toContainChunk([
         `3 0 obj`,
-        /\/MarkInfo 9 0 R/,
+        /\/Markings 9 0 R/,
         `endobj`
       ]);
       expect(docData).toContainChunk([
@@ -441,7 +441,7 @@ EMC
       ]);
       expect(docData).toContainChunk([
         `3 0 obj`,
-        /\/MarkInfo 13 0 R/,
+        /\/Markings 13 0 R/,
         `endobj`
       ]);
       expect(docData).toContainChunk([
@@ -569,7 +569,7 @@ EMC
       ]);
       expect(docData).toContainChunk([
         `3 0 obj`,
-        /\/MarkInfo 5 0 R/,
+        /\/Markings 5 0 R/,
         `endobj`
       ]);
       expect(docData).toContainChunk([
@@ -579,47 +579,26 @@ EMC
       ]);
       expect(docData).toContainChunk([
         `3 0 obj`,
-        /\/ViewerPreferences 7 0 R/,
+        /\/ViewerPreferences 6 0 R/,
         `endobj`
       ]);
-
-      expect(docData).toContainChunk([
-        `3 0 obj`,
-        /\/StructTreeRoot 6 0 R/,
-        `endobj`
-      ]);
-
       expect(docData).toContainChunk([
         `6 0 obj`,
-        `<<
-/Type /StructTreeRoot
-/ParentTree <<
-  /Nums [
-]
->>
-/ParentTreeNextKey 0
->>`,
-        `endobj`
-      ]);
-
-
-      expect(docData).toContainChunk([
-        `7 0 obj`,
         /\/DisplayDocTitle true/,
         `endobj`
       ]);
       expect(docData).toContainChunk([
         `trailer`,
-        /\/Info 11 0 R/,
+        /\/Info 10 0 R/,
         `startxref`
       ]);
       expect(docData).toContainChunk([
-        `11 0 obj`,
-        /\/Title 15 0 R/,
+        `10 0 obj`,
+        /\/Title 14 0 R/,
         `endobj`
       ]);
       expect(docData).toContainChunk([
-        `15 0 obj`,
+        `14 0 obj`,
         `(My Title)`,
         `endobj`
       ]);

tests/visual/text.spec.js

@@ -30,10 +30,6 @@ describe('text', function() {
       doc.text('Strike', 100, 130, {
         strike: true
       });
-      doc.text('Strike', 100, 160, {
-        underline:true,
-        strike: true
-      });
     });
   });