pdfjs-dist 2.0.550 → 2.3.200

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 2017 Mozilla Foundation
+ * Copyright 2019 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,109 +19,170 @@
  * @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");
 
-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");
 
-var _util = require('../shared/util');
+var _primitives = require("./primitives");
 
-var _obj = require('./obj');
+var _colorspace = require("./colorspace");
 
-var _primitives = require('./primitives');
+var _core_utils = require("./core_utils");
 
-var _colorspace = require('./colorspace');
+var _operator_list = require("./operator_list");
 
-var _operator_list = require('./operator_list');
+var _stream = require("./stream");
 
-var _stream = require('./stream');
+function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); }
 
-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; }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-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; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var AnnotationFactory = 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); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var AnnotationFactory =
+/*#__PURE__*/
+function () {
   function AnnotationFactory() {
     _classCallCheck(this, AnnotationFactory);
   }
 
   _createClass(AnnotationFactory, null, [{
-    key: 'create',
+    key: "create",
     value: function create(xref, ref, pdfManager, idFactory) {
+      return pdfManager.ensure(this, '_create', [xref, ref, pdfManager, idFactory]);
+    }
+  }, {
+    key: "_create",
+    value: function _create(xref, ref, pdfManager, idFactory) {
       var dict = xref.fetchIfRef(ref);
+
       if (!(0, _primitives.isDict)(dict)) {
-        return;
+        return undefined;
       }
-      var id = (0, _primitives.isRef)(ref) ? ref.toString() : 'annot_' + idFactory.createObjId();
+
+      var id = (0, _primitives.isRef)(ref) ? ref.toString() : "annot_".concat(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)({
+          var fieldType = (0, _core_utils.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 '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);
+
         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);
       }
     }
@@ -130,25 +191,68 @@ var AnnotationFactory = function () {
   return AnnotationFactory;
 }();
 
+exports.AnnotationFactory = AnnotationFactory;
+
+function getQuadPoints(dict, rect) {
+  if (!dict.has('QuadPoints')) {
+    return null;
+  }
+
+  var quadPoints = dict.getArray('QuadPoints');
+
+  if (!Array.isArray(quadPoints) || quadPoints.length % 8 > 0) {
+    return null;
+  }
+
+  var quadPointsLists = [];
+
+  for (var i = 0, ii = quadPoints.length / 8; i < ii; i++) {
+    quadPointsLists.push([]);
+
+    for (var j = i * 8, jj = i * 8 + 8; j < jj; j += 2) {
+      var x = quadPoints[j];
+      var y = quadPoints[j + 1];
+
+      if (x < rect[0] || x > rect[2] || y < rect[1] || y > rect[3]) {
+        return null;
+      }
+
+      quadPointsLists[i].push({
+        x: x,
+        y: y
+      });
+    }
+  }
+
+  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];
+  var _Util$getAxialAligned = _util.Util.getAxialAlignedBoundingBox(bbox, matrix),
+      _Util$getAxialAligned2 = _slicedToArray(_Util$getAxialAligned, 4),
+      minX = _Util$getAxialAligned2[0],
+      minY = _Util$getAxialAligned2[1],
+      maxX = _Util$getAxialAligned2[2],
+      maxY = _Util$getAxialAligned2[3];
+
   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);
   return [xRatio, 0, 0, yRatio, rect[0] - minX * xRatio, rect[1] - minY * yRatio];
 }
 
-var Annotation = function () {
+var Annotation =
+/*#__PURE__*/
+function () {
   function Annotation(params) {
     _classCallCheck(this, Annotation);
 
     var 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'));
@@ -158,40 +262,52 @@ var Annotation = function () {
       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',
+    key: "_hasFlag",
     value: function _hasFlag(flags, flag) {
       return !!(flags & flag);
     }
   }, {
-    key: '_isViewable',
+    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',
+    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',
+    key: "setContents",
+    value: function setContents(contents) {
+      this.contents = (0, _util.stringToPDFString)(contents || '');
+    }
+  }, {
+    key: "setModificationDate",
+    value: function setModificationDate(modificationDate) {
+      this.modificationDate = (0, _util.isString)(modificationDate) ? modificationDate : null;
+    }
+  }, {
+    key: "setFlags",
     value: function setFlags(flags) {
       this.flags = Number.isInteger(flags) && flags > 0 ? flags : 0;
     }
   }, {
-    key: 'hasFlag',
+    key: "hasFlag",
     value: function hasFlag(flag) {
       return this._hasFlag(this.flags, flag);
     }
   }, {
-    key: 'setRectangle',
+    key: "setRectangle",
     value: function setRectangle(rectangle) {
       if (Array.isArray(rectangle) && rectangle.length === 4) {
         this.rectangle = _util.Util.normalizeRect(rectangle);
@@ -200,55 +316,69 @@ var Annotation = function () {
       }
     }
   }, {
-    key: 'setColor',
+    key: "setColor",
     value: function setColor(color) {
-      var rgbColor = new Uint8Array(3);
+      var 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;
           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;
       }
     }
   }, {
-    key: 'setBorderStyle',
+    key: "setBorderStyle",
     value: function setBorderStyle(borderStyle) {
       this.borderStyle = new AnnotationBorderStyle();
+
       if (!(0, _primitives.isDict)(borderStyle)) {
         return;
       }
+
       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.setWidth(dict.get('W'), this.rectangle);
           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]);
+          this.borderStyle.setWidth(array[2], this.rectangle);
+
           if (array.length === 4) {
             this.borderStyle.setDashArray(array[3]);
           }
@@ -258,44 +388,42 @@ var Annotation = function () {
       }
     }
   }, {
-    key: 'setAppearance',
+    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);
     }
   }, {
-    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',
+    key: "loadResources",
     value: function loadResources(keys) {
       return this.appearance.dict.getAsync('Resources').then(function (resources) {
         if (!resources) {
-          return;
+          return undefined;
         }
+
         var objectLoader = new _obj.ObjectLoader(resources, keys, resources.xref);
         return objectLoader.load().then(function () {
           return resources;
@@ -303,13 +431,14 @@ var Annotation = function () {
       });
     }
   }, {
-    key: 'getOperatorList',
+    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']);
@@ -326,25 +455,29 @@ var Annotation = function () {
           operatorList: opList
         }).then(function () {
           opList.addOp(_util.OPS.endAnnotation, []);
+
           _this.appearance.reset();
+
           return opList;
         });
       });
     }
   }, {
-    key: 'viewable',
+    key: "viewable",
     get: function get() {
       if (this.flags === 0) {
         return true;
       }
+
       return this._isViewable(this.flags);
     }
   }, {
-    key: 'printable',
+    key: "printable",
     get: function get() {
       if (this.flags === 0) {
         return false;
       }
+
       return this._isPrintable(this.flags);
     }
   }]);
@@ -352,7 +485,11 @@ var Annotation = function () {
   return Annotation;
 }();
 
-var AnnotationBorderStyle = function () {
+exports.Annotation = Annotation;
+
+var AnnotationBorderStyle =
+/*#__PURE__*/
+function () {
   function AnnotationBorderStyle() {
     _classCallCheck(this, AnnotationBorderStyle);
 
@@ -364,54 +501,98 @@ var AnnotationBorderStyle = function () {
   }
 
   _createClass(AnnotationBorderStyle, [{
-    key: 'setWidth',
+    key: "setWidth",
     value: function setWidth(width) {
+      var rect = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [0, 0, 0, 0];
+
+      if ((0, _primitives.isName)(width)) {
+        this.width = 0;
+        return;
+      }
+
       if (Number.isInteger(width)) {
+        if (width > 0) {
+          var maxWidth = (rect[2] - rect[0]) / 2;
+          var maxHeight = (rect[3] - rect[1]) / 2;
+
+          if (maxWidth > 0 && maxHeight > 0 && (width > maxWidth || width > maxHeight)) {
+            (0, _util.warn)("AnnotationBorderStyle.setWidth - ignoring width: ".concat(width));
+            width = 1;
+          }
+        }
+
         this.width = width;
       }
     }
   }, {
-    key: 'setStyle',
+    key: "setStyle",
     value: function setStyle(style) {
-      if (!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;
       }
     }
   }, {
-    key: 'setDashArray',
+    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;
+        var _iteratorNormalCompletion = true;
+        var _didIteratorError = false;
+        var _iteratorError = undefined;
+
+        try {
+          for (var _iterator = dashArray[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+            var element = _step.value;
+            var validNumber = +element >= 0;
+
+            if (!validNumber) {
+              isValid = false;
+              break;
+            } else if (element > 0) {
+              allZeros = false;
+            }
+          }
+        } catch (err) {
+          _didIteratorError = true;
+          _iteratorError = err;
+        } finally {
+          try {
+            if (!_iteratorNormalCompletion && _iterator["return"] != null) {
+              _iterator["return"]();
+            }
+          } finally {
+            if (_didIteratorError) {
+              throw _iteratorError;
+            }
           }
         }
+
         if (isValid && !allZeros) {
           this.dashArray = dashArray;
         } else {
@@ -422,14 +603,14 @@ var AnnotationBorderStyle = function () {
       }
     }
   }, {
-    key: 'setHorizontalCornerRadius',
+    key: "setHorizontalCornerRadius",
     value: function setHorizontalCornerRadius(radius) {
       if (Number.isInteger(radius)) {
         this.horizontalCornerRadius = radius;
       }
     }
   }, {
-    key: 'setVerticalCornerRadius',
+    key: "setVerticalCornerRadius",
     value: function setVerticalCornerRadius(radius) {
       if (Number.isInteger(radius)) {
         this.verticalCornerRadius = radius;
@@ -440,136 +621,247 @@ var AnnotationBorderStyle = function () {
   return AnnotationBorderStyle;
 }();
 
-var WidgetAnnotation = function (_Annotation) {
-  _inherits(WidgetAnnotation, _Annotation);
+exports.AnnotationBorderStyle = AnnotationBorderStyle;
+
+var MarkupAnnotation =
+/*#__PURE__*/
+function (_Annotation) {
+  _inherits(MarkupAnnotation, _Annotation);
+
+  function MarkupAnnotation(parameters) {
+    var _this2;
+
+    _classCallCheck(this, MarkupAnnotation);
+
+    _this2 = _possibleConstructorReturn(this, _getPrototypeOf(MarkupAnnotation).call(this, parameters));
+    var dict = parameters.dict;
+
+    if (dict.has('IRT')) {
+      var rawIRT = dict.getRaw('IRT');
+      _this2.data.inReplyTo = (0, _primitives.isRef)(rawIRT) ? rawIRT.toString() : null;
+      var rt = dict.get('RT');
+      _this2.data.replyType = (0, _primitives.isName)(rt) ? rt.name : _util.AnnotationReplyType.REPLY;
+    }
+
+    if (_this2.data.replyType === _util.AnnotationReplyType.GROUP) {
+      var parent = dict.get('IRT');
+      _this2.data.title = (0, _util.stringToPDFString)(parent.get('T') || '');
+
+      _this2.setContents(parent.get('Contents'));
+
+      _this2.data.contents = _this2.contents;
+
+      if (!parent.has('CreationDate')) {
+        _this2.data.creationDate = null;
+      } else {
+        _this2.setCreationDate(parent.get('CreationDate'));
+
+        _this2.data.creationDate = _this2.creationDate;
+      }
+
+      if (!parent.has('M')) {
+        _this2.data.modificationDate = null;
+      } else {
+        _this2.setModificationDate(parent.get('M'));
+
+        _this2.data.modificationDate = _this2.modificationDate;
+      }
+
+      _this2.data.hasPopup = parent.has('Popup');
+
+      if (!parent.has('C')) {
+        _this2.data.color = null;
+      } else {
+        _this2.setColor(parent.getArray('C'));
+
+        _this2.data.color = _this2.color;
+      }
+    } else {
+      _this2.data.title = (0, _util.stringToPDFString)(dict.get('T') || '');
+
+      _this2.setCreationDate(dict.get('CreationDate'));
+
+      _this2.data.creationDate = _this2.creationDate;
+      _this2.data.hasPopup = dict.has('Popup');
+
+      if (!dict.has('C')) {
+        _this2.data.color = null;
+      }
+    }
+
+    return _this2;
+  }
+
+  _createClass(MarkupAnnotation, [{
+    key: "setCreationDate",
+    value: function setCreationDate(creationDate) {
+      this.creationDate = (0, _util.isString)(creationDate) ? creationDate : null;
+    }
+  }]);
+
+  return MarkupAnnotation;
+}(Annotation);
+
+exports.MarkupAnnotation = MarkupAnnotation;
+
+var WidgetAnnotation =
+/*#__PURE__*/
+function (_Annotation2) {
+  _inherits(WidgetAnnotation, _Annotation2);
 
   function WidgetAnnotation(params) {
-    _classCallCheck(this, WidgetAnnotation);
+    var _this3;
 
-    var _this2 = _possibleConstructorReturn(this, (WidgetAnnotation.__proto__ || Object.getPrototypeOf(WidgetAnnotation)).call(this, params));
+    _classCallCheck(this, WidgetAnnotation);
 
+    _this3 = _possibleConstructorReturn(this, _getPrototypeOf(WidgetAnnotation).call(this, params));
     var dict = params.dict;
-    var data = _this2.data;
+    var data = _this3.data;
     data.annotationType = _util.AnnotationType.WIDGET;
-    data.fieldName = _this2._constructFieldName(dict);
-    data.fieldValue = (0, _util.getInheritableProperty)({
+    data.fieldName = _this3._constructFieldName(dict);
+    data.fieldValue = (0, _core_utils.getInheritableProperty)({
       dict: dict,
       key: 'V',
       getArray: true
     });
     data.alternativeText = (0, _util.stringToPDFString)(dict.get('TU') || '');
-    data.defaultAppearance = (0, _util.getInheritableProperty)({
+    data.defaultAppearance = (0, _core_utils.getInheritableProperty)({
       dict: dict,
       key: 'DA'
     }) || '';
-    var fieldType = (0, _util.getInheritableProperty)({
+    var fieldType = (0, _core_utils.getInheritableProperty)({
       dict: dict,
       key: 'FT'
     });
     data.fieldType = (0, _primitives.isName)(fieldType) ? fieldType.name : null;
-    _this2.fieldResources = (0, _util.getInheritableProperty)({
+    _this3.fieldResources = (0, _core_utils.getInheritableProperty)({
       dict: dict,
       key: 'DR'
     }) || _primitives.Dict.empty;
-    data.fieldFlags = (0, _util.getInheritableProperty)({
+    data.fieldFlags = (0, _core_utils.getInheritableProperty)({
       dict: dict,
       key: 'Ff'
     });
+
     if (!Number.isInteger(data.fieldFlags) || data.fieldFlags < 0) {
       data.fieldFlags = 0;
     }
-    data.readOnly = _this2.hasFieldFlag(_util.AnnotationFieldFlag.READONLY);
+
+    data.readOnly = _this3.hasFieldFlag(_util.AnnotationFieldFlag.READONLY);
+
     if (data.fieldType === 'Sig') {
-      _this2.setFlags(_util.AnnotationFlag.HIDDEN);
+      data.fieldValue = null;
+
+      _this3.setFlags(_util.AnnotationFlag.HIDDEN);
     }
-    return _this2;
+
+    return _this3;
   }
 
   _createClass(WidgetAnnotation, [{
-    key: '_constructFieldName',
+    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')));
         }
       }
+
       return fieldName.join('.');
     }
   }, {
-    key: 'hasFieldFlag',
+    key: "hasFieldFlag",
     value: function hasFieldFlag(flag) {
       return !!(this.data.fieldFlags & flag);
     }
   }, {
-    key: 'getOperatorList',
+    key: "getOperatorList",
     value: function getOperatorList(evaluator, task, renderForms) {
       if (renderForms) {
         return Promise.resolve(new _operator_list.OperatorList());
       }
-      return _get(WidgetAnnotation.prototype.__proto__ || Object.getPrototypeOf(WidgetAnnotation.prototype), 'getOperatorList', this).call(this, evaluator, task, renderForms);
+
+      return _get(_getPrototypeOf(WidgetAnnotation.prototype), "getOperatorList", this).call(this, evaluator, task, renderForms);
     }
   }]);
 
   return WidgetAnnotation;
 }(Annotation);
 
-var TextWidgetAnnotation = function (_WidgetAnnotation) {
+var TextWidgetAnnotation =
+/*#__PURE__*/
+function (_WidgetAnnotation) {
   _inherits(TextWidgetAnnotation, _WidgetAnnotation);
 
   function TextWidgetAnnotation(params) {
-    _classCallCheck(this, TextWidgetAnnotation);
+    var _this4;
 
-    var _this3 = _possibleConstructorReturn(this, (TextWidgetAnnotation.__proto__ || Object.getPrototypeOf(TextWidgetAnnotation)).call(this, params));
+    _classCallCheck(this, TextWidgetAnnotation);
 
+    _this4 = _possibleConstructorReturn(this, _getPrototypeOf(TextWidgetAnnotation).call(this, params));
     var dict = params.dict;
-    _this3.data.fieldValue = (0, _util.stringToPDFString)(_this3.data.fieldValue || '');
-    var alignment = (0, _util.getInheritableProperty)({
+    _this4.data.fieldValue = (0, _util.stringToPDFString)(_this4.data.fieldValue || '');
+    var alignment = (0, _core_utils.getInheritableProperty)({
       dict: dict,
       key: 'Q'
     });
+
     if (!Number.isInteger(alignment) || alignment < 0 || alignment > 2) {
       alignment = null;
     }
-    _this3.data.textAlignment = alignment;
-    var maximumLength = (0, _util.getInheritableProperty)({
+
+    _this4.data.textAlignment = alignment;
+    var maximumLength = (0, _core_utils.getInheritableProperty)({
       dict: 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;
+
+    _this4.data.maxLen = maximumLength;
+    _this4.data.multiLine = _this4.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE);
+    _this4.data.comb = _this4.hasFieldFlag(_util.AnnotationFieldFlag.COMB) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PASSWORD) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.FILESELECT) && _this4.data.maxLen !== null;
+    return _this4;
   }
 
   _createClass(TextWidgetAnnotation, [{
-    key: 'getOperatorList',
+    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);
+        return _get(_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,
@@ -585,71 +877,124 @@ var TextWidgetAnnotation = function (_WidgetAnnotation) {
   return TextWidgetAnnotation;
 }(WidgetAnnotation);
 
-var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
+var ButtonWidgetAnnotation =
+/*#__PURE__*/
+function (_WidgetAnnotation2) {
   _inherits(ButtonWidgetAnnotation, _WidgetAnnotation2);
 
   function ButtonWidgetAnnotation(params) {
+    var _this5;
+
     _classCallCheck(this, ButtonWidgetAnnotation);
 
-    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();
-    } else if (_this4.data.radioButton) {
-      _this4._processRadioButton(params);
-    } else if (_this4.data.pushButton) {
-      _this4._processPushButton(params);
+    _this5 = _possibleConstructorReturn(this, _getPrototypeOf(ButtonWidgetAnnotation).call(this, params));
+    _this5.data.checkBox = !_this5.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this5.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+    _this5.data.radioButton = _this5.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this5.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+    _this5.data.pushButton = _this5.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+
+    if (_this5.data.checkBox) {
+      _this5._processCheckBox(params);
+    } else if (_this5.data.radioButton) {
+      _this5._processRadioButton(params);
+    } else if (_this5.data.pushButton) {
+      _this5._processPushButton(params);
     } else {
       (0, _util.warn)('Invalid field flags for button widget annotation');
     }
-    return _this4;
+
+    return _this5;
   }
 
   _createClass(ButtonWidgetAnnotation, [{
-    key: '_processCheckBox',
-    value: function _processCheckBox() {
-      if (!(0, _primitives.isName)(this.data.fieldValue)) {
+    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;
       }
-      this.data.fieldValue = this.data.fieldValue.name;
+
+      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',
+    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;
+
+      var _iteratorNormalCompletion2 = true;
+      var _didIteratorError2 = false;
+      var _iteratorError2 = undefined;
+
+      try {
+        for (var _iterator2 = normalAppearanceState.getKeys()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+          var key = _step2.value;
+
+          if (key !== 'Off') {
+            this.data.buttonValue = key;
+            break;
+          }
+        }
+      } catch (err) {
+        _didIteratorError2 = true;
+        _iteratorError2 = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion2 && _iterator2["return"] != null) {
+            _iterator2["return"]();
+          }
+        } finally {
+          if (_didIteratorError2) {
+            throw _iteratorError2;
+          }
         }
       }
     }
   }, {
-    key: '_processPushButton',
+    key: "_processPushButton",
     value: function _processPushButton(params) {
       if (!params.dict.has('A')) {
         (0, _util.warn)('Push buttons without action dictionaries are not supported');
         return;
       }
+
       _obj.Catalog.parseDestDictionary({
         destDict: params.dict,
         resultObj: this.data,
@@ -661,312 +1006,476 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
   return ButtonWidgetAnnotation;
 }(WidgetAnnotation);
 
-var ChoiceWidgetAnnotation = function (_WidgetAnnotation3) {
+var ChoiceWidgetAnnotation =
+/*#__PURE__*/
+function (_WidgetAnnotation3) {
   _inherits(ChoiceWidgetAnnotation, _WidgetAnnotation3);
 
   function ChoiceWidgetAnnotation(params) {
-    _classCallCheck(this, ChoiceWidgetAnnotation);
+    var _this6;
 
-    var _this5 = _possibleConstructorReturn(this, (ChoiceWidgetAnnotation.__proto__ || Object.getPrototypeOf(ChoiceWidgetAnnotation)).call(this, params));
+    _classCallCheck(this, ChoiceWidgetAnnotation);
 
-    _this5.data.options = [];
-    var options = (0, _util.getInheritableProperty)({
+    _this6 = _possibleConstructorReturn(this, _getPrototypeOf(ChoiceWidgetAnnotation).call(this, params));
+    _this6.data.options = [];
+    var options = (0, _core_utils.getInheritableProperty)({
       dict: params.dict,
       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] = {
+        _this6.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];
+
+    if (!Array.isArray(_this6.data.fieldValue)) {
+      _this6.data.fieldValue = [_this6.data.fieldValue];
     }
-    _this5.data.combo = _this5.hasFieldFlag(_util.AnnotationFieldFlag.COMBO);
-    _this5.data.multiSelect = _this5.hasFieldFlag(_util.AnnotationFieldFlag.MULTISELECT);
-    return _this5;
+
+    _this6.data.combo = _this6.hasFieldFlag(_util.AnnotationFieldFlag.COMBO);
+    _this6.data.multiSelect = _this6.hasFieldFlag(_util.AnnotationFieldFlag.MULTISELECT);
+    return _this6;
   }
 
   return ChoiceWidgetAnnotation;
 }(WidgetAnnotation);
 
-var TextAnnotation = function (_Annotation2) {
-  _inherits(TextAnnotation, _Annotation2);
+var TextAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation) {
+  _inherits(TextAnnotation, _MarkupAnnotation);
 
   function TextAnnotation(parameters) {
+    var _this7;
+
     _classCallCheck(this, TextAnnotation);
 
     var DEFAULT_ICON_SIZE = 22;
+    _this7 = _possibleConstructorReturn(this, _getPrototypeOf(TextAnnotation).call(this, parameters));
+    var dict = parameters.dict;
+    _this7.data.annotationType = _util.AnnotationType.TEXT;
 
-    var _this6 = _possibleConstructorReturn(this, (TextAnnotation.__proto__ || Object.getPrototypeOf(TextAnnotation)).call(this, parameters));
+    if (_this7.data.hasAppearance) {
+      _this7.data.name = 'NoIcon';
+    } else {
+      _this7.data.rect[1] = _this7.data.rect[3] - DEFAULT_ICON_SIZE;
+      _this7.data.rect[2] = _this7.data.rect[0] + DEFAULT_ICON_SIZE;
+      _this7.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')) {
+      _this7.data.state = dict.get('State') || null;
+      _this7.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';
+      _this7.data.state = null;
+      _this7.data.stateModel = null;
     }
-    _this6._preparePopup(parameters.dict);
-    return _this6;
+
+    return _this7;
   }
 
   return TextAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var LinkAnnotation = function (_Annotation3) {
+var LinkAnnotation =
+/*#__PURE__*/
+function (_Annotation3) {
   _inherits(LinkAnnotation, _Annotation3);
 
   function LinkAnnotation(params) {
+    var _this8;
+
     _classCallCheck(this, LinkAnnotation);
 
-    var _this7 = _possibleConstructorReturn(this, (LinkAnnotation.__proto__ || Object.getPrototypeOf(LinkAnnotation)).call(this, params));
+    _this8 = _possibleConstructorReturn(this, _getPrototypeOf(LinkAnnotation).call(this, params));
+    _this8.data.annotationType = _util.AnnotationType.LINK;
+    var quadPoints = getQuadPoints(params.dict, _this8.rectangle);
+
+    if (quadPoints) {
+      _this8.data.quadPoints = quadPoints;
+    }
 
-    _this7.data.annotationType = _util.AnnotationType.LINK;
     _obj.Catalog.parseDestDictionary({
       destDict: params.dict,
-      resultObj: _this7.data,
+      resultObj: _this8.data,
       docBaseUrl: params.pdfManager.docBaseUrl
     });
-    return _this7;
+
+    return _this8;
   }
 
   return LinkAnnotation;
 }(Annotation);
 
-var PopupAnnotation = function (_Annotation4) {
+var PopupAnnotation =
+/*#__PURE__*/
+function (_Annotation4) {
   _inherits(PopupAnnotation, _Annotation4);
 
   function PopupAnnotation(parameters) {
+    var _this9;
+
     _classCallCheck(this, PopupAnnotation);
 
-    var _this8 = _possibleConstructorReturn(this, (PopupAnnotation.__proto__ || Object.getPrototypeOf(PopupAnnotation)).call(this, parameters));
+    _this9 = _possibleConstructorReturn(this, _getPrototypeOf(PopupAnnotation).call(this, parameters));
+    _this9.data.annotationType = _util.AnnotationType.POPUP;
+    var 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);
+      return _possibleConstructorReturn(_this9);
     }
+
     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') || '');
+    _this9.data.parentType = (0, _primitives.isName)(parentSubtype) ? parentSubtype.name : null;
+    var rawParent = parameters.dict.getRaw('Parent');
+    _this9.data.parentId = (0, _primitives.isRef)(rawParent) ? rawParent.toString() : null;
+    var rt = parentItem.get('RT');
+
+    if ((0, _primitives.isName)(rt, _util.AnnotationReplyType.GROUP)) {
+      parentItem = parentItem.get('IRT');
+    }
+
+    if (!parentItem.has('M')) {
+      _this9.data.modificationDate = null;
+    } else {
+      _this9.setModificationDate(parentItem.get('M'));
+
+      _this9.data.modificationDate = _this9.modificationDate;
+    }
+
     if (!parentItem.has('C')) {
-      _this8.data.color = null;
+      _this9.data.color = null;
     } else {
-      _this8.setColor(parentItem.getArray('C'));
-      _this8.data.color = _this8.color;
+      _this9.setColor(parentItem.getArray('C'));
+
+      _this9.data.color = _this9.color;
     }
-    if (!_this8.viewable) {
+
+    if (!_this9.viewable) {
       var parentFlags = parentItem.get('F');
-      if (_this8._isViewable(parentFlags)) {
-        _this8.setFlags(parentFlags);
+
+      if (_this9._isViewable(parentFlags)) {
+        _this9.setFlags(parentFlags);
       }
     }
-    return _this8;
+
+    _this9.data.title = (0, _util.stringToPDFString)(parentItem.get('T') || '');
+    _this9.data.contents = (0, _util.stringToPDFString)(parentItem.get('Contents') || '');
+    return _this9;
   }
 
   return PopupAnnotation;
 }(Annotation);
 
-var LineAnnotation = function (_Annotation5) {
-  _inherits(LineAnnotation, _Annotation5);
+var FreeTextAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation2) {
+  _inherits(FreeTextAnnotation, _MarkupAnnotation2);
+
+  function FreeTextAnnotation(parameters) {
+    var _this10;
+
+    _classCallCheck(this, FreeTextAnnotation);
+
+    _this10 = _possibleConstructorReturn(this, _getPrototypeOf(FreeTextAnnotation).call(this, parameters));
+    _this10.data.annotationType = _util.AnnotationType.FREETEXT;
+    return _this10;
+  }
+
+  return FreeTextAnnotation;
+}(MarkupAnnotation);
+
+var LineAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation3) {
+  _inherits(LineAnnotation, _MarkupAnnotation3);
 
   function LineAnnotation(parameters) {
-    _classCallCheck(this, LineAnnotation);
+    var _this11;
 
-    var _this9 = _possibleConstructorReturn(this, (LineAnnotation.__proto__ || Object.getPrototypeOf(LineAnnotation)).call(this, parameters));
+    _classCallCheck(this, LineAnnotation);
 
-    _this9.data.annotationType = _util.AnnotationType.LINE;
-    var dict = parameters.dict;
-    _this9.data.lineCoordinates = _util.Util.normalizeRect(dict.getArray('L'));
-    _this9._preparePopup(dict);
-    return _this9;
+    _this11 = _possibleConstructorReturn(this, _getPrototypeOf(LineAnnotation).call(this, parameters));
+    _this11.data.annotationType = _util.AnnotationType.LINE;
+    _this11.data.lineCoordinates = _util.Util.normalizeRect(parameters.dict.getArray('L'));
+    return _this11;
   }
 
   return LineAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var SquareAnnotation = function (_Annotation6) {
-  _inherits(SquareAnnotation, _Annotation6);
+var SquareAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation4) {
+  _inherits(SquareAnnotation, _MarkupAnnotation4);
 
   function SquareAnnotation(parameters) {
-    _classCallCheck(this, SquareAnnotation);
+    var _this12;
 
-    var _this10 = _possibleConstructorReturn(this, (SquareAnnotation.__proto__ || Object.getPrototypeOf(SquareAnnotation)).call(this, parameters));
+    _classCallCheck(this, SquareAnnotation);
 
-    _this10.data.annotationType = _util.AnnotationType.SQUARE;
-    _this10._preparePopup(parameters.dict);
-    return _this10;
+    _this12 = _possibleConstructorReturn(this, _getPrototypeOf(SquareAnnotation).call(this, parameters));
+    _this12.data.annotationType = _util.AnnotationType.SQUARE;
+    return _this12;
   }
 
   return SquareAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var CircleAnnotation = function (_Annotation7) {
-  _inherits(CircleAnnotation, _Annotation7);
+var CircleAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation5) {
+  _inherits(CircleAnnotation, _MarkupAnnotation5);
 
   function CircleAnnotation(parameters) {
-    _classCallCheck(this, CircleAnnotation);
+    var _this13;
 
-    var _this11 = _possibleConstructorReturn(this, (CircleAnnotation.__proto__ || Object.getPrototypeOf(CircleAnnotation)).call(this, parameters));
+    _classCallCheck(this, CircleAnnotation);
 
-    _this11.data.annotationType = _util.AnnotationType.CIRCLE;
-    _this11._preparePopup(parameters.dict);
-    return _this11;
+    _this13 = _possibleConstructorReturn(this, _getPrototypeOf(CircleAnnotation).call(this, parameters));
+    _this13.data.annotationType = _util.AnnotationType.CIRCLE;
+    return _this13;
   }
 
   return CircleAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var PolylineAnnotation = function (_Annotation8) {
-  _inherits(PolylineAnnotation, _Annotation8);
+var PolylineAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation6) {
+  _inherits(PolylineAnnotation, _MarkupAnnotation6);
 
   function PolylineAnnotation(parameters) {
+    var _this14;
+
     _classCallCheck(this, PolylineAnnotation);
 
-    var _this12 = _possibleConstructorReturn(this, (PolylineAnnotation.__proto__ || Object.getPrototypeOf(PolylineAnnotation)).call(this, parameters));
+    _this14 = _possibleConstructorReturn(this, _getPrototypeOf(PolylineAnnotation).call(this, parameters));
+    _this14.data.annotationType = _util.AnnotationType.POLYLINE;
+    var rawVertices = parameters.dict.getArray('Vertices');
+    _this14.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({
+      _this14.data.vertices.push({
         x: rawVertices[i],
         y: rawVertices[i + 1]
       });
     }
-    _this12._preparePopup(dict);
-    return _this12;
+
+    return _this14;
   }
 
   return PolylineAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var PolygonAnnotation = function (_PolylineAnnotation) {
+var PolygonAnnotation =
+/*#__PURE__*/
+function (_PolylineAnnotation) {
   _inherits(PolygonAnnotation, _PolylineAnnotation);
 
   function PolygonAnnotation(parameters) {
-    _classCallCheck(this, PolygonAnnotation);
+    var _this15;
 
-    var _this13 = _possibleConstructorReturn(this, (PolygonAnnotation.__proto__ || Object.getPrototypeOf(PolygonAnnotation)).call(this, parameters));
+    _classCallCheck(this, PolygonAnnotation);
 
-    _this13.data.annotationType = _util.AnnotationType.POLYGON;
-    return _this13;
+    _this15 = _possibleConstructorReturn(this, _getPrototypeOf(PolygonAnnotation).call(this, parameters));
+    _this15.data.annotationType = _util.AnnotationType.POLYGON;
+    return _this15;
   }
 
   return PolygonAnnotation;
 }(PolylineAnnotation);
 
-var HighlightAnnotation = function (_Annotation9) {
-  _inherits(HighlightAnnotation, _Annotation9);
+var CaretAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation7) {
+  _inherits(CaretAnnotation, _MarkupAnnotation7);
+
+  function CaretAnnotation(parameters) {
+    var _this16;
+
+    _classCallCheck(this, CaretAnnotation);
+
+    _this16 = _possibleConstructorReturn(this, _getPrototypeOf(CaretAnnotation).call(this, parameters));
+    _this16.data.annotationType = _util.AnnotationType.CARET;
+    return _this16;
+  }
+
+  return CaretAnnotation;
+}(MarkupAnnotation);
+
+var InkAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation8) {
+  _inherits(InkAnnotation, _MarkupAnnotation8);
+
+  function InkAnnotation(parameters) {
+    var _this17;
+
+    _classCallCheck(this, InkAnnotation);
+
+    _this17 = _possibleConstructorReturn(this, _getPrototypeOf(InkAnnotation).call(this, parameters));
+    _this17.data.annotationType = _util.AnnotationType.INK;
+    var xref = parameters.xref;
+    var originalInkLists = parameters.dict.getArray('InkList');
+    _this17.data.inkLists = [];
+
+    for (var i = 0, ii = originalInkLists.length; i < ii; ++i) {
+      _this17.data.inkLists.push([]);
+
+      for (var j = 0, jj = originalInkLists[i].length; j < jj; j += 2) {
+        _this17.data.inkLists[i].push({
+          x: xref.fetchIfRef(originalInkLists[i][j]),
+          y: xref.fetchIfRef(originalInkLists[i][j + 1])
+        });
+      }
+    }
+
+    return _this17;
+  }
+
+  return InkAnnotation;
+}(MarkupAnnotation);
+
+var HighlightAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation9) {
+  _inherits(HighlightAnnotation, _MarkupAnnotation9);
 
   function HighlightAnnotation(parameters) {
+    var _this18;
+
     _classCallCheck(this, HighlightAnnotation);
 
-    var _this14 = _possibleConstructorReturn(this, (HighlightAnnotation.__proto__ || Object.getPrototypeOf(HighlightAnnotation)).call(this, parameters));
+    _this18 = _possibleConstructorReturn(this, _getPrototypeOf(HighlightAnnotation).call(this, parameters));
+    _this18.data.annotationType = _util.AnnotationType.HIGHLIGHT;
+    var quadPoints = getQuadPoints(parameters.dict, _this18.rectangle);
 
-    _this14.data.annotationType = _util.AnnotationType.HIGHLIGHT;
-    _this14._preparePopup(parameters.dict);
-    return _this14;
+    if (quadPoints) {
+      _this18.data.quadPoints = quadPoints;
+    }
+
+    return _this18;
   }
 
   return HighlightAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var UnderlineAnnotation = function (_Annotation10) {
-  _inherits(UnderlineAnnotation, _Annotation10);
+var UnderlineAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation10) {
+  _inherits(UnderlineAnnotation, _MarkupAnnotation10);
 
   function UnderlineAnnotation(parameters) {
+    var _this19;
+
     _classCallCheck(this, UnderlineAnnotation);
 
-    var _this15 = _possibleConstructorReturn(this, (UnderlineAnnotation.__proto__ || Object.getPrototypeOf(UnderlineAnnotation)).call(this, parameters));
+    _this19 = _possibleConstructorReturn(this, _getPrototypeOf(UnderlineAnnotation).call(this, parameters));
+    _this19.data.annotationType = _util.AnnotationType.UNDERLINE;
+    var quadPoints = getQuadPoints(parameters.dict, _this19.rectangle);
 
-    _this15.data.annotationType = _util.AnnotationType.UNDERLINE;
-    _this15._preparePopup(parameters.dict);
-    return _this15;
+    if (quadPoints) {
+      _this19.data.quadPoints = quadPoints;
+    }
+
+    return _this19;
   }
 
   return UnderlineAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var SquigglyAnnotation = function (_Annotation11) {
-  _inherits(SquigglyAnnotation, _Annotation11);
+var SquigglyAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation11) {
+  _inherits(SquigglyAnnotation, _MarkupAnnotation11);
 
   function SquigglyAnnotation(parameters) {
+    var _this20;
+
     _classCallCheck(this, SquigglyAnnotation);
 
-    var _this16 = _possibleConstructorReturn(this, (SquigglyAnnotation.__proto__ || Object.getPrototypeOf(SquigglyAnnotation)).call(this, parameters));
+    _this20 = _possibleConstructorReturn(this, _getPrototypeOf(SquigglyAnnotation).call(this, parameters));
+    _this20.data.annotationType = _util.AnnotationType.SQUIGGLY;
+    var quadPoints = getQuadPoints(parameters.dict, _this20.rectangle);
 
-    _this16.data.annotationType = _util.AnnotationType.SQUIGGLY;
-    _this16._preparePopup(parameters.dict);
-    return _this16;
+    if (quadPoints) {
+      _this20.data.quadPoints = quadPoints;
+    }
+
+    return _this20;
   }
 
   return SquigglyAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var StrikeOutAnnotation = function (_Annotation12) {
-  _inherits(StrikeOutAnnotation, _Annotation12);
+var StrikeOutAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation12) {
+  _inherits(StrikeOutAnnotation, _MarkupAnnotation12);
 
   function StrikeOutAnnotation(parameters) {
+    var _this21;
+
     _classCallCheck(this, StrikeOutAnnotation);
 
-    var _this17 = _possibleConstructorReturn(this, (StrikeOutAnnotation.__proto__ || Object.getPrototypeOf(StrikeOutAnnotation)).call(this, parameters));
+    _this21 = _possibleConstructorReturn(this, _getPrototypeOf(StrikeOutAnnotation).call(this, parameters));
+    _this21.data.annotationType = _util.AnnotationType.STRIKEOUT;
+    var quadPoints = getQuadPoints(parameters.dict, _this21.rectangle);
 
-    _this17.data.annotationType = _util.AnnotationType.STRIKEOUT;
-    _this17._preparePopup(parameters.dict);
-    return _this17;
+    if (quadPoints) {
+      _this21.data.quadPoints = quadPoints;
+    }
+
+    return _this21;
   }
 
   return StrikeOutAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var StampAnnotation = function (_Annotation13) {
-  _inherits(StampAnnotation, _Annotation13);
+var StampAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation13) {
+  _inherits(StampAnnotation, _MarkupAnnotation13);
 
   function StampAnnotation(parameters) {
-    _classCallCheck(this, StampAnnotation);
+    var _this22;
 
-    var _this18 = _possibleConstructorReturn(this, (StampAnnotation.__proto__ || Object.getPrototypeOf(StampAnnotation)).call(this, parameters));
+    _classCallCheck(this, StampAnnotation);
 
-    _this18.data.annotationType = _util.AnnotationType.STAMP;
-    _this18._preparePopup(parameters.dict);
-    return _this18;
+    _this22 = _possibleConstructorReturn(this, _getPrototypeOf(StampAnnotation).call(this, parameters));
+    _this22.data.annotationType = _util.AnnotationType.STAMP;
+    return _this22;
   }
 
   return StampAnnotation;
-}(Annotation);
+}(MarkupAnnotation);
 
-var FileAttachmentAnnotation = function (_Annotation14) {
-  _inherits(FileAttachmentAnnotation, _Annotation14);
+var FileAttachmentAnnotation =
+/*#__PURE__*/
+function (_MarkupAnnotation14) {
+  _inherits(FileAttachmentAnnotation, _MarkupAnnotation14);
 
   function FileAttachmentAnnotation(parameters) {
-    _classCallCheck(this, FileAttachmentAnnotation);
+    var _this23;
 
-    var _this19 = _possibleConstructorReturn(this, (FileAttachmentAnnotation.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotation)).call(this, parameters));
+    _classCallCheck(this, FileAttachmentAnnotation);
 
+    _this23 = _possibleConstructorReturn(this, _getPrototypeOf(FileAttachmentAnnotation).call(this, parameters));
     var file = new _obj.FileSpec(parameters.dict.get('FS'), parameters.xref);
-    _this19.data.annotationType = _util.AnnotationType.FILEATTACHMENT;
-    _this19.data.file = file.serializable;
-    _this19._preparePopup(parameters.dict);
-    return _this19;
+    _this23.data.annotationType = _util.AnnotationType.FILEATTACHMENT;
+    _this23.data.file = file.serializable;
+    return _this23;
   }
 
   return FileAttachmentAnnotation;
-}(Annotation);
-
-exports.Annotation = Annotation;
-exports.AnnotationBorderStyle = AnnotationBorderStyle;
-exports.AnnotationFactory = AnnotationFactory;
+}(MarkupAnnotation);