pdfjs-dist 2.0.943 → 2.4.456

package/lib/core/annotation.js

@@ -2,7 +2,7 @@
  * @licstart The following is the entire license notice for the
  * Javascript code in this page
  *
- * Copyright 2018 Mozilla Foundation
+ * Copyright 2020 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,350 +19,404 @@
  * @licend The above is the entire license notice for the
  * Javascript code in this page
  */
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AnnotationFactory = exports.AnnotationBorderStyle = exports.Annotation = undefined;
+exports.getQuadPoints = getQuadPoints;
+exports.MarkupAnnotation = exports.AnnotationFactory = exports.AnnotationBorderStyle = exports.Annotation = void 0;
 
-var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
+var _util = require("../shared/util.js");
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _obj = require("./obj.js");
 
-var _util = require('../shared/util');
+var _primitives = require("./primitives.js");
 
-var _obj = require('./obj');
+var _colorspace = require("./colorspace.js");
 
-var _primitives = require('./primitives');
+var _core_utils = require("./core_utils.js");
 
-var _colorspace = require('./colorspace');
+var _operator_list = require("./operator_list.js");
 
-var _operator_list = require('./operator_list');
+var _stream = require("./stream.js");
 
-var _stream = require('./stream');
+class AnnotationFactory {
+  static create(xref, ref, pdfManager, idFactory) {
+    return pdfManager.ensure(this, "_create", [xref, ref, pdfManager, idFactory]);
+  }
+
+  static _create(xref, ref, pdfManager, idFactory) {
+    const dict = xref.fetchIfRef(ref);
+
+    if (!(0, _primitives.isDict)(dict)) {
+      return undefined;
+    }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+    const id = (0, _primitives.isRef)(ref) ? ref.toString() : `annot_${idFactory.createObjId()}`;
+    let subtype = dict.get("Subtype");
+    subtype = (0, _primitives.isName)(subtype) ? subtype.name : null;
+    const parameters = {
+      xref,
+      dict,
+      subtype,
+      id,
+      pdfManager
+    };
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+    switch (subtype) {
+      case "Link":
+        return new LinkAnnotation(parameters);
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+      case "Text":
+        return new TextAnnotation(parameters);
 
-var AnnotationFactory = function () {
-  function AnnotationFactory() {
-    _classCallCheck(this, AnnotationFactory);
-  }
+      case "Widget":
+        let fieldType = (0, _core_utils.getInheritableProperty)({
+          dict,
+          key: "FT"
+        });
+        fieldType = (0, _primitives.isName)(fieldType) ? fieldType.name : null;
+
+        switch (fieldType) {
+          case "Tx":
+            return new TextWidgetAnnotation(parameters);
+
+          case "Btn":
+            return new ButtonWidgetAnnotation(parameters);
+
+          case "Ch":
+            return new ChoiceWidgetAnnotation(parameters);
+        }
+
+        (0, _util.warn)('Unimplemented widget field type "' + fieldType + '", ' + "falling back to base field type.");
+        return new WidgetAnnotation(parameters);
+
+      case "Popup":
+        return new PopupAnnotation(parameters);
+
+      case "FreeText":
+        return new FreeTextAnnotation(parameters);
+
+      case "Line":
+        return new LineAnnotation(parameters);
+
+      case "Square":
+        return new SquareAnnotation(parameters);
+
+      case "Circle":
+        return new CircleAnnotation(parameters);
+
+      case "PolyLine":
+        return new PolylineAnnotation(parameters);
+
+      case "Polygon":
+        return new PolygonAnnotation(parameters);
+
+      case "Caret":
+        return new CaretAnnotation(parameters);
+
+      case "Ink":
+        return new InkAnnotation(parameters);
+
+      case "Highlight":
+        return new HighlightAnnotation(parameters);
+
+      case "Underline":
+        return new UnderlineAnnotation(parameters);
 
-  _createClass(AnnotationFactory, null, [{
-    key: 'create',
-    value: function create(xref, ref, pdfManager, idFactory) {
-      return pdfManager.ensure(this, '_create', [xref, ref, pdfManager, idFactory]);
+      case "Squiggly":
+        return new SquigglyAnnotation(parameters);
+
+      case "StrikeOut":
+        return new StrikeOutAnnotation(parameters);
+
+      case "Stamp":
+        return new StampAnnotation(parameters);
+
+      case "FileAttachment":
+        return new FileAttachmentAnnotation(parameters);
+
+      default:
+        if (!subtype) {
+          (0, _util.warn)("Annotation is missing the required /Subtype.");
+        } else {
+          (0, _util.warn)('Unimplemented annotation type "' + subtype + '", ' + "falling back to base annotation.");
+        }
+
+        return new Annotation(parameters);
     }
-  }, {
-    key: '_create',
-    value: function _create(xref, ref, pdfManager, idFactory) {
-      var dict = xref.fetchIfRef(ref);
-      if (!(0, _primitives.isDict)(dict)) {
-        return;
-      }
-      var id = (0, _primitives.isRef)(ref) ? ref.toString() : 'annot_' + idFactory.createObjId();
-      var subtype = dict.get('Subtype');
-      subtype = (0, _primitives.isName)(subtype) ? subtype.name : null;
-      var parameters = {
-        xref: xref,
-        dict: dict,
-        ref: (0, _primitives.isRef)(ref) ? ref : null,
-        subtype: subtype,
-        id: id,
-        pdfManager: pdfManager
-      };
-      switch (subtype) {
-        case 'Link':
-          return new LinkAnnotation(parameters);
-        case 'Text':
-          return new TextAnnotation(parameters);
-        case 'Widget':
-          var fieldType = (0, _util.getInheritableProperty)({
-            dict: dict,
-            key: 'FT'
-          });
-          fieldType = (0, _primitives.isName)(fieldType) ? fieldType.name : null;
-          switch (fieldType) {
-            case 'Tx':
-              return new TextWidgetAnnotation(parameters);
-            case 'Btn':
-              return new ButtonWidgetAnnotation(parameters);
-            case 'Ch':
-              return new ChoiceWidgetAnnotation(parameters);
-          }
-          (0, _util.warn)('Unimplemented widget field type "' + fieldType + '", ' + 'falling back to base field type.');
-          return new WidgetAnnotation(parameters);
-        case 'Popup':
-          return new PopupAnnotation(parameters);
-        case 'Line':
-          return new LineAnnotation(parameters);
-        case 'Square':
-          return new SquareAnnotation(parameters);
-        case 'Circle':
-          return new CircleAnnotation(parameters);
-        case 'PolyLine':
-          return new PolylineAnnotation(parameters);
-        case 'Polygon':
-          return new PolygonAnnotation(parameters);
-        case 'Ink':
-          return new InkAnnotation(parameters);
-        case 'Highlight':
-          return new HighlightAnnotation(parameters);
-        case 'Underline':
-          return new UnderlineAnnotation(parameters);
-        case 'Squiggly':
-          return new SquigglyAnnotation(parameters);
-        case 'StrikeOut':
-          return new StrikeOutAnnotation(parameters);
-        case 'Stamp':
-          return new StampAnnotation(parameters);
-        case 'FileAttachment':
-          return new FileAttachmentAnnotation(parameters);
-        default:
-          if (!subtype) {
-            (0, _util.warn)('Annotation is missing the required /Subtype.');
-          } else {
-            (0, _util.warn)('Unimplemented annotation type "' + subtype + '", ' + 'falling back to base annotation.');
-          }
-          return new Annotation(parameters);
+  }
+
+}
+
+exports.AnnotationFactory = AnnotationFactory;
+
+function getQuadPoints(dict, rect) {
+  if (!dict.has("QuadPoints")) {
+    return null;
+  }
+
+  const quadPoints = dict.getArray("QuadPoints");
+
+  if (!Array.isArray(quadPoints) || quadPoints.length % 8 > 0) {
+    return null;
+  }
+
+  const quadPointsLists = [];
+
+  for (let i = 0, ii = quadPoints.length / 8; i < ii; i++) {
+    quadPointsLists.push([]);
+
+    for (let j = i * 8, jj = i * 8 + 8; j < jj; j += 2) {
+      const x = quadPoints[j];
+      const y = quadPoints[j + 1];
+
+      if (x < rect[0] || x > rect[2] || y < rect[1] || y > rect[3]) {
+        return null;
       }
+
+      quadPointsLists[i].push({
+        x,
+        y
+      });
     }
-  }]);
+  }
 
-  return AnnotationFactory;
-}();
+  return quadPointsLists;
+}
 
 function getTransformMatrix(rect, bbox, matrix) {
-  var bounds = _util.Util.getAxialAlignedBoundingBox(bbox, matrix);
-  var minX = bounds[0];
-  var minY = bounds[1];
-  var maxX = bounds[2];
-  var maxY = bounds[3];
+  const [minX, minY, maxX, maxY] = _util.Util.getAxialAlignedBoundingBox(bbox, matrix);
+
   if (minX === maxX || minY === maxY) {
     return [1, 0, 0, 1, rect[0], rect[1]];
   }
-  var xRatio = (rect[2] - rect[0]) / (maxX - minX);
-  var yRatio = (rect[3] - rect[1]) / (maxY - minY);
+
+  const xRatio = (rect[2] - rect[0]) / (maxX - minX);
+  const yRatio = (rect[3] - rect[1]) / (maxY - minY);
   return [xRatio, 0, 0, yRatio, rect[0] - minX * xRatio, rect[1] - minY * yRatio];
 }
 
-var Annotation = function () {
-  function Annotation(params) {
-    _classCallCheck(this, Annotation);
-
-    var dict = params.dict;
-    this.setFlags(dict.get('F'));
-    this.setRectangle(dict.getArray('Rect'));
-    this.setColor(dict.getArray('C'));
+class Annotation {
+  constructor(params) {
+    const dict = params.dict;
+    this.setContents(dict.get("Contents"));
+    this.setModificationDate(dict.get("M"));
+    this.setFlags(dict.get("F"));
+    this.setRectangle(dict.getArray("Rect"));
+    this.setColor(dict.getArray("C"));
     this.setBorderStyle(dict);
     this.setAppearance(dict);
     this.data = {
       annotationFlags: this.flags,
       borderStyle: this.borderStyle,
       color: this.color,
+      contents: this.contents,
       hasAppearance: !!this.appearance,
       id: params.id,
+      modificationDate: this.modificationDate,
       rect: this.rectangle,
       subtype: params.subtype
     };
   }
 
-  _createClass(Annotation, [{
-    key: '_hasFlag',
-    value: function _hasFlag(flags, flag) {
-      return !!(flags & flag);
-    }
-  }, {
-    key: '_isViewable',
-    value: function _isViewable(flags) {
-      return !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN) && !this._hasFlag(flags, _util.AnnotationFlag.NOVIEW);
-    }
-  }, {
-    key: '_isPrintable',
-    value: function _isPrintable(flags) {
-      return this._hasFlag(flags, _util.AnnotationFlag.PRINT) && !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN);
-    }
-  }, {
-    key: 'setFlags',
-    value: function setFlags(flags) {
-      this.flags = Number.isInteger(flags) && flags > 0 ? flags : 0;
-    }
-  }, {
-    key: 'hasFlag',
-    value: function hasFlag(flag) {
-      return this._hasFlag(this.flags, flag);
-    }
-  }, {
-    key: 'setRectangle',
-    value: function setRectangle(rectangle) {
-      if (Array.isArray(rectangle) && rectangle.length === 4) {
-        this.rectangle = _util.Util.normalizeRect(rectangle);
-      } else {
-        this.rectangle = [0, 0, 0, 0];
-      }
+  _hasFlag(flags, flag) {
+    return !!(flags & flag);
+  }
+
+  _isViewable(flags) {
+    return !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN) && !this._hasFlag(flags, _util.AnnotationFlag.NOVIEW);
+  }
+
+  _isPrintable(flags) {
+    return this._hasFlag(flags, _util.AnnotationFlag.PRINT) && !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN);
+  }
+
+  get viewable() {
+    if (this.flags === 0) {
+      return true;
+    }
+
+    return this._isViewable(this.flags);
+  }
+
+  get printable() {
+    if (this.flags === 0) {
+      return false;
     }
-  }, {
-    key: 'setColor',
-    value: function setColor(color) {
-      var rgbColor = new Uint8ClampedArray(3);
-      if (!Array.isArray(color)) {
+
+    return this._isPrintable(this.flags);
+  }
+
+  setContents(contents) {
+    this.contents = (0, _util.stringToPDFString)(contents || "");
+  }
+
+  setModificationDate(modificationDate) {
+    this.modificationDate = (0, _util.isString)(modificationDate) ? modificationDate : null;
+  }
+
+  setFlags(flags) {
+    this.flags = Number.isInteger(flags) && flags > 0 ? flags : 0;
+  }
+
+  hasFlag(flag) {
+    return this._hasFlag(this.flags, flag);
+  }
+
+  setRectangle(rectangle) {
+    if (Array.isArray(rectangle) && rectangle.length === 4) {
+      this.rectangle = _util.Util.normalizeRect(rectangle);
+    } else {
+      this.rectangle = [0, 0, 0, 0];
+    }
+  }
+
+  setColor(color) {
+    const rgbColor = new Uint8ClampedArray(3);
+
+    if (!Array.isArray(color)) {
+      this.color = rgbColor;
+      return;
+    }
+
+    switch (color.length) {
+      case 0:
+        this.color = null;
+        break;
+
+      case 1:
+        _colorspace.ColorSpace.singletons.gray.getRgbItem(color, 0, rgbColor, 0);
+
         this.color = rgbColor;
-        return;
-      }
-      switch (color.length) {
-        case 0:
-          this.color = null;
-          break;
-        case 1:
-          _colorspace.ColorSpace.singletons.gray.getRgbItem(color, 0, rgbColor, 0);
-          this.color = rgbColor;
-          break;
-        case 3:
-          _colorspace.ColorSpace.singletons.rgb.getRgbItem(color, 0, rgbColor, 0);
-          this.color = rgbColor;
-          break;
-        case 4:
-          _colorspace.ColorSpace.singletons.cmyk.getRgbItem(color, 0, rgbColor, 0);
-          this.color = rgbColor;
-          break;
-        default:
-          this.color = rgbColor;
-          break;
-      }
+        break;
+
+      case 3:
+        _colorspace.ColorSpace.singletons.rgb.getRgbItem(color, 0, rgbColor, 0);
+
+        this.color = rgbColor;
+        break;
+
+      case 4:
+        _colorspace.ColorSpace.singletons.cmyk.getRgbItem(color, 0, rgbColor, 0);
+
+        this.color = rgbColor;
+        break;
+
+      default:
+        this.color = rgbColor;
+        break;
+    }
+  }
+
+  setBorderStyle(borderStyle) {
+    this.borderStyle = new AnnotationBorderStyle();
+
+    if (!(0, _primitives.isDict)(borderStyle)) {
+      return;
     }
-  }, {
-    key: 'setBorderStyle',
-    value: function setBorderStyle(borderStyle) {
-      this.borderStyle = new AnnotationBorderStyle();
-      if (!(0, _primitives.isDict)(borderStyle)) {
-        return;
+
+    if (borderStyle.has("BS")) {
+      const dict = borderStyle.get("BS");
+      const dictType = dict.get("Type");
+
+      if (!dictType || (0, _primitives.isName)(dictType, "Border")) {
+        this.borderStyle.setWidth(dict.get("W"), this.rectangle);
+        this.borderStyle.setStyle(dict.get("S"));
+        this.borderStyle.setDashArray(dict.getArray("D"));
       }
-      if (borderStyle.has('BS')) {
-        var dict = borderStyle.get('BS');
-        var dictType = dict.get('Type');
-        if (!dictType || (0, _primitives.isName)(dictType, 'Border')) {
-          this.borderStyle.setWidth(dict.get('W'));
-          this.borderStyle.setStyle(dict.get('S'));
-          this.borderStyle.setDashArray(dict.getArray('D'));
-        }
-      } else if (borderStyle.has('Border')) {
-        var array = borderStyle.getArray('Border');
-        if (Array.isArray(array) && array.length >= 3) {
-          this.borderStyle.setHorizontalCornerRadius(array[0]);
-          this.borderStyle.setVerticalCornerRadius(array[1]);
-          this.borderStyle.setWidth(array[2]);
-          if (array.length === 4) {
-            this.borderStyle.setDashArray(array[3]);
-          }
+    } else if (borderStyle.has("Border")) {
+      const array = borderStyle.getArray("Border");
+
+      if (Array.isArray(array) && array.length >= 3) {
+        this.borderStyle.setHorizontalCornerRadius(array[0]);
+        this.borderStyle.setVerticalCornerRadius(array[1]);
+        this.borderStyle.setWidth(array[2], this.rectangle);
+
+        if (array.length === 4) {
+          this.borderStyle.setDashArray(array[3]);
         }
-      } else {
-        this.borderStyle.setWidth(0);
       }
+    } else {
+      this.borderStyle.setWidth(0);
     }
-  }, {
-    key: 'setAppearance',
-    value: function setAppearance(dict) {
-      this.appearance = null;
-      var appearanceStates = dict.get('AP');
-      if (!(0, _primitives.isDict)(appearanceStates)) {
-        return;
-      }
-      var normalAppearanceState = appearanceStates.get('N');
-      if ((0, _primitives.isStream)(normalAppearanceState)) {
-        this.appearance = normalAppearanceState;
-        return;
-      }
-      if (!(0, _primitives.isDict)(normalAppearanceState)) {
-        return;
-      }
-      var as = dict.get('AS');
-      if (!(0, _primitives.isName)(as) || !normalAppearanceState.has(as.name)) {
-        return;
-      }
-      this.appearance = normalAppearanceState.get(as.name);
+  }
+
+  setAppearance(dict) {
+    this.appearance = null;
+    const appearanceStates = dict.get("AP");
+
+    if (!(0, _primitives.isDict)(appearanceStates)) {
+      return;
     }
-  }, {
-    key: '_preparePopup',
-    value: function _preparePopup(dict) {
-      if (!dict.has('C')) {
-        this.data.color = null;
-      }
-      this.data.hasPopup = dict.has('Popup');
-      this.data.title = (0, _util.stringToPDFString)(dict.get('T') || '');
-      this.data.contents = (0, _util.stringToPDFString)(dict.get('Contents') || '');
-    }
-  }, {
-    key: 'loadResources',
-    value: function loadResources(keys) {
-      return this.appearance.dict.getAsync('Resources').then(function (resources) {
-        if (!resources) {
-          return;
-        }
-        var objectLoader = new _obj.ObjectLoader(resources, keys, resources.xref);
-        return objectLoader.load().then(function () {
-          return resources;
-        });
-      });
+
+    const normalAppearanceState = appearanceStates.get("N");
+
+    if ((0, _primitives.isStream)(normalAppearanceState)) {
+      this.appearance = normalAppearanceState;
+      return;
     }
-  }, {
-    key: 'getOperatorList',
-    value: function getOperatorList(evaluator, task, renderForms) {
-      var _this = this;
 
-      if (!this.appearance) {
-        return Promise.resolve(new _operator_list.OperatorList());
-      }
-      var data = this.data;
-      var appearanceDict = this.appearance.dict;
-      var resourcesPromise = this.loadResources(['ExtGState', 'ColorSpace', 'Pattern', 'Shading', 'XObject', 'Font']);
-      var bbox = appearanceDict.getArray('BBox') || [0, 0, 1, 1];
-      var matrix = appearanceDict.getArray('Matrix') || [1, 0, 0, 1, 0, 0];
-      var transform = getTransformMatrix(data.rect, bbox, matrix);
-      return resourcesPromise.then(function (resources) {
-        var opList = new _operator_list.OperatorList();
-        opList.addOp(_util.OPS.beginAnnotation, [data.rect, transform, matrix]);
-        return evaluator.getOperatorList({
-          stream: _this.appearance,
-          task: task,
-          resources: resources,
-          operatorList: opList
-        }).then(function () {
-          opList.addOp(_util.OPS.endAnnotation, []);
-          _this.appearance.reset();
-          return opList;
-        });
-      });
+    if (!(0, _primitives.isDict)(normalAppearanceState)) {
+      return;
     }
-  }, {
-    key: 'viewable',
-    get: function get() {
-      if (this.flags === 0) {
-        return true;
-      }
-      return this._isViewable(this.flags);
+
+    const as = dict.get("AS");
+
+    if (!(0, _primitives.isName)(as) || !normalAppearanceState.has(as.name)) {
+      return;
     }
-  }, {
-    key: 'printable',
-    get: function get() {
-      if (this.flags === 0) {
-        return false;
+
+    this.appearance = normalAppearanceState.get(as.name);
+  }
+
+  loadResources(keys) {
+    return this.appearance.dict.getAsync("Resources").then(resources => {
+      if (!resources) {
+        return undefined;
       }
-      return this._isPrintable(this.flags);
+
+      const objectLoader = new _obj.ObjectLoader(resources, keys, resources.xref);
+      return objectLoader.load().then(function () {
+        return resources;
+      });
+    });
+  }
+
+  getOperatorList(evaluator, task, renderForms) {
+    if (!this.appearance) {
+      return Promise.resolve(new _operator_list.OperatorList());
     }
-  }]);
 
-  return Annotation;
-}();
+    const data = this.data;
+    const appearanceDict = this.appearance.dict;
+    const resourcesPromise = this.loadResources(["ExtGState", "ColorSpace", "Pattern", "Shading", "XObject", "Font"]);
+    const bbox = appearanceDict.getArray("BBox") || [0, 0, 1, 1];
+    const matrix = appearanceDict.getArray("Matrix") || [1, 0, 0, 1, 0, 0];
+    const transform = getTransformMatrix(data.rect, bbox, matrix);
+    return resourcesPromise.then(resources => {
+      const opList = new _operator_list.OperatorList();
+      opList.addOp(_util.OPS.beginAnnotation, [data.rect, transform, matrix]);
+      return evaluator.getOperatorList({
+        stream: this.appearance,
+        task,
+        resources,
+        operatorList: opList
+      }).then(() => {
+        opList.addOp(_util.OPS.endAnnotation, []);
+        this.appearance.reset();
+        return opList;
+      });
+    });
+  }
 
-var AnnotationBorderStyle = function () {
-  function AnnotationBorderStyle() {
-    _classCallCheck(this, AnnotationBorderStyle);
+}
+
+exports.Annotation = Annotation;
 
+class AnnotationBorderStyle {
+  constructor() {
     this.width = 1;
     this.style = _util.AnnotationBorderStyleType.SOLID;
     this.dashArray = [3];
@@ -370,652 +424,675 @@ var AnnotationBorderStyle = function () {
     this.verticalCornerRadius = 0;
   }
 
-  _createClass(AnnotationBorderStyle, [{
-    key: 'setWidth',
-    value: function setWidth(width) {
-      if (Number.isInteger(width)) {
-        this.width = width;
-      }
+  setWidth(width, rect = [0, 0, 0, 0]) {
+    if ((0, _primitives.isName)(width)) {
+      this.width = 0;
+      return;
     }
-  }, {
-    key: 'setStyle',
-    value: function setStyle(style) {
-      if (!style) {
-        return;
-      }
-      switch (style.name) {
-        case 'S':
-          this.style = _util.AnnotationBorderStyleType.SOLID;
-          break;
-        case 'D':
-          this.style = _util.AnnotationBorderStyleType.DASHED;
-          break;
-        case 'B':
-          this.style = _util.AnnotationBorderStyleType.BEVELED;
-          break;
-        case 'I':
-          this.style = _util.AnnotationBorderStyleType.INSET;
-          break;
-        case 'U':
-          this.style = _util.AnnotationBorderStyleType.UNDERLINE;
-          break;
-        default:
-          break;
+
+    if (Number.isInteger(width)) {
+      if (width > 0) {
+        const maxWidth = (rect[2] - rect[0]) / 2;
+        const maxHeight = (rect[3] - rect[1]) / 2;
+
+        if (maxWidth > 0 && maxHeight > 0 && (width > maxWidth || width > maxHeight)) {
+          (0, _util.warn)(`AnnotationBorderStyle.setWidth - ignoring width: ${width}`);
+          width = 1;
+        }
       }
+
+      this.width = width;
     }
-  }, {
-    key: 'setDashArray',
-    value: function setDashArray(dashArray) {
-      if (Array.isArray(dashArray) && dashArray.length > 0) {
-        var isValid = true;
-        var allZeros = true;
-        for (var i = 0, len = dashArray.length; i < len; i++) {
-          var element = dashArray[i];
-          var validNumber = +element >= 0;
-          if (!validNumber) {
-            isValid = false;
-            break;
-          } else if (element > 0) {
-            allZeros = false;
-          }
-        }
-        if (isValid && !allZeros) {
-          this.dashArray = dashArray;
-        } else {
-          this.width = 0;
+  }
+
+  setStyle(style) {
+    if (!(0, _primitives.isName)(style)) {
+      return;
+    }
+
+    switch (style.name) {
+      case "S":
+        this.style = _util.AnnotationBorderStyleType.SOLID;
+        break;
+
+      case "D":
+        this.style = _util.AnnotationBorderStyleType.DASHED;
+        break;
+
+      case "B":
+        this.style = _util.AnnotationBorderStyleType.BEVELED;
+        break;
+
+      case "I":
+        this.style = _util.AnnotationBorderStyleType.INSET;
+        break;
+
+      case "U":
+        this.style = _util.AnnotationBorderStyleType.UNDERLINE;
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  setDashArray(dashArray) {
+    if (Array.isArray(dashArray) && dashArray.length > 0) {
+      let isValid = true;
+      let allZeros = true;
+
+      for (const element of dashArray) {
+        const validNumber = +element >= 0;
+
+        if (!validNumber) {
+          isValid = false;
+          break;
+        } else if (element > 0) {
+          allZeros = false;
         }
-      } else if (dashArray) {
+      }
+
+      if (isValid && !allZeros) {
+        this.dashArray = dashArray;
+      } else {
         this.width = 0;
       }
+    } else if (dashArray) {
+      this.width = 0;
     }
-  }, {
-    key: 'setHorizontalCornerRadius',
-    value: function setHorizontalCornerRadius(radius) {
-      if (Number.isInteger(radius)) {
-        this.horizontalCornerRadius = radius;
-      }
+  }
+
+  setHorizontalCornerRadius(radius) {
+    if (Number.isInteger(radius)) {
+      this.horizontalCornerRadius = radius;
     }
-  }, {
-    key: 'setVerticalCornerRadius',
-    value: function setVerticalCornerRadius(radius) {
-      if (Number.isInteger(radius)) {
-        this.verticalCornerRadius = radius;
-      }
+  }
+
+  setVerticalCornerRadius(radius) {
+    if (Number.isInteger(radius)) {
+      this.verticalCornerRadius = radius;
     }
-  }]);
+  }
+
+}
 
-  return AnnotationBorderStyle;
-}();
+exports.AnnotationBorderStyle = AnnotationBorderStyle;
+
+class MarkupAnnotation extends Annotation {
+  constructor(parameters) {
+    super(parameters);
+    const dict = parameters.dict;
 
-var WidgetAnnotation = function (_Annotation) {
-  _inherits(WidgetAnnotation, _Annotation);
+    if (dict.has("IRT")) {
+      const rawIRT = dict.getRaw("IRT");
+      this.data.inReplyTo = (0, _primitives.isRef)(rawIRT) ? rawIRT.toString() : null;
+      const rt = dict.get("RT");
+      this.data.replyType = (0, _primitives.isName)(rt) ? rt.name : _util.AnnotationReplyType.REPLY;
+    }
 
-  function WidgetAnnotation(params) {
-    _classCallCheck(this, WidgetAnnotation);
+    if (this.data.replyType === _util.AnnotationReplyType.GROUP) {
+      const parent = dict.get("IRT");
+      this.data.title = (0, _util.stringToPDFString)(parent.get("T") || "");
+      this.setContents(parent.get("Contents"));
+      this.data.contents = this.contents;
 
-    var _this2 = _possibleConstructorReturn(this, (WidgetAnnotation.__proto__ || Object.getPrototypeOf(WidgetAnnotation)).call(this, params));
+      if (!parent.has("CreationDate")) {
+        this.data.creationDate = null;
+      } else {
+        this.setCreationDate(parent.get("CreationDate"));
+        this.data.creationDate = this.creationDate;
+      }
 
-    var dict = params.dict;
-    var data = _this2.data;
+      if (!parent.has("M")) {
+        this.data.modificationDate = null;
+      } else {
+        this.setModificationDate(parent.get("M"));
+        this.data.modificationDate = this.modificationDate;
+      }
+
+      this.data.hasPopup = parent.has("Popup");
+
+      if (!parent.has("C")) {
+        this.data.color = null;
+      } else {
+        this.setColor(parent.getArray("C"));
+        this.data.color = this.color;
+      }
+    } else {
+      this.data.title = (0, _util.stringToPDFString)(dict.get("T") || "");
+      this.setCreationDate(dict.get("CreationDate"));
+      this.data.creationDate = this.creationDate;
+      this.data.hasPopup = dict.has("Popup");
+
+      if (!dict.has("C")) {
+        this.data.color = null;
+      }
+    }
+  }
+
+  setCreationDate(creationDate) {
+    this.creationDate = (0, _util.isString)(creationDate) ? creationDate : null;
+  }
+
+}
+
+exports.MarkupAnnotation = MarkupAnnotation;
+
+class WidgetAnnotation extends Annotation {
+  constructor(params) {
+    super(params);
+    const dict = params.dict;
+    const data = this.data;
     data.annotationType = _util.AnnotationType.WIDGET;
-    data.fieldName = _this2._constructFieldName(dict);
-    data.fieldValue = (0, _util.getInheritableProperty)({
-      dict: dict,
-      key: 'V',
+    data.fieldName = this._constructFieldName(dict);
+    data.fieldValue = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "V",
       getArray: true
     });
-    data.alternativeText = (0, _util.stringToPDFString)(dict.get('TU') || '');
-    data.defaultAppearance = (0, _util.getInheritableProperty)({
-      dict: dict,
-      key: 'DA'
-    }) || '';
-    var fieldType = (0, _util.getInheritableProperty)({
-      dict: dict,
-      key: 'FT'
+    data.alternativeText = (0, _util.stringToPDFString)(dict.get("TU") || "");
+    data.defaultAppearance = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "DA"
+    }) || "";
+    const fieldType = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "FT"
     });
     data.fieldType = (0, _primitives.isName)(fieldType) ? fieldType.name : null;
-    _this2.fieldResources = (0, _util.getInheritableProperty)({
-      dict: dict,
-      key: 'DR'
+    this.fieldResources = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "DR"
     }) || _primitives.Dict.empty;
-    data.fieldFlags = (0, _util.getInheritableProperty)({
-      dict: dict,
-      key: 'Ff'
+    data.fieldFlags = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "Ff"
     });
+
     if (!Number.isInteger(data.fieldFlags) || data.fieldFlags < 0) {
       data.fieldFlags = 0;
     }
-    data.readOnly = _this2.hasFieldFlag(_util.AnnotationFieldFlag.READONLY);
-    if (data.fieldType === 'Sig') {
-      _this2.setFlags(_util.AnnotationFlag.HIDDEN);
+
+    data.readOnly = this.hasFieldFlag(_util.AnnotationFieldFlag.READONLY);
+
+    if (data.fieldType === "Sig") {
+      data.fieldValue = null;
+      this.setFlags(_util.AnnotationFlag.HIDDEN);
     }
-    return _this2;
   }
 
-  _createClass(WidgetAnnotation, [{
-    key: '_constructFieldName',
-    value: function _constructFieldName(dict) {
-      if (!dict.has('T') && !dict.has('Parent')) {
-        (0, _util.warn)('Unknown field name, falling back to empty field name.');
-        return '';
-      }
-      if (!dict.has('Parent')) {
-        return (0, _util.stringToPDFString)(dict.get('T'));
-      }
-      var fieldName = [];
-      if (dict.has('T')) {
-        fieldName.unshift((0, _util.stringToPDFString)(dict.get('T')));
-      }
-      var loopDict = dict;
-      while (loopDict.has('Parent')) {
-        loopDict = loopDict.get('Parent');
-        if (!(0, _primitives.isDict)(loopDict)) {
-          break;
-        }
-        if (loopDict.has('T')) {
-          fieldName.unshift((0, _util.stringToPDFString)(loopDict.get('T')));
-        }
+  _constructFieldName(dict) {
+    if (!dict.has("T") && !dict.has("Parent")) {
+      (0, _util.warn)("Unknown field name, falling back to empty field name.");
+      return "";
+    }
+
+    if (!dict.has("Parent")) {
+      return (0, _util.stringToPDFString)(dict.get("T"));
+    }
+
+    const fieldName = [];
+
+    if (dict.has("T")) {
+      fieldName.unshift((0, _util.stringToPDFString)(dict.get("T")));
+    }
+
+    let loopDict = dict;
+
+    while (loopDict.has("Parent")) {
+      loopDict = loopDict.get("Parent");
+
+      if (!(0, _primitives.isDict)(loopDict)) {
+        break;
       }
-      return fieldName.join('.');
-    }
-  }, {
-    key: 'hasFieldFlag',
-    value: function hasFieldFlag(flag) {
-      return !!(this.data.fieldFlags & flag);
-    }
-  }, {
-    key: 'getOperatorList',
-    value: function getOperatorList(evaluator, task, renderForms) {
-      if (renderForms) {
-        return Promise.resolve(new _operator_list.OperatorList());
+
+      if (loopDict.has("T")) {
+        fieldName.unshift((0, _util.stringToPDFString)(loopDict.get("T")));
       }
-      return _get(WidgetAnnotation.prototype.__proto__ || Object.getPrototypeOf(WidgetAnnotation.prototype), 'getOperatorList', this).call(this, evaluator, task, renderForms);
     }
-  }]);
 
-  return WidgetAnnotation;
-}(Annotation);
+    return fieldName.join(".");
+  }
+
+  hasFieldFlag(flag) {
+    return !!(this.data.fieldFlags & flag);
+  }
 
-var TextWidgetAnnotation = function (_WidgetAnnotation) {
-  _inherits(TextWidgetAnnotation, _WidgetAnnotation);
+  getOperatorList(evaluator, task, renderForms) {
+    if (renderForms) {
+      return Promise.resolve(new _operator_list.OperatorList());
+    }
 
-  function TextWidgetAnnotation(params) {
-    _classCallCheck(this, TextWidgetAnnotation);
+    return super.getOperatorList(evaluator, task, renderForms);
+  }
 
-    var _this3 = _possibleConstructorReturn(this, (TextWidgetAnnotation.__proto__ || Object.getPrototypeOf(TextWidgetAnnotation)).call(this, params));
+}
 
-    var dict = params.dict;
-    _this3.data.fieldValue = (0, _util.stringToPDFString)(_this3.data.fieldValue || '');
-    var alignment = (0, _util.getInheritableProperty)({
-      dict: dict,
-      key: 'Q'
+class TextWidgetAnnotation extends WidgetAnnotation {
+  constructor(params) {
+    super(params);
+    const dict = params.dict;
+    this.data.fieldValue = (0, _util.stringToPDFString)(this.data.fieldValue || "");
+    let alignment = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "Q"
     });
+
     if (!Number.isInteger(alignment) || alignment < 0 || alignment > 2) {
       alignment = null;
     }
-    _this3.data.textAlignment = alignment;
-    var maximumLength = (0, _util.getInheritableProperty)({
-      dict: dict,
-      key: 'MaxLen'
+
+    this.data.textAlignment = alignment;
+    let maximumLength = (0, _core_utils.getInheritableProperty)({
+      dict,
+      key: "MaxLen"
     });
+
     if (!Number.isInteger(maximumLength) || maximumLength < 0) {
       maximumLength = null;
     }
-    _this3.data.maxLen = maximumLength;
-    _this3.data.multiLine = _this3.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE);
-    _this3.data.comb = _this3.hasFieldFlag(_util.AnnotationFieldFlag.COMB) && !_this3.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE) && !_this3.hasFieldFlag(_util.AnnotationFieldFlag.PASSWORD) && !_this3.hasFieldFlag(_util.AnnotationFieldFlag.FILESELECT) && _this3.data.maxLen !== null;
-    return _this3;
+
+    this.data.maxLen = maximumLength;
+    this.data.multiLine = this.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE);
+    this.data.comb = this.hasFieldFlag(_util.AnnotationFieldFlag.COMB) && !this.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE) && !this.hasFieldFlag(_util.AnnotationFieldFlag.PASSWORD) && !this.hasFieldFlag(_util.AnnotationFieldFlag.FILESELECT) && this.data.maxLen !== null;
   }
 
-  _createClass(TextWidgetAnnotation, [{
-    key: 'getOperatorList',
-    value: function getOperatorList(evaluator, task, renderForms) {
-      if (renderForms || this.appearance) {
-        return _get(TextWidgetAnnotation.prototype.__proto__ || Object.getPrototypeOf(TextWidgetAnnotation.prototype), 'getOperatorList', this).call(this, evaluator, task, renderForms);
-      }
-      var operatorList = new _operator_list.OperatorList();
-      if (!this.data.defaultAppearance) {
-        return Promise.resolve(operatorList);
-      }
-      var stream = new _stream.Stream((0, _util.stringToBytes)(this.data.defaultAppearance));
-      return evaluator.getOperatorList({
-        stream: stream,
-        task: task,
-        resources: this.fieldResources,
-        operatorList: operatorList
-      }).then(function () {
-        return operatorList;
-      });
+  getOperatorList(evaluator, task, renderForms) {
+    if (renderForms || this.appearance) {
+      return super.getOperatorList(evaluator, task, renderForms);
     }
-  }]);
 
-  return TextWidgetAnnotation;
-}(WidgetAnnotation);
+    const operatorList = new _operator_list.OperatorList();
 
-var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
-  _inherits(ButtonWidgetAnnotation, _WidgetAnnotation2);
+    if (!this.data.defaultAppearance) {
+      return Promise.resolve(operatorList);
+    }
 
-  function ButtonWidgetAnnotation(params) {
-    _classCallCheck(this, ButtonWidgetAnnotation);
+    const stream = new _stream.Stream((0, _util.stringToBytes)(this.data.defaultAppearance));
+    return evaluator.getOperatorList({
+      stream,
+      task,
+      resources: this.fieldResources,
+      operatorList
+    }).then(function () {
+      return operatorList;
+    });
+  }
 
-    var _this4 = _possibleConstructorReturn(this, (ButtonWidgetAnnotation.__proto__ || Object.getPrototypeOf(ButtonWidgetAnnotation)).call(this, params));
+}
 
-    _this4.data.checkBox = !_this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
-    _this4.data.radioButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
-    _this4.data.pushButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
-    if (_this4.data.checkBox) {
-      _this4._processCheckBox(params);
-    } else if (_this4.data.radioButton) {
-      _this4._processRadioButton(params);
-    } else if (_this4.data.pushButton) {
-      _this4._processPushButton(params);
+class ButtonWidgetAnnotation extends WidgetAnnotation {
+  constructor(params) {
+    super(params);
+    this.data.checkBox = !this.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !this.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+    this.data.radioButton = this.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !this.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+    this.data.pushButton = this.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+
+    if (this.data.checkBox) {
+      this._processCheckBox(params);
+    } else if (this.data.radioButton) {
+      this._processRadioButton(params);
+    } else if (this.data.pushButton) {
+      this._processPushButton(params);
     } else {
-      (0, _util.warn)('Invalid field flags for button widget annotation');
+      (0, _util.warn)("Invalid field flags for button widget annotation");
     }
-    return _this4;
   }
 
-  _createClass(ButtonWidgetAnnotation, [{
-    key: '_processCheckBox',
-    value: function _processCheckBox(params) {
-      if ((0, _primitives.isName)(this.data.fieldValue)) {
-        this.data.fieldValue = this.data.fieldValue.name;
-      }
-      var customAppearance = params.dict.get('AP');
-      if (!(0, _primitives.isDict)(customAppearance)) {
-        return;
-      }
-      var exportValueOptionsDict = customAppearance.get('D');
-      if (!(0, _primitives.isDict)(exportValueOptionsDict)) {
-        return;
-      }
-      var exportValues = exportValueOptionsDict.getKeys();
-      var hasCorrectOptionCount = exportValues.length === 2;
-      if (!hasCorrectOptionCount) {
-        return;
-      }
-      this.data.exportValue = exportValues[0] === 'Off' ? exportValues[1] : exportValues[0];
-    }
-  }, {
-    key: '_processRadioButton',
-    value: function _processRadioButton(params) {
-      this.data.fieldValue = this.data.buttonValue = null;
-      var fieldParent = params.dict.get('Parent');
-      if ((0, _primitives.isDict)(fieldParent) && fieldParent.has('V')) {
-        var fieldParentValue = fieldParent.get('V');
-        if ((0, _primitives.isName)(fieldParentValue)) {
-          this.data.fieldValue = fieldParentValue.name;
-        }
-      }
-      var appearanceStates = params.dict.get('AP');
-      if (!(0, _primitives.isDict)(appearanceStates)) {
-        return;
-      }
-      var normalAppearanceState = appearanceStates.get('N');
-      if (!(0, _primitives.isDict)(normalAppearanceState)) {
-        return;
-      }
-      var keys = normalAppearanceState.getKeys();
-      for (var i = 0, ii = keys.length; i < ii; i++) {
-        if (keys[i] !== 'Off') {
-          this.data.buttonValue = keys[i];
-          break;
-        }
-      }
+  _processCheckBox(params) {
+    if ((0, _primitives.isName)(this.data.fieldValue)) {
+      this.data.fieldValue = this.data.fieldValue.name;
+    }
+
+    const customAppearance = params.dict.get("AP");
+
+    if (!(0, _primitives.isDict)(customAppearance)) {
+      return;
+    }
+
+    const exportValueOptionsDict = customAppearance.get("D");
+
+    if (!(0, _primitives.isDict)(exportValueOptionsDict)) {
+      return;
     }
-  }, {
-    key: '_processPushButton',
-    value: function _processPushButton(params) {
-      if (!params.dict.has('A')) {
-        (0, _util.warn)('Push buttons without action dictionaries are not supported');
-        return;
+
+    const exportValues = exportValueOptionsDict.getKeys();
+    const hasCorrectOptionCount = exportValues.length === 2;
+
+    if (!hasCorrectOptionCount) {
+      return;
+    }
+
+    this.data.exportValue = exportValues[0] === "Off" ? exportValues[1] : exportValues[0];
+  }
+
+  _processRadioButton(params) {
+    this.data.fieldValue = this.data.buttonValue = null;
+    const fieldParent = params.dict.get("Parent");
+
+    if ((0, _primitives.isDict)(fieldParent) && fieldParent.has("V")) {
+      const fieldParentValue = fieldParent.get("V");
+
+      if ((0, _primitives.isName)(fieldParentValue)) {
+        this.data.fieldValue = fieldParentValue.name;
       }
-      _obj.Catalog.parseDestDictionary({
-        destDict: params.dict,
-        resultObj: this.data,
-        docBaseUrl: params.pdfManager.docBaseUrl
-      });
     }
-  }]);
 
-  return ButtonWidgetAnnotation;
-}(WidgetAnnotation);
+    const appearanceStates = params.dict.get("AP");
+
+    if (!(0, _primitives.isDict)(appearanceStates)) {
+      return;
+    }
+
+    const normalAppearanceState = appearanceStates.get("N");
 
-var ChoiceWidgetAnnotation = function (_WidgetAnnotation3) {
-  _inherits(ChoiceWidgetAnnotation, _WidgetAnnotation3);
+    if (!(0, _primitives.isDict)(normalAppearanceState)) {
+      return;
+    }
 
-  function ChoiceWidgetAnnotation(params) {
-    _classCallCheck(this, ChoiceWidgetAnnotation);
+    for (const key of normalAppearanceState.getKeys()) {
+      if (key !== "Off") {
+        this.data.buttonValue = key;
+        break;
+      }
+    }
+  }
 
-    var _this5 = _possibleConstructorReturn(this, (ChoiceWidgetAnnotation.__proto__ || Object.getPrototypeOf(ChoiceWidgetAnnotation)).call(this, params));
+  _processPushButton(params) {
+    if (!params.dict.has("A")) {
+      (0, _util.warn)("Push buttons without action dictionaries are not supported");
+      return;
+    }
 
-    _this5.data.options = [];
-    var options = (0, _util.getInheritableProperty)({
+    _obj.Catalog.parseDestDictionary({
+      destDict: params.dict,
+      resultObj: this.data,
+      docBaseUrl: params.pdfManager.docBaseUrl
+    });
+  }
+
+}
+
+class ChoiceWidgetAnnotation extends WidgetAnnotation {
+  constructor(params) {
+    super(params);
+    this.data.options = [];
+    const options = (0, _core_utils.getInheritableProperty)({
       dict: params.dict,
-      key: 'Opt'
+      key: "Opt"
     });
+
     if (Array.isArray(options)) {
-      var xref = params.xref;
-      for (var i = 0, ii = options.length; i < ii; i++) {
-        var option = xref.fetchIfRef(options[i]);
-        var isOptionArray = Array.isArray(option);
-        _this5.data.options[i] = {
+      const xref = params.xref;
+
+      for (let i = 0, ii = options.length; i < ii; i++) {
+        const option = xref.fetchIfRef(options[i]);
+        const isOptionArray = Array.isArray(option);
+        this.data.options[i] = {
           exportValue: isOptionArray ? xref.fetchIfRef(option[0]) : option,
           displayValue: (0, _util.stringToPDFString)(isOptionArray ? xref.fetchIfRef(option[1]) : option)
         };
       }
     }
-    if (!Array.isArray(_this5.data.fieldValue)) {
-      _this5.data.fieldValue = [_this5.data.fieldValue];
-    }
-    _this5.data.combo = _this5.hasFieldFlag(_util.AnnotationFieldFlag.COMBO);
-    _this5.data.multiSelect = _this5.hasFieldFlag(_util.AnnotationFieldFlag.MULTISELECT);
-    return _this5;
-  }
 
-  return ChoiceWidgetAnnotation;
-}(WidgetAnnotation);
+    if (!Array.isArray(this.data.fieldValue)) {
+      this.data.fieldValue = [this.data.fieldValue];
+    }
 
-var TextAnnotation = function (_Annotation2) {
-  _inherits(TextAnnotation, _Annotation2);
+    this.data.combo = this.hasFieldFlag(_util.AnnotationFieldFlag.COMBO);
+    this.data.multiSelect = this.hasFieldFlag(_util.AnnotationFieldFlag.MULTISELECT);
+  }
 
-  function TextAnnotation(parameters) {
-    _classCallCheck(this, TextAnnotation);
+}
 
-    var DEFAULT_ICON_SIZE = 22;
+class TextAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    const DEFAULT_ICON_SIZE = 22;
+    super(parameters);
+    const dict = parameters.dict;
+    this.data.annotationType = _util.AnnotationType.TEXT;
 
-    var _this6 = _possibleConstructorReturn(this, (TextAnnotation.__proto__ || Object.getPrototypeOf(TextAnnotation)).call(this, parameters));
+    if (this.data.hasAppearance) {
+      this.data.name = "NoIcon";
+    } else {
+      this.data.rect[1] = this.data.rect[3] - DEFAULT_ICON_SIZE;
+      this.data.rect[2] = this.data.rect[0] + DEFAULT_ICON_SIZE;
+      this.data.name = dict.has("Name") ? dict.get("Name").name : "Note";
+    }
 
-    _this6.data.annotationType = _util.AnnotationType.TEXT;
-    if (_this6.data.hasAppearance) {
-      _this6.data.name = 'NoIcon';
+    if (dict.has("State")) {
+      this.data.state = dict.get("State") || null;
+      this.data.stateModel = dict.get("StateModel") || null;
     } else {
-      _this6.data.rect[1] = _this6.data.rect[3] - DEFAULT_ICON_SIZE;
-      _this6.data.rect[2] = _this6.data.rect[0] + DEFAULT_ICON_SIZE;
-      _this6.data.name = parameters.dict.has('Name') ? parameters.dict.get('Name').name : 'Note';
+      this.data.state = null;
+      this.data.stateModel = null;
     }
-    _this6._preparePopup(parameters.dict);
-    return _this6;
   }
 
-  return TextAnnotation;
-}(Annotation);
-
-var LinkAnnotation = function (_Annotation3) {
-  _inherits(LinkAnnotation, _Annotation3);
+}
 
-  function LinkAnnotation(params) {
-    _classCallCheck(this, LinkAnnotation);
+class LinkAnnotation extends Annotation {
+  constructor(params) {
+    super(params);
+    this.data.annotationType = _util.AnnotationType.LINK;
+    const quadPoints = getQuadPoints(params.dict, this.rectangle);
 
-    var _this7 = _possibleConstructorReturn(this, (LinkAnnotation.__proto__ || Object.getPrototypeOf(LinkAnnotation)).call(this, params));
+    if (quadPoints) {
+      this.data.quadPoints = quadPoints;
+    }
 
-    _this7.data.annotationType = _util.AnnotationType.LINK;
     _obj.Catalog.parseDestDictionary({
       destDict: params.dict,
-      resultObj: _this7.data,
+      resultObj: this.data,
       docBaseUrl: params.pdfManager.docBaseUrl
     });
-    return _this7;
   }
 
-  return LinkAnnotation;
-}(Annotation);
-
-var PopupAnnotation = function (_Annotation4) {
-  _inherits(PopupAnnotation, _Annotation4);
-
-  function PopupAnnotation(parameters) {
-    _classCallCheck(this, PopupAnnotation);
+}
 
-    var _this8 = _possibleConstructorReturn(this, (PopupAnnotation.__proto__ || Object.getPrototypeOf(PopupAnnotation)).call(this, parameters));
+class PopupAnnotation extends Annotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.POPUP;
+    let parentItem = parameters.dict.get("Parent");
 
-    _this8.data.annotationType = _util.AnnotationType.POPUP;
-    var dict = parameters.dict;
-    var parentItem = dict.get('Parent');
     if (!parentItem) {
-      (0, _util.warn)('Popup annotation has a missing or invalid parent annotation.');
-      return _possibleConstructorReturn(_this8);
-    }
-    var parentSubtype = parentItem.get('Subtype');
-    _this8.data.parentType = (0, _primitives.isName)(parentSubtype) ? parentSubtype.name : null;
-    _this8.data.parentId = dict.getRaw('Parent').toString();
-    _this8.data.title = (0, _util.stringToPDFString)(parentItem.get('T') || '');
-    _this8.data.contents = (0, _util.stringToPDFString)(parentItem.get('Contents') || '');
-    if (!parentItem.has('C')) {
-      _this8.data.color = null;
-    } else {
-      _this8.setColor(parentItem.getArray('C'));
-      _this8.data.color = _this8.color;
-    }
-    if (!_this8.viewable) {
-      var parentFlags = parentItem.get('F');
-      if (_this8._isViewable(parentFlags)) {
-        _this8.setFlags(parentFlags);
-      }
+      (0, _util.warn)("Popup annotation has a missing or invalid parent annotation.");
+      return;
     }
-    return _this8;
-  }
-
-  return PopupAnnotation;
-}(Annotation);
 
-var LineAnnotation = function (_Annotation5) {
-  _inherits(LineAnnotation, _Annotation5);
+    const parentSubtype = parentItem.get("Subtype");
+    this.data.parentType = (0, _primitives.isName)(parentSubtype) ? parentSubtype.name : null;
+    const rawParent = parameters.dict.getRaw("Parent");
+    this.data.parentId = (0, _primitives.isRef)(rawParent) ? rawParent.toString() : null;
+    const rt = parentItem.get("RT");
 
-  function LineAnnotation(parameters) {
-    _classCallCheck(this, LineAnnotation);
+    if ((0, _primitives.isName)(rt, _util.AnnotationReplyType.GROUP)) {
+      parentItem = parentItem.get("IRT");
+    }
 
-    var _this9 = _possibleConstructorReturn(this, (LineAnnotation.__proto__ || Object.getPrototypeOf(LineAnnotation)).call(this, parameters));
+    if (!parentItem.has("M")) {
+      this.data.modificationDate = null;
+    } else {
+      this.setModificationDate(parentItem.get("M"));
+      this.data.modificationDate = this.modificationDate;
+    }
 
-    _this9.data.annotationType = _util.AnnotationType.LINE;
-    var dict = parameters.dict;
-    _this9.data.lineCoordinates = _util.Util.normalizeRect(dict.getArray('L'));
-    _this9._preparePopup(dict);
-    return _this9;
-  }
+    if (!parentItem.has("C")) {
+      this.data.color = null;
+    } else {
+      this.setColor(parentItem.getArray("C"));
+      this.data.color = this.color;
+    }
 
-  return LineAnnotation;
-}(Annotation);
+    if (!this.viewable) {
+      const parentFlags = parentItem.get("F");
 
-var SquareAnnotation = function (_Annotation6) {
-  _inherits(SquareAnnotation, _Annotation6);
+      if (this._isViewable(parentFlags)) {
+        this.setFlags(parentFlags);
+      }
+    }
 
-  function SquareAnnotation(parameters) {
-    _classCallCheck(this, SquareAnnotation);
+    this.data.title = (0, _util.stringToPDFString)(parentItem.get("T") || "");
+    this.data.contents = (0, _util.stringToPDFString)(parentItem.get("Contents") || "");
+  }
 
-    var _this10 = _possibleConstructorReturn(this, (SquareAnnotation.__proto__ || Object.getPrototypeOf(SquareAnnotation)).call(this, parameters));
+}
 
-    _this10.data.annotationType = _util.AnnotationType.SQUARE;
-    _this10._preparePopup(parameters.dict);
-    return _this10;
+class FreeTextAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.FREETEXT;
   }
 
-  return SquareAnnotation;
-}(Annotation);
-
-var CircleAnnotation = function (_Annotation7) {
-  _inherits(CircleAnnotation, _Annotation7);
+}
 
-  function CircleAnnotation(parameters) {
-    _classCallCheck(this, CircleAnnotation);
+class LineAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.LINE;
+    this.data.lineCoordinates = _util.Util.normalizeRect(parameters.dict.getArray("L"));
+  }
 
-    var _this11 = _possibleConstructorReturn(this, (CircleAnnotation.__proto__ || Object.getPrototypeOf(CircleAnnotation)).call(this, parameters));
+}
 
-    _this11.data.annotationType = _util.AnnotationType.CIRCLE;
-    _this11._preparePopup(parameters.dict);
-    return _this11;
+class SquareAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.SQUARE;
   }
 
-  return CircleAnnotation;
-}(Annotation);
+}
 
-var PolylineAnnotation = function (_Annotation8) {
-  _inherits(PolylineAnnotation, _Annotation8);
+class CircleAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.CIRCLE;
+  }
 
-  function PolylineAnnotation(parameters) {
-    _classCallCheck(this, PolylineAnnotation);
+}
 
-    var _this12 = _possibleConstructorReturn(this, (PolylineAnnotation.__proto__ || Object.getPrototypeOf(PolylineAnnotation)).call(this, parameters));
+class PolylineAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.POLYLINE;
+    const rawVertices = parameters.dict.getArray("Vertices");
+    this.data.vertices = [];
 
-    _this12.data.annotationType = _util.AnnotationType.POLYLINE;
-    var dict = parameters.dict;
-    var rawVertices = dict.getArray('Vertices');
-    _this12.data.vertices = [];
-    for (var i = 0, ii = rawVertices.length; i < ii; i += 2) {
-      _this12.data.vertices.push({
+    for (let i = 0, ii = rawVertices.length; i < ii; i += 2) {
+      this.data.vertices.push({
         x: rawVertices[i],
         y: rawVertices[i + 1]
       });
     }
-    _this12._preparePopup(dict);
-    return _this12;
   }
 
-  return PolylineAnnotation;
-}(Annotation);
-
-var PolygonAnnotation = function (_PolylineAnnotation) {
-  _inherits(PolygonAnnotation, _PolylineAnnotation);
+}
 
-  function PolygonAnnotation(parameters) {
-    _classCallCheck(this, PolygonAnnotation);
+class PolygonAnnotation extends PolylineAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.POLYGON;
+  }
 
-    var _this13 = _possibleConstructorReturn(this, (PolygonAnnotation.__proto__ || Object.getPrototypeOf(PolygonAnnotation)).call(this, parameters));
+}
 
-    _this13.data.annotationType = _util.AnnotationType.POLYGON;
-    return _this13;
+class CaretAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.CARET;
   }
 
-  return PolygonAnnotation;
-}(PolylineAnnotation);
-
-var InkAnnotation = function (_Annotation9) {
-  _inherits(InkAnnotation, _Annotation9);
+}
 
-  function InkAnnotation(parameters) {
-    _classCallCheck(this, InkAnnotation);
+class InkAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.INK;
+    const xref = parameters.xref;
+    const originalInkLists = parameters.dict.getArray("InkList");
+    this.data.inkLists = [];
 
-    var _this14 = _possibleConstructorReturn(this, (InkAnnotation.__proto__ || Object.getPrototypeOf(InkAnnotation)).call(this, parameters));
+    for (let i = 0, ii = originalInkLists.length; i < ii; ++i) {
+      this.data.inkLists.push([]);
 
-    _this14.data.annotationType = _util.AnnotationType.INK;
-    var dict = parameters.dict;
-    var xref = parameters.xref;
-    var originalInkLists = dict.getArray('InkList');
-    _this14.data.inkLists = [];
-    for (var i = 0, ii = originalInkLists.length; i < ii; ++i) {
-      _this14.data.inkLists.push([]);
-      for (var j = 0, jj = originalInkLists[i].length; j < jj; j += 2) {
-        _this14.data.inkLists[i].push({
+      for (let j = 0, jj = originalInkLists[i].length; j < jj; j += 2) {
+        this.data.inkLists[i].push({
           x: xref.fetchIfRef(originalInkLists[i][j]),
           y: xref.fetchIfRef(originalInkLists[i][j + 1])
         });
       }
     }
-    _this14._preparePopup(dict);
-    return _this14;
   }
 
-  return InkAnnotation;
-}(Annotation);
-
-var HighlightAnnotation = function (_Annotation10) {
-  _inherits(HighlightAnnotation, _Annotation10);
-
-  function HighlightAnnotation(parameters) {
-    _classCallCheck(this, HighlightAnnotation);
+}
 
-    var _this15 = _possibleConstructorReturn(this, (HighlightAnnotation.__proto__ || Object.getPrototypeOf(HighlightAnnotation)).call(this, parameters));
+class HighlightAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.HIGHLIGHT;
+    const quadPoints = getQuadPoints(parameters.dict, this.rectangle);
 
-    _this15.data.annotationType = _util.AnnotationType.HIGHLIGHT;
-    _this15._preparePopup(parameters.dict);
-    return _this15;
+    if (quadPoints) {
+      this.data.quadPoints = quadPoints;
+    }
   }
 
-  return HighlightAnnotation;
-}(Annotation);
-
-var UnderlineAnnotation = function (_Annotation11) {
-  _inherits(UnderlineAnnotation, _Annotation11);
-
-  function UnderlineAnnotation(parameters) {
-    _classCallCheck(this, UnderlineAnnotation);
+}
 
-    var _this16 = _possibleConstructorReturn(this, (UnderlineAnnotation.__proto__ || Object.getPrototypeOf(UnderlineAnnotation)).call(this, parameters));
+class UnderlineAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.UNDERLINE;
+    const quadPoints = getQuadPoints(parameters.dict, this.rectangle);
 
-    _this16.data.annotationType = _util.AnnotationType.UNDERLINE;
-    _this16._preparePopup(parameters.dict);
-    return _this16;
+    if (quadPoints) {
+      this.data.quadPoints = quadPoints;
+    }
   }
 
-  return UnderlineAnnotation;
-}(Annotation);
-
-var SquigglyAnnotation = function (_Annotation12) {
-  _inherits(SquigglyAnnotation, _Annotation12);
-
-  function SquigglyAnnotation(parameters) {
-    _classCallCheck(this, SquigglyAnnotation);
+}
 
-    var _this17 = _possibleConstructorReturn(this, (SquigglyAnnotation.__proto__ || Object.getPrototypeOf(SquigglyAnnotation)).call(this, parameters));
+class SquigglyAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.SQUIGGLY;
+    const quadPoints = getQuadPoints(parameters.dict, this.rectangle);
 
-    _this17.data.annotationType = _util.AnnotationType.SQUIGGLY;
-    _this17._preparePopup(parameters.dict);
-    return _this17;
+    if (quadPoints) {
+      this.data.quadPoints = quadPoints;
+    }
   }
 
-  return SquigglyAnnotation;
-}(Annotation);
-
-var StrikeOutAnnotation = function (_Annotation13) {
-  _inherits(StrikeOutAnnotation, _Annotation13);
-
-  function StrikeOutAnnotation(parameters) {
-    _classCallCheck(this, StrikeOutAnnotation);
+}
 
-    var _this18 = _possibleConstructorReturn(this, (StrikeOutAnnotation.__proto__ || Object.getPrototypeOf(StrikeOutAnnotation)).call(this, parameters));
+class StrikeOutAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.STRIKEOUT;
+    const quadPoints = getQuadPoints(parameters.dict, this.rectangle);
 
-    _this18.data.annotationType = _util.AnnotationType.STRIKEOUT;
-    _this18._preparePopup(parameters.dict);
-    return _this18;
+    if (quadPoints) {
+      this.data.quadPoints = quadPoints;
+    }
   }
 
-  return StrikeOutAnnotation;
-}(Annotation);
-
-var StampAnnotation = function (_Annotation14) {
-  _inherits(StampAnnotation, _Annotation14);
-
-  function StampAnnotation(parameters) {
-    _classCallCheck(this, StampAnnotation);
-
-    var _this19 = _possibleConstructorReturn(this, (StampAnnotation.__proto__ || Object.getPrototypeOf(StampAnnotation)).call(this, parameters));
+}
 
-    _this19.data.annotationType = _util.AnnotationType.STAMP;
-    _this19._preparePopup(parameters.dict);
-    return _this19;
+class StampAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    this.data.annotationType = _util.AnnotationType.STAMP;
   }
 
-  return StampAnnotation;
-}(Annotation);
-
-var FileAttachmentAnnotation = function (_Annotation15) {
-  _inherits(FileAttachmentAnnotation, _Annotation15);
-
-  function FileAttachmentAnnotation(parameters) {
-    _classCallCheck(this, FileAttachmentAnnotation);
-
-    var _this20 = _possibleConstructorReturn(this, (FileAttachmentAnnotation.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotation)).call(this, parameters));
+}
 
-    var file = new _obj.FileSpec(parameters.dict.get('FS'), parameters.xref);
-    _this20.data.annotationType = _util.AnnotationType.FILEATTACHMENT;
-    _this20.data.file = file.serializable;
-    _this20._preparePopup(parameters.dict);
-    return _this20;
+class FileAttachmentAnnotation extends MarkupAnnotation {
+  constructor(parameters) {
+    super(parameters);
+    const file = new _obj.FileSpec(parameters.dict.get("FS"), parameters.xref);
+    this.data.annotationType = _util.AnnotationType.FILEATTACHMENT;
+    this.data.file = file.serializable;
   }
 
-  return FileAttachmentAnnotation;
-}(Annotation);
-
-exports.Annotation = Annotation;
-exports.AnnotationBorderStyle = AnnotationBorderStyle;
-exports.AnnotationFactory = AnnotationFactory;
+}