pdfjs-dist 2.0.489 → 2.2.228

package/lib/core/evaluator.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,50 +19,62 @@
  * @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.PartialEvaluator = undefined;
+exports.PartialEvaluator = void 0;
 
-var _util = require('../shared/util');
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _cmap = require('./cmap');
+var _util = require("../shared/util");
 
-var _stream = require('./stream');
+var _cmap = require("./cmap");
 
-var _primitives = require('./primitives');
+var _primitives = require("./primitives");
 
-var _fonts = require('./fonts');
+var _fonts = require("./fonts");
 
-var _encodings = require('./encodings');
+var _encodings = require("./encodings");
 
-var _unicode = require('./unicode');
+var _unicode = require("./unicode");
 
-var _standard_fonts = require('./standard_fonts');
+var _standard_fonts = require("./standard_fonts");
 
-var _pattern = require('./pattern');
+var _pattern = require("./pattern");
 
-var _parser = require('./parser');
+var _parser = require("./parser");
 
-var _bidi = require('./bidi');
+var _bidi = require("./bidi");
 
-var _colorspace = require('./colorspace');
+var _colorspace = require("./colorspace");
 
-var _glyphlist = require('./glyphlist');
+var _stream = require("./stream");
 
-var _metrics = require('./metrics');
+var _glyphlist = require("./glyphlist");
 
-var _function = require('./function');
+var _core_utils = require("./core_utils");
 
-var _jpeg_stream = require('./jpeg_stream');
+var _metrics = require("./metrics");
 
-var _murmurhash = require('./murmurhash3');
+var _function = require("./function");
 
-var _operator_list = require('./operator_list');
+var _jpeg_stream = require("./jpeg_stream");
 
-var _image = require('./image');
+var _murmurhash = require("./murmurhash3");
+
+var _image_utils = require("./image_utils");
+
+var _operator_list = require("./operator_list");
+
+var _image = require("./image");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 var PartialEvaluator = function PartialEvaluatorClosure() {
   var DefaultPartialEvaluatorOptions = {
@@ -73,68 +85,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
     ignoreErrors: false,
     isEvalSupported: true
   };
-  function NativeImageDecoder(_ref) {
-    var xref = _ref.xref,
-        resources = _ref.resources,
-        handler = _ref.handler,
-        _ref$forceDataSchema = _ref.forceDataSchema,
-        forceDataSchema = _ref$forceDataSchema === undefined ? false : _ref$forceDataSchema,
-        pdfFunctionFactory = _ref.pdfFunctionFactory;
 
-    this.xref = xref;
-    this.resources = resources;
-    this.handler = handler;
-    this.forceDataSchema = forceDataSchema;
-    this.pdfFunctionFactory = pdfFunctionFactory;
-  }
-  NativeImageDecoder.prototype = {
-    canDecode: function canDecode(image) {
-      return image instanceof _jpeg_stream.JpegStream && NativeImageDecoder.isDecodable(image, this.xref, this.resources, this.pdfFunctionFactory);
-    },
-    decode: function decode(image) {
-      var dict = image.dict;
-      var colorSpace = dict.get('ColorSpace', 'CS');
-      colorSpace = _colorspace.ColorSpace.parse(colorSpace, this.xref, this.resources, this.pdfFunctionFactory);
-      return this.handler.sendWithPromise('JpegDecode', [image.getIR(this.forceDataSchema), colorSpace.numComps]).then(function (_ref2) {
-        var data = _ref2.data,
-            width = _ref2.width,
-            height = _ref2.height;
-
-        return new _stream.Stream(data, 0, data.length, image.dict);
-      });
-    }
-  };
-  NativeImageDecoder.isSupported = function (image, xref, res, pdfFunctionFactory) {
-    var dict = image.dict;
-    if (dict.has('DecodeParms') || dict.has('DP')) {
-      return false;
-    }
-    var cs = _colorspace.ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res, pdfFunctionFactory);
-    return (cs.name === 'DeviceGray' || cs.name === 'DeviceRGB') && cs.isDefaultDecode(dict.getArray('Decode', 'D'));
-  };
-  NativeImageDecoder.isDecodable = function (image, xref, res, pdfFunctionFactory) {
-    var dict = image.dict;
-    if (dict.has('DecodeParms') || dict.has('DP')) {
-      return false;
-    }
-    var cs = _colorspace.ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res, pdfFunctionFactory);
-    return (cs.numComps === 1 || cs.numComps === 3) && cs.isDefaultDecode(dict.getArray('Decode', 'D'));
-  };
-  function PartialEvaluator(_ref3) {
+  function PartialEvaluator(_ref) {
     var _this = this;
 
-    var pdfManager = _ref3.pdfManager,
-        xref = _ref3.xref,
-        handler = _ref3.handler,
-        pageIndex = _ref3.pageIndex,
-        idFactory = _ref3.idFactory,
-        fontCache = _ref3.fontCache,
-        builtInCMapCache = _ref3.builtInCMapCache,
-        _ref3$options = _ref3.options,
-        options = _ref3$options === undefined ? null : _ref3$options,
-        pdfFunctionFactory = _ref3.pdfFunctionFactory;
-
-    this.pdfManager = pdfManager;
+    var xref = _ref.xref,
+        handler = _ref.handler,
+        pageIndex = _ref.pageIndex,
+        idFactory = _ref.idFactory,
+        fontCache = _ref.fontCache,
+        builtInCMapCache = _ref.builtInCMapCache,
+        _ref$options = _ref.options,
+        options = _ref$options === void 0 ? null : _ref$options,
+        pdfFunctionFactory = _ref.pdfFunctionFactory;
     this.xref = xref;
     this.handler = handler;
     this.pageIndex = pageIndex;
@@ -143,29 +106,68 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
     this.builtInCMapCache = builtInCMapCache;
     this.options = options || DefaultPartialEvaluatorOptions;
     this.pdfFunctionFactory = pdfFunctionFactory;
-    this.fetchBuiltInCMap = function (name) {
-      var cachedCMap = _this.builtInCMapCache[name];
-      if (cachedCMap) {
-        return Promise.resolve(cachedCMap);
-      }
-      return _this.handler.sendWithPromise('FetchBuiltInCMap', { name: name }).then(function (data) {
-        if (data.compressionType !== _util.CMapCompressionType.NONE) {
-          _this.builtInCMapCache[name] = data;
-        }
-        return data;
-      });
-    };
+    this.parsingType3Font = false;
+
+    this.fetchBuiltInCMap =
+    /*#__PURE__*/
+    function () {
+      var _ref2 = _asyncToGenerator(
+      /*#__PURE__*/
+      _regenerator["default"].mark(function _callee(name) {
+        var data;
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!_this.builtInCMapCache.has(name)) {
+                  _context.next = 2;
+                  break;
+                }
+
+                return _context.abrupt("return", _this.builtInCMapCache.get(name));
+
+              case 2:
+                _context.next = 4;
+                return _this.handler.sendWithPromise('FetchBuiltInCMap', {
+                  name: name
+                });
+
+              case 4:
+                data = _context.sent;
+
+                if (data.compressionType !== _util.CMapCompressionType.NONE) {
+                  _this.builtInCMapCache.set(name, data);
+                }
+
+                return _context.abrupt("return", data);
+
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }();
   }
+
   var TIME_SLOT_DURATION_MS = 20;
   var CHECK_TIME_EVERY = 100;
+
   function TimeSlotManager() {
     this.reset();
   }
+
   TimeSlotManager.prototype = {
     check: function TimeSlotManager_check() {
       if (++this.checked < CHECK_TIME_EVERY) {
         return false;
       }
+
       this.checked = 0;
       return this.endTime <= Date.now();
     },
@@ -174,124 +176,169 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       this.checked = 0;
     }
   };
+
   function normalizeBlendMode(value) {
     if (!(0, _primitives.isName)(value)) {
       return 'source-over';
     }
+
     switch (value.name) {
       case 'Normal':
       case 'Compatible':
         return 'source-over';
+
       case 'Multiply':
         return 'multiply';
+
       case 'Screen':
         return 'screen';
+
       case 'Overlay':
         return 'overlay';
+
       case 'Darken':
         return 'darken';
+
       case 'Lighten':
         return 'lighten';
+
       case 'ColorDodge':
         return 'color-dodge';
+
       case 'ColorBurn':
         return 'color-burn';
+
       case 'HardLight':
         return 'hard-light';
+
       case 'SoftLight':
         return 'soft-light';
+
       case 'Difference':
         return 'difference';
+
       case 'Exclusion':
         return 'exclusion';
+
       case 'Hue':
         return 'hue';
+
       case 'Saturation':
         return 'saturation';
+
       case 'Color':
         return 'color';
+
       case 'Luminosity':
         return 'luminosity';
     }
+
     (0, _util.warn)('Unsupported blend mode: ' + value.name);
     return 'source-over';
   }
+
   var deferred = Promise.resolve();
   var TILING_PATTERN = 1,
       SHADING_PATTERN = 2;
   PartialEvaluator.prototype = {
     clone: function clone() {
       var newOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DefaultPartialEvaluatorOptions;
-
       var newEvaluator = Object.create(this);
       newEvaluator.options = newOptions;
       return newEvaluator;
     },
-
     hasBlendModes: function PartialEvaluator_hasBlendModes(resources) {
       if (!(0, _primitives.isDict)(resources)) {
         return false;
       }
+
       var processed = Object.create(null);
+
       if (resources.objId) {
         processed[resources.objId] = true;
       }
+
       var nodes = [resources],
           xref = this.xref;
+
       while (nodes.length) {
         var key, i, ii;
         var node = nodes.shift();
         var graphicStates = node.get('ExtGState');
+
         if ((0, _primitives.isDict)(graphicStates)) {
           var graphicStatesKeys = graphicStates.getKeys();
+
           for (i = 0, ii = graphicStatesKeys.length; i < ii; i++) {
             key = graphicStatesKeys[i];
             var graphicState = graphicStates.get(key);
             var bm = graphicState.get('BM');
+
             if ((0, _primitives.isName)(bm) && bm.name !== 'Normal') {
               return true;
             }
           }
         }
+
         var xObjects = node.get('XObject');
+
         if (!(0, _primitives.isDict)(xObjects)) {
           continue;
         }
+
         var xObjectsKeys = xObjects.getKeys();
+
         for (i = 0, ii = xObjectsKeys.length; i < ii; i++) {
           key = xObjectsKeys[i];
           var xObject = xObjects.getRaw(key);
+
           if ((0, _primitives.isRef)(xObject)) {
             if (processed[xObject.toString()]) {
               continue;
             }
+
             xObject = xref.fetch(xObject);
           }
+
           if (!(0, _primitives.isStream)(xObject)) {
             continue;
           }
+
           if (xObject.dict.objId) {
             if (processed[xObject.dict.objId]) {
               continue;
             }
+
             processed[xObject.dict.objId] = true;
           }
+
           var xResources = xObject.dict.get('Resources');
+
           if ((0, _primitives.isDict)(xResources) && (!xResources.objId || !processed[xResources.objId])) {
             nodes.push(xResources);
+
             if (xResources.objId) {
               processed[xResources.objId] = true;
             }
           }
         }
       }
+
       return false;
     },
     buildFormXObject: function PartialEvaluator_buildFormXObject(resources, xobj, smask, operatorList, task, initialState) {
       var dict = xobj.dict;
       var matrix = dict.getArray('Matrix');
       var bbox = dict.getArray('BBox');
+
+      if (Array.isArray(bbox) && bbox.length === 4) {
+        bbox = _util.Util.normalizeRect(bbox);
+      } else {
+        bbox = null;
+      }
+
       var group = dict.get('Group');
+
       if (group) {
         var groupOptions = {
           matrix: matrix,
@@ -302,19 +349,24 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         };
         var groupSubtype = group.get('S');
         var colorSpace = null;
+
         if ((0, _primitives.isName)(groupSubtype, 'Transparency')) {
           groupOptions.isolated = group.get('I') || false;
           groupOptions.knockout = group.get('K') || false;
+
           if (group.has('CS')) {
             colorSpace = _colorspace.ColorSpace.parse(group.get('CS'), this.xref, resources, this.pdfFunctionFactory);
           }
         }
+
         if (smask && smask.backdrop) {
           colorSpace = colorSpace || _colorspace.ColorSpace.singletons.rgb;
           smask.backdrop = colorSpace.getRgb(smask.backdrop, 0);
         }
+
         operatorList.addOp(_util.OPS.beginGroup, [groupOptions]);
       }
+
       operatorList.addOp(_util.OPS.paintFormXObjectBegin, [matrix, bbox]);
       return this.getOperatorList({
         stream: xobj,
@@ -324,140 +376,219 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         initialState: initialState
       }).then(function () {
         operatorList.addOp(_util.OPS.paintFormXObjectEnd, []);
+
         if (group) {
           operatorList.addOp(_util.OPS.endGroup, [groupOptions]);
         }
       });
     },
-    buildPaintImageXObject: function buildPaintImageXObject(_ref4) {
-      var _this2 = this;
+    buildPaintImageXObject: function () {
+      var _buildPaintImageXObject = _asyncToGenerator(
+      /*#__PURE__*/
+      _regenerator["default"].mark(function _callee2(_ref3) {
+        var _this2 = this;
 
-      var resources = _ref4.resources,
-          image = _ref4.image,
-          _ref4$isInline = _ref4.isInline,
-          isInline = _ref4$isInline === undefined ? false : _ref4$isInline,
-          operatorList = _ref4.operatorList,
-          cacheKey = _ref4.cacheKey,
-          imageCache = _ref4.imageCache,
-          _ref4$forceDisableNat = _ref4.forceDisableNativeImageDecoder,
-          forceDisableNativeImageDecoder = _ref4$forceDisableNat === undefined ? false : _ref4$forceDisableNat;
-
-      var dict = image.dict;
-      var w = dict.get('Width', 'W');
-      var h = dict.get('Height', 'H');
-      if (!(w && (0, _util.isNum)(w)) || !(h && (0, _util.isNum)(h))) {
-        (0, _util.warn)('Image dimensions are missing, or not numbers.');
-        return Promise.resolve();
-      }
-      var maxImageSize = this.options.maxImageSize;
-      if (maxImageSize !== -1 && w * h > maxImageSize) {
-        (0, _util.warn)('Image exceeded maximum allowed size and was removed.');
-        return Promise.resolve();
-      }
-      var imageMask = dict.get('ImageMask', 'IM') || false;
-      var imgData, args;
-      if (imageMask) {
-        var width = dict.get('Width', 'W');
-        var height = dict.get('Height', 'H');
-        var bitStrideLength = width + 7 >> 3;
-        var imgArray = image.getBytes(bitStrideLength * height);
-        var decode = dict.getArray('Decode', 'D');
-        imgData = _image.PDFImage.createMask({
-          imgArray: imgArray,
-          width: width,
-          height: height,
-          imageIsFromDecodeStream: image instanceof _stream.DecodeStream,
-          inverseDecode: !!decode && decode[0] > 0
-        });
-        imgData.cached = true;
-        args = [imgData];
-        operatorList.addOp(_util.OPS.paintImageMaskXObject, args);
-        if (cacheKey) {
-          imageCache[cacheKey] = {
-            fn: _util.OPS.paintImageMaskXObject,
-            args: args
-          };
-        }
-        return Promise.resolve();
-      }
-      var softMask = dict.get('SMask', 'SM') || false;
-      var mask = dict.get('Mask') || false;
-      var SMALL_IMAGE_DIMENSIONS = 200;
-      if (isInline && !softMask && !mask && !(image instanceof _jpeg_stream.JpegStream) && w + h < SMALL_IMAGE_DIMENSIONS) {
-        var imageObj = new _image.PDFImage({
-          xref: this.xref,
-          res: resources,
-          image: image,
-          isInline: isInline,
-          pdfFunctionFactory: this.pdfFunctionFactory
-        });
-        imgData = imageObj.createImageData(true);
-        operatorList.addOp(_util.OPS.paintInlineImageXObject, [imgData]);
-        return Promise.resolve();
-      }
-      var nativeImageDecoderSupport = forceDisableNativeImageDecoder ? _util.NativeImageDecoding.NONE : this.options.nativeImageDecoderSupport;
-      var objId = 'img_' + this.idFactory.createObjId();
-      if (nativeImageDecoderSupport !== _util.NativeImageDecoding.NONE && !softMask && !mask && image instanceof _jpeg_stream.JpegStream && NativeImageDecoder.isSupported(image, this.xref, resources, this.pdfFunctionFactory)) {
-        return this.handler.sendWithPromise('obj', [objId, this.pageIndex, 'JpegStream', image.getIR(this.options.forceDataSchema)]).then(function () {
-          operatorList.addDependency(objId);
-          args = [objId, w, h];
-          operatorList.addOp(_util.OPS.paintJpegXObject, args);
-          if (cacheKey) {
-            imageCache[cacheKey] = {
-              fn: _util.OPS.paintJpegXObject,
-              args: args
-            };
+        var resources, image, _ref3$isInline, isInline, operatorList, cacheKey, imageCache, _ref3$forceDisableNat, forceDisableNativeImageDecoder, dict, w, h, maxImageSize, imageMask, imgData, args, width, height, bitStrideLength, imgArray, decode, softMask, mask, SMALL_IMAGE_DIMENSIONS, imageObj, nativeImageDecoderSupport, objId, nativeImageDecoder, imgPromise;
+
+        return _regenerator["default"].wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                resources = _ref3.resources, image = _ref3.image, _ref3$isInline = _ref3.isInline, isInline = _ref3$isInline === void 0 ? false : _ref3$isInline, operatorList = _ref3.operatorList, cacheKey = _ref3.cacheKey, imageCache = _ref3.imageCache, _ref3$forceDisableNat = _ref3.forceDisableNativeImageDecoder, forceDisableNativeImageDecoder = _ref3$forceDisableNat === void 0 ? false : _ref3$forceDisableNat;
+                dict = image.dict;
+                w = dict.get('Width', 'W');
+                h = dict.get('Height', 'H');
+
+                if (!(!(w && (0, _util.isNum)(w)) || !(h && (0, _util.isNum)(h)))) {
+                  _context2.next = 7;
+                  break;
+                }
+
+                (0, _util.warn)('Image dimensions are missing, or not numbers.');
+                return _context2.abrupt("return", undefined);
+
+              case 7:
+                maxImageSize = this.options.maxImageSize;
+
+                if (!(maxImageSize !== -1 && w * h > maxImageSize)) {
+                  _context2.next = 11;
+                  break;
+                }
+
+                (0, _util.warn)('Image exceeded maximum allowed size and was removed.');
+                return _context2.abrupt("return", undefined);
+
+              case 11:
+                imageMask = dict.get('ImageMask', 'IM') || false;
+
+                if (!imageMask) {
+                  _context2.next = 24;
+                  break;
+                }
+
+                width = dict.get('Width', 'W');
+                height = dict.get('Height', 'H');
+                bitStrideLength = width + 7 >> 3;
+                imgArray = image.getBytes(bitStrideLength * height, true);
+                decode = dict.getArray('Decode', 'D');
+                imgData = _image.PDFImage.createMask({
+                  imgArray: imgArray,
+                  width: width,
+                  height: height,
+                  imageIsFromDecodeStream: image instanceof _stream.DecodeStream,
+                  inverseDecode: !!decode && decode[0] > 0
+                });
+                imgData.cached = !!cacheKey;
+                args = [imgData];
+                operatorList.addOp(_util.OPS.paintImageMaskXObject, args);
+
+                if (cacheKey) {
+                  imageCache[cacheKey] = {
+                    fn: _util.OPS.paintImageMaskXObject,
+                    args: args
+                  };
+                }
+
+                return _context2.abrupt("return", undefined);
+
+              case 24:
+                softMask = dict.get('SMask', 'SM') || false;
+                mask = dict.get('Mask') || false;
+                SMALL_IMAGE_DIMENSIONS = 200;
+
+                if (!(isInline && !softMask && !mask && !(image instanceof _jpeg_stream.JpegStream) && w + h < SMALL_IMAGE_DIMENSIONS)) {
+                  _context2.next = 32;
+                  break;
+                }
+
+                imageObj = new _image.PDFImage({
+                  xref: this.xref,
+                  res: resources,
+                  image: image,
+                  isInline: isInline,
+                  pdfFunctionFactory: this.pdfFunctionFactory
+                });
+                imgData = imageObj.createImageData(true);
+                operatorList.addOp(_util.OPS.paintInlineImageXObject, [imgData]);
+                return _context2.abrupt("return", undefined);
+
+              case 32:
+                nativeImageDecoderSupport = forceDisableNativeImageDecoder ? _util.NativeImageDecoding.NONE : this.options.nativeImageDecoderSupport;
+                objId = "img_".concat(this.idFactory.createObjId());
+
+                if (this.parsingType3Font) {
+                  (0, _util.assert)(nativeImageDecoderSupport === _util.NativeImageDecoding.NONE, 'Type3 image resources should be completely decoded in the worker.');
+                  objId = "".concat(this.idFactory.getDocId(), "_type3res_").concat(objId);
+                }
+
+                if (!(nativeImageDecoderSupport !== _util.NativeImageDecoding.NONE && !softMask && !mask && image instanceof _jpeg_stream.JpegStream && _image_utils.NativeImageDecoder.isSupported(image, this.xref, resources, this.pdfFunctionFactory))) {
+                  _context2.next = 37;
+                  break;
+                }
+
+                return _context2.abrupt("return", this.handler.sendWithPromise('obj', [objId, this.pageIndex, 'JpegStream', image.getIR(this.options.forceDataSchema)]).then(function () {
+                  operatorList.addDependency(objId);
+                  args = [objId, w, h];
+                  operatorList.addOp(_util.OPS.paintJpegXObject, args);
+
+                  if (cacheKey) {
+                    imageCache[cacheKey] = {
+                      fn: _util.OPS.paintJpegXObject,
+                      args: args
+                    };
+                  }
+                }, function (reason) {
+                  (0, _util.warn)('Native JPEG decoding failed -- trying to recover: ' + (reason && reason.message));
+                  return _this2.buildPaintImageXObject({
+                    resources: resources,
+                    image: image,
+                    isInline: isInline,
+                    operatorList: operatorList,
+                    cacheKey: cacheKey,
+                    imageCache: imageCache,
+                    forceDisableNativeImageDecoder: true
+                  });
+                }));
+
+              case 37:
+                nativeImageDecoder = null;
+
+                if (nativeImageDecoderSupport === _util.NativeImageDecoding.DECODE && (image instanceof _jpeg_stream.JpegStream || mask instanceof _jpeg_stream.JpegStream || softMask instanceof _jpeg_stream.JpegStream)) {
+                  nativeImageDecoder = new _image_utils.NativeImageDecoder({
+                    xref: this.xref,
+                    resources: resources,
+                    handler: this.handler,
+                    forceDataSchema: this.options.forceDataSchema,
+                    pdfFunctionFactory: this.pdfFunctionFactory
+                  });
+                }
+
+                operatorList.addDependency(objId);
+                args = [objId, w, h];
+                imgPromise = _image.PDFImage.buildImage({
+                  handler: this.handler,
+                  xref: this.xref,
+                  res: resources,
+                  image: image,
+                  isInline: isInline,
+                  nativeDecoder: nativeImageDecoder,
+                  pdfFunctionFactory: this.pdfFunctionFactory
+                }).then(function (imageObj) {
+                  var imgData = imageObj.createImageData(false);
+
+                  if (_this2.parsingType3Font) {
+                    return _this2.handler.sendWithPromise('commonobj', [objId, 'FontType3Res', imgData], [imgData.data.buffer]);
+                  }
+
+                  _this2.handler.send('obj', [objId, _this2.pageIndex, 'Image', imgData], [imgData.data.buffer]);
+
+                  return undefined;
+                })["catch"](function (reason) {
+                  (0, _util.warn)('Unable to decode image: ' + reason);
+
+                  if (_this2.parsingType3Font) {
+                    return _this2.handler.sendWithPromise('commonobj', [objId, 'FontType3Res', null]);
+                  }
+
+                  _this2.handler.send('obj', [objId, _this2.pageIndex, 'Image', null]);
+
+                  return undefined;
+                });
+
+                if (!this.parsingType3Font) {
+                  _context2.next = 45;
+                  break;
+                }
+
+                _context2.next = 45;
+                return imgPromise;
+
+              case 45:
+                operatorList.addOp(_util.OPS.paintImageXObject, args);
+
+                if (cacheKey) {
+                  imageCache[cacheKey] = {
+                    fn: _util.OPS.paintImageXObject,
+                    args: args
+                  };
+                }
+
+                return _context2.abrupt("return", undefined);
+
+              case 48:
+              case "end":
+                return _context2.stop();
+            }
           }
-        }, function (reason) {
-          (0, _util.warn)('Native JPEG decoding failed -- trying to recover: ' + (reason && reason.message));
-          return _this2.buildPaintImageXObject({
-            resources: resources,
-            image: image,
-            isInline: isInline,
-            operatorList: operatorList,
-            cacheKey: cacheKey,
-            imageCache: imageCache,
-            forceDisableNativeImageDecoder: true
-          });
-        });
-      }
-      var nativeImageDecoder = null;
-      if (nativeImageDecoderSupport === _util.NativeImageDecoding.DECODE && (image instanceof _jpeg_stream.JpegStream || mask instanceof _jpeg_stream.JpegStream || softMask instanceof _jpeg_stream.JpegStream)) {
-        nativeImageDecoder = new NativeImageDecoder({
-          xref: this.xref,
-          resources: resources,
-          handler: this.handler,
-          forceDataSchema: this.options.forceDataSchema,
-          pdfFunctionFactory: this.pdfFunctionFactory
-        });
-      }
-      operatorList.addDependency(objId);
-      args = [objId, w, h];
-      _image.PDFImage.buildImage({
-        handler: this.handler,
-        xref: this.xref,
-        res: resources,
-        image: image,
-        isInline: isInline,
-        nativeDecoder: nativeImageDecoder,
-        pdfFunctionFactory: this.pdfFunctionFactory
-      }).then(function (imageObj) {
-        var imgData = imageObj.createImageData(false);
-        _this2.handler.send('obj', [objId, _this2.pageIndex, 'Image', imgData], [imgData.data.buffer]);
-      }).catch(function (reason) {
-        (0, _util.warn)('Unable to decode image: ' + reason);
-        _this2.handler.send('obj', [objId, _this2.pageIndex, 'Image', null]);
-      });
-      operatorList.addOp(_util.OPS.paintImageXObject, args);
-      if (cacheKey) {
-        imageCache[cacheKey] = {
-          fn: _util.OPS.paintImageXObject,
-          args: args
-        };
+        }, _callee2, this);
+      }));
+
+      function buildPaintImageXObject(_x2) {
+        return _buildPaintImageXObject.apply(this, arguments);
       }
-      return Promise.resolve();
-    },
 
+      return buildPaintImageXObject;
+    }(),
     handleSMask: function PartialEvaluator_handleSmask(smask, resources, operatorList, task, stateManager) {
       var smaskContent = smask.get('G');
       var smaskOptions = {
@@ -465,17 +596,21 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         backdrop: smask.get('BC')
       };
       var transferObj = smask.get('TR');
+
       if ((0, _function.isPDFFunction)(transferObj)) {
         var transferFn = this.pdfFunctionFactory.create(transferObj);
         var transferMap = new Uint8Array(256);
         var tmp = new Float32Array(1);
+
         for (var i = 0; i < 256; i++) {
           tmp[0] = i / 255;
           transferFn(tmp, 0, tmp, 0);
           transferMap[i] = tmp[0] * 255 | 0;
         }
+
         smaskOptions.transferMap = transferMap;
       }
+
       return this.buildFormXObject(resources, smaskContent, smaskOptions, operatorList, task, stateManager.state.clone());
     },
     handleTilingType: function handleTilingType(fn, args, resources, pattern, patternDict, operatorList, task) {
@@ -483,7 +618,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
 
       var tilingOpList = new _operator_list.OperatorList();
       var resourcesArray = [patternDict.get('Resources'), resources];
+
       var patternResources = _primitives.Dict.merge(this.xref, resourcesArray);
+
       return this.getOperatorList({
         stream: pattern,
         task: task,
@@ -499,30 +636,39 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         operatorList.addOp(fn, tilingPatternIR);
       }, function (reason) {
         if (_this3.options.ignoreErrors) {
-          _this3.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.unknown });
-          (0, _util.warn)('handleTilingType - ignoring pattern: "' + reason + '".');
+          _this3.handler.send('UnsupportedFeature', {
+            featureId: _util.UNSUPPORTED_FEATURES.unknown
+          });
+
+          (0, _util.warn)("handleTilingType - ignoring pattern: \"".concat(reason, "\"."));
           return;
         }
+
         throw reason;
       });
     },
-
     handleSetFont: function PartialEvaluator_handleSetFont(resources, fontArgs, fontRef, operatorList, task, state) {
       var _this4 = this;
 
       var fontName;
+
       if (fontArgs) {
         fontArgs = fontArgs.slice();
         fontName = fontArgs[0].name;
       }
+
       return this.loadFont(fontName, fontRef, resources).then(function (translated) {
         if (!translated.font.isType3Font) {
           return translated;
         }
+
         return translated.loadType3Data(_this4, resources, operatorList, task).then(function () {
           return translated;
-        }).catch(function (reason) {
-          _this4.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.font });
+        })["catch"](function (reason) {
+          _this4.handler.send('UnsupportedFeature', {
+            featureId: _util.UNSUPPORTED_FEATURES.font
+          });
+
           return new TranslatedFont('g_font_error', new _fonts.ErrorFont('Type3 font load error: ' + reason), translated.font);
         });
       }).then(function (translated) {
@@ -531,32 +677,22 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         return translated.loadedName;
       });
     },
-    handleText: function PartialEvaluator_handleText(chars, state) {
-      var _this5 = this;
-
+    handleText: function handleText(chars, state) {
       var font = state.font;
       var glyphs = font.charsToGlyphs(chars);
-      var isAddToPathSet = !!(state.textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG);
-      if (font.data && (isAddToPathSet || this.options.disableFontFace || state.fillColorSpace.name === 'Pattern')) {
-        var buildPath = function buildPath(fontChar) {
-          if (!font.renderer.hasBuiltPath(fontChar)) {
-            var path = font.renderer.getPathJs(fontChar);
-            _this5.handler.send('commonobj', [font.loadedName + '_path_' + fontChar, 'FontPath', path]);
-          }
-        };
-        for (var i = 0, ii = glyphs.length; i < ii; i++) {
-          var glyph = glyphs[i];
-          buildPath(glyph.fontChar);
-          var accent = glyph.accent;
-          if (accent && accent.fontChar) {
-            buildPath(accent.fontChar);
-          }
+
+      if (font.data) {
+        var isAddToPathSet = !!(state.textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG);
+
+        if (isAddToPathSet || state.fillColorSpace.name === 'Pattern' || font.disableFontFace || this.options.disableFontFace) {
+          PartialEvaluator.buildFontPaths(font, glyphs, this.handler);
         }
       }
+
       return glyphs;
     },
     setGState: function PartialEvaluator_setGState(resources, gState, operatorList, task, stateManager) {
-      var _this6 = this;
+      var _this5 = this;
 
       var gStateObj = [];
       var gStateKeys = gState.getKeys();
@@ -565,9 +701,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       var _loop = function _loop() {
         var key = gStateKeys[i];
         var value = gState.get(key);
+
         switch (key) {
           case 'Type':
             break;
+
           case 'LW':
           case 'LC':
           case 'LJ':
@@ -579,31 +717,37 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           case 'ca':
             gStateObj.push([key, value]);
             break;
+
           case 'Font':
             promise = promise.then(function () {
-              return _this6.handleSetFont(resources, null, value[0], operatorList, task, stateManager.state).then(function (loadedName) {
+              return _this5.handleSetFont(resources, null, value[0], operatorList, task, stateManager.state).then(function (loadedName) {
                 operatorList.addDependency(loadedName);
                 gStateObj.push([key, [loadedName, value[1]]]);
               });
             });
             break;
+
           case 'BM':
             gStateObj.push([key, normalizeBlendMode(value)]);
             break;
+
           case 'SMask':
             if ((0, _primitives.isName)(value, 'None')) {
               gStateObj.push([key, false]);
               break;
             }
+
             if ((0, _primitives.isDict)(value)) {
               promise = promise.then(function () {
-                return _this6.handleSMask(value, resources, operatorList, task, stateManager);
+                return _this5.handleSMask(value, resources, operatorList, task, stateManager);
               });
               gStateObj.push([key, true]);
             } else {
               (0, _util.warn)('Unsupported SMask type');
             }
+
             break;
+
           case 'OP':
           case 'op':
           case 'OPM':
@@ -620,6 +764,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           case 'TK':
             (0, _util.info)('graphic state operator ' + key);
             break;
+
           default:
             (0, _util.info)('Unknown graphic state operator ' + key);
             break;
@@ -629,6 +774,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       for (var i = 0, ii = gStateKeys.length; i < ii; i++) {
         _loop();
       }
+
       return promise.then(function () {
         if (gStateObj.length > 0) {
           operatorList.addOp(_util.OPS.setGState, [gStateObj]);
@@ -636,20 +782,24 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       });
     },
     loadFont: function PartialEvaluator_loadFont(fontName, font, resources) {
-      var _this7 = this;
+      var _this6 = this;
 
       function errorFont() {
         return Promise.resolve(new TranslatedFont('g_font_error', new _fonts.ErrorFont('Font ' + fontName + ' is not available'), font));
       }
+
       var fontRef,
           xref = this.xref;
+
       if (font) {
         if (!(0, _primitives.isRef)(font)) {
           throw new Error('The "font" object should be a reference.');
         }
+
         fontRef = font;
       } else {
         var fontRes = resources.get('Font');
+
         if (fontRes) {
           fontRef = fontRes.getRaw(fontName);
         } else {
@@ -657,147 +807,228 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           return errorFont();
         }
       }
+
       if (!fontRef) {
         (0, _util.warn)('fontRef not available');
         return errorFont();
       }
+
       if (this.fontCache.has(fontRef)) {
         return this.fontCache.get(fontRef);
       }
+
       font = xref.fetchIfRef(fontRef);
+
       if (!(0, _primitives.isDict)(font)) {
         return errorFont();
       }
+
       if (font.translated) {
         return font.translated;
       }
+
       var fontCapability = (0, _util.createPromiseCapability)();
       var preEvaluatedFont = this.preEvaluateFont(font);
-      var descriptor = preEvaluatedFont.descriptor;
+      var descriptor = preEvaluatedFont.descriptor,
+          hash = preEvaluatedFont.hash;
       var fontRefIsRef = (0, _primitives.isRef)(fontRef),
           fontID;
+
       if (fontRefIsRef) {
         fontID = fontRef.toString();
       }
-      if ((0, _primitives.isDict)(descriptor)) {
+
+      if (hash && (0, _primitives.isDict)(descriptor)) {
         if (!descriptor.fontAliases) {
           descriptor.fontAliases = Object.create(null);
         }
+
         var fontAliases = descriptor.fontAliases;
-        var hash = preEvaluatedFont.hash;
+
         if (fontAliases[hash]) {
           var aliasFontRef = fontAliases[hash].aliasRef;
+
           if (fontRefIsRef && aliasFontRef && this.fontCache.has(aliasFontRef)) {
             this.fontCache.putAlias(fontRef, aliasFontRef);
             return this.fontCache.get(fontRef);
           }
         } else {
-          fontAliases[hash] = { fontID: _fonts.Font.getFontID() };
+          fontAliases[hash] = {
+            fontID: _fonts.Font.getFontID()
+          };
         }
+
         if (fontRefIsRef) {
           fontAliases[hash].aliasRef = fontRef;
         }
+
         fontID = fontAliases[hash].fontID;
       }
+
       if (fontRefIsRef) {
         this.fontCache.put(fontRef, fontCapability.promise);
       } else {
         if (!fontID) {
           fontID = this.idFactory.createObjId();
         }
-        this.fontCache.put('id_' + fontID, fontCapability.promise);
+
+        this.fontCache.put("id_".concat(fontID), fontCapability.promise);
       }
+
       (0, _util.assert)(fontID, 'The "fontID" must be defined.');
-      font.loadedName = 'g_' + this.pdfManager.docId + '_f' + fontID;
+      font.loadedName = "".concat(this.idFactory.getDocId(), "_f").concat(fontID);
       font.translated = fontCapability.promise;
       var translatedPromise;
+
       try {
         translatedPromise = this.translateFont(preEvaluatedFont);
       } catch (e) {
         translatedPromise = Promise.reject(e);
       }
+
       translatedPromise.then(function (translatedFont) {
         if (translatedFont.fontType !== undefined) {
           var xrefFontStats = xref.stats.fontTypes;
           xrefFontStats[translatedFont.fontType] = true;
         }
+
         fontCapability.resolve(new TranslatedFont(font.loadedName, translatedFont, font));
-      }).catch(function (reason) {
-        _this7.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.font });
+      })["catch"](function (reason) {
+        _this6.handler.send('UnsupportedFeature', {
+          featureId: _util.UNSUPPORTED_FEATURES.font
+        });
+
         try {
-          var descriptor = preEvaluatedFont.descriptor;
           var fontFile3 = descriptor && descriptor.get('FontFile3');
           var subtype = fontFile3 && fontFile3.get('Subtype');
           var fontType = (0, _fonts.getFontType)(preEvaluatedFont.type, subtype && subtype.name);
           var xrefFontStats = xref.stats.fontTypes;
           xrefFontStats[fontType] = true;
         } catch (ex) {}
+
         fontCapability.resolve(new TranslatedFont(font.loadedName, new _fonts.ErrorFont(reason instanceof Error ? reason.message : reason), font));
       });
       return fontCapability.promise;
     },
-    buildPath: function PartialEvaluator_buildPath(operatorList, fn, args) {
+    buildPath: function buildPath(operatorList, fn, args) {
+      var parsingText = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       var lastIndex = operatorList.length - 1;
+
       if (!args) {
         args = [];
       }
+
       if (lastIndex < 0 || operatorList.fnArray[lastIndex] !== _util.OPS.constructPath) {
+        if (parsingText) {
+          (0, _util.warn)("Encountered path operator \"".concat(fn, "\" inside of a text object."));
+          operatorList.addOp(_util.OPS.save, null);
+        }
+
         operatorList.addOp(_util.OPS.constructPath, [[fn], args]);
+
+        if (parsingText) {
+          operatorList.addOp(_util.OPS.restore, null);
+        }
       } else {
         var opArgs = operatorList.argsArray[lastIndex];
         opArgs[0].push(fn);
         Array.prototype.push.apply(opArgs[1], args);
       }
     },
-    handleColorN: function PartialEvaluator_handleColorN(operatorList, fn, args, cs, patterns, resources, task) {
-      var patternName = args[args.length - 1];
-      var pattern;
-      if ((0, _primitives.isName)(patternName) && (pattern = patterns.get(patternName.name))) {
-        var dict = (0, _primitives.isStream)(pattern) ? pattern.dict : pattern;
-        var typeNum = dict.get('PatternType');
-        if (typeNum === TILING_PATTERN) {
-          var color = cs.base ? cs.base.getRgb(args, 0) : null;
-          return this.handleTilingType(fn, color, resources, pattern, dict, operatorList, task);
-        } else if (typeNum === SHADING_PATTERN) {
-          var shading = dict.get('Shading');
-          var matrix = dict.getArray('Matrix');
-          pattern = _pattern.Pattern.parseShading(shading, matrix, this.xref, resources, this.handler, this.pdfFunctionFactory);
-          operatorList.addOp(fn, pattern.getIR());
-          return Promise.resolve();
-        }
-        return Promise.reject(new Error('Unknown PatternType: ' + typeNum));
-      }
-      operatorList.addOp(fn, args);
-      return Promise.resolve();
-    },
-    getOperatorList: function getOperatorList(_ref5) {
-      var _this8 = this;
+    handleColorN: function () {
+      var _handleColorN = _asyncToGenerator(
+      /*#__PURE__*/
+      _regenerator["default"].mark(function _callee3(operatorList, fn, args, cs, patterns, resources, task) {
+        var patternName, pattern, dict, typeNum, color, shading, matrix;
+        return _regenerator["default"].wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                patternName = args[args.length - 1];
 
-      var stream = _ref5.stream,
-          task = _ref5.task,
-          resources = _ref5.resources,
-          operatorList = _ref5.operatorList,
-          _ref5$initialState = _ref5.initialState,
-          initialState = _ref5$initialState === undefined ? null : _ref5$initialState;
+                if (!((0, _primitives.isName)(patternName) && (pattern = patterns.get(patternName.name)))) {
+                  _context3.next = 16;
+                  break;
+                }
+
+                dict = (0, _primitives.isStream)(pattern) ? pattern.dict : pattern;
+                typeNum = dict.get('PatternType');
+
+                if (!(typeNum === TILING_PATTERN)) {
+                  _context3.next = 9;
+                  break;
+                }
+
+                color = cs.base ? cs.base.getRgb(args, 0) : null;
+                return _context3.abrupt("return", this.handleTilingType(fn, color, resources, pattern, dict, operatorList, task));
+
+              case 9:
+                if (!(typeNum === SHADING_PATTERN)) {
+                  _context3.next = 15;
+                  break;
+                }
+
+                shading = dict.get('Shading');
+                matrix = dict.getArray('Matrix');
+                pattern = _pattern.Pattern.parseShading(shading, matrix, this.xref, resources, this.handler, this.pdfFunctionFactory);
+                operatorList.addOp(fn, pattern.getIR());
+                return _context3.abrupt("return", undefined);
+
+              case 15:
+                throw new _util.FormatError("Unknown PatternType: ".concat(typeNum));
 
+              case 16:
+                throw new _util.FormatError("Unknown PatternName: ".concat(patternName));
+
+              case 17:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function handleColorN(_x3, _x4, _x5, _x6, _x7, _x8, _x9) {
+        return _handleColorN.apply(this, arguments);
+      }
+
+      return handleColorN;
+    }(),
+    getOperatorList: function getOperatorList(_ref4) {
+      var _this7 = this;
+
+      var stream = _ref4.stream,
+          task = _ref4.task,
+          resources = _ref4.resources,
+          operatorList = _ref4.operatorList,
+          _ref4$initialState = _ref4.initialState,
+          initialState = _ref4$initialState === void 0 ? null : _ref4$initialState;
       resources = resources || _primitives.Dict.empty;
       initialState = initialState || new EvalState();
+
       if (!operatorList) {
         throw new Error('getOperatorList: missing "operatorList" parameter');
       }
+
       var self = this;
       var xref = this.xref;
+      var parsingText = false;
       var imageCache = Object.create(null);
+
       var xobjs = resources.get('XObject') || _primitives.Dict.empty;
+
       var patterns = resources.get('Pattern') || _primitives.Dict.empty;
+
       var stateManager = new StateManager(initialState);
       var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
       var timeSlotManager = new TimeSlotManager();
+
       function closePendingRestoreOPS(argument) {
         for (var i = 0, ii = preprocessor.savedStatesDepth; i < ii; i++) {
           operatorList.addOp(_util.OPS.restore, []);
         }
       }
+
       return new Promise(function promiseBody(resolve, reject) {
         var next = function next(promise) {
           promise.then(function () {
@@ -808,6 +1039,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
             }
           }, reject);
         };
+
         task.ensureNotTerminated();
         timeSlotManager.reset();
         var stop,
@@ -815,38 +1047,50 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
             i,
             ii,
             cs;
+
         while (!(stop = timeSlotManager.check())) {
           operation.args = null;
+
           if (!preprocessor.read(operation)) {
             break;
           }
+
           var args = operation.args;
           var fn = operation.fn;
+
           switch (fn | 0) {
             case _util.OPS.paintXObject:
               var name = args[0].name;
+
               if (name && imageCache[name] !== undefined) {
                 operatorList.addOp(imageCache[name].fn, imageCache[name].args);
                 args = null;
                 continue;
               }
+
               next(new Promise(function (resolveXObject, rejectXObject) {
                 if (!name) {
                   throw new _util.FormatError('XObject must be referred to by name.');
                 }
+
                 var xobj = xobjs.get(name);
+
                 if (!xobj) {
                   operatorList.addOp(fn, args);
                   resolveXObject();
                   return;
                 }
+
                 if (!(0, _primitives.isStream)(xobj)) {
                   throw new _util.FormatError('XObject should be a stream');
                 }
+
                 var type = xobj.dict.get('Subtype');
+
                 if (!(0, _primitives.isName)(type)) {
                   throw new _util.FormatError('XObject should have a Name subtype');
                 }
+
                 if (type.name === 'Form') {
                   stateManager.save();
                   self.buildFormXObject(resources, xobj, null, operatorList, task, stateManager.state.clone()).then(function () {
@@ -866,18 +1110,23 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                 } else if (type.name === 'PS') {
                   (0, _util.info)('Ignored XObject subtype PS');
                 } else {
-                  throw new _util.FormatError('Unhandled XObject subtype ' + type.name);
+                  throw new _util.FormatError("Unhandled XObject subtype ".concat(type.name));
                 }
+
                 resolveXObject();
-              }).catch(function (reason) {
+              })["catch"](function (reason) {
                 if (self.options.ignoreErrors) {
-                  self.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.unknown });
-                  (0, _util.warn)('getOperatorList - ignoring XObject: "' + reason + '".');
+                  self.handler.send('UnsupportedFeature', {
+                    featureId: _util.UNSUPPORTED_FEATURES.unknown
+                  });
+                  (0, _util.warn)("getOperatorList - ignoring XObject: \"".concat(reason, "\"."));
                   return;
                 }
+
                 throw reason;
               }));
               return;
+
             case _util.OPS.setFont:
               var fontSize = args[1];
               next(self.handleSetFont(resources, args, null, operatorList, task, stateManager.state).then(function (loadedName) {
@@ -885,16 +1134,28 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                 operatorList.addOp(_util.OPS.setFont, [loadedName, fontSize]);
               }));
               return;
+
+            case _util.OPS.beginText:
+              parsingText = true;
+              break;
+
+            case _util.OPS.endText:
+              parsingText = false;
+              break;
+
             case _util.OPS.endInlineImage:
               var cacheKey = args[0].cacheKey;
+
               if (cacheKey) {
                 var cacheEntry = imageCache[cacheKey];
+
                 if (cacheEntry !== undefined) {
                   operatorList.addOp(cacheEntry.fn, cacheEntry.args);
                   args = null;
                   continue;
                 }
               }
+
               next(self.buildPaintImageXObject({
                 resources: resources,
                 image: args[0],
@@ -904,30 +1165,37 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                 imageCache: imageCache
               }));
               return;
+
             case _util.OPS.showText:
               args[0] = self.handleText(args[0], stateManager.state);
               break;
+
             case _util.OPS.showSpacedText:
               var arr = args[0];
               var combinedGlyphs = [];
               var arrLength = arr.length;
               var state = stateManager.state;
+
               for (i = 0; i < arrLength; ++i) {
                 var arrItem = arr[i];
+
                 if ((0, _util.isString)(arrItem)) {
                   Array.prototype.push.apply(combinedGlyphs, self.handleText(arrItem, state));
                 } else if ((0, _util.isNum)(arrItem)) {
                   combinedGlyphs.push(arrItem);
                 }
               }
+
               args[0] = combinedGlyphs;
               fn = _util.OPS.showText;
               break;
+
             case _util.OPS.nextLineShowText:
               operatorList.addOp(_util.OPS.nextLine);
               args[0] = self.handleText(args[0], stateManager.state);
               fn = _util.OPS.showText;
               break;
+
             case _util.OPS.nextLineSetSpacingShowText:
               operatorList.addOp(_util.OPS.nextLine);
               operatorList.addOp(_util.OPS.setWordSpacing, [args.shift()]);
@@ -935,105 +1203,131 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
               args[0] = self.handleText(args[0], stateManager.state);
               fn = _util.OPS.showText;
               break;
+
             case _util.OPS.setTextRenderingMode:
               stateManager.state.textRenderingMode = args[0];
               break;
+
             case _util.OPS.setFillColorSpace:
               stateManager.state.fillColorSpace = _colorspace.ColorSpace.parse(args[0], xref, resources, self.pdfFunctionFactory);
               continue;
+
             case _util.OPS.setStrokeColorSpace:
               stateManager.state.strokeColorSpace = _colorspace.ColorSpace.parse(args[0], xref, resources, self.pdfFunctionFactory);
               continue;
+
             case _util.OPS.setFillColor:
               cs = stateManager.state.fillColorSpace;
               args = cs.getRgb(args, 0);
               fn = _util.OPS.setFillRGBColor;
               break;
+
             case _util.OPS.setStrokeColor:
               cs = stateManager.state.strokeColorSpace;
               args = cs.getRgb(args, 0);
               fn = _util.OPS.setStrokeRGBColor;
               break;
+
             case _util.OPS.setFillGray:
               stateManager.state.fillColorSpace = _colorspace.ColorSpace.singletons.gray;
               args = _colorspace.ColorSpace.singletons.gray.getRgb(args, 0);
               fn = _util.OPS.setFillRGBColor;
               break;
+
             case _util.OPS.setStrokeGray:
               stateManager.state.strokeColorSpace = _colorspace.ColorSpace.singletons.gray;
               args = _colorspace.ColorSpace.singletons.gray.getRgb(args, 0);
               fn = _util.OPS.setStrokeRGBColor;
               break;
+
             case _util.OPS.setFillCMYKColor:
               stateManager.state.fillColorSpace = _colorspace.ColorSpace.singletons.cmyk;
               args = _colorspace.ColorSpace.singletons.cmyk.getRgb(args, 0);
               fn = _util.OPS.setFillRGBColor;
               break;
+
             case _util.OPS.setStrokeCMYKColor:
               stateManager.state.strokeColorSpace = _colorspace.ColorSpace.singletons.cmyk;
               args = _colorspace.ColorSpace.singletons.cmyk.getRgb(args, 0);
               fn = _util.OPS.setStrokeRGBColor;
               break;
+
             case _util.OPS.setFillRGBColor:
               stateManager.state.fillColorSpace = _colorspace.ColorSpace.singletons.rgb;
               args = _colorspace.ColorSpace.singletons.rgb.getRgb(args, 0);
               break;
+
             case _util.OPS.setStrokeRGBColor:
               stateManager.state.strokeColorSpace = _colorspace.ColorSpace.singletons.rgb;
               args = _colorspace.ColorSpace.singletons.rgb.getRgb(args, 0);
               break;
+
             case _util.OPS.setFillColorN:
               cs = stateManager.state.fillColorSpace;
+
               if (cs.name === 'Pattern') {
                 next(self.handleColorN(operatorList, _util.OPS.setFillColorN, args, cs, patterns, resources, task));
                 return;
               }
+
               args = cs.getRgb(args, 0);
               fn = _util.OPS.setFillRGBColor;
               break;
+
             case _util.OPS.setStrokeColorN:
               cs = stateManager.state.strokeColorSpace;
+
               if (cs.name === 'Pattern') {
                 next(self.handleColorN(operatorList, _util.OPS.setStrokeColorN, args, cs, patterns, resources, task));
                 return;
               }
+
               args = cs.getRgb(args, 0);
               fn = _util.OPS.setStrokeRGBColor;
               break;
+
             case _util.OPS.shadingFill:
               var shadingRes = resources.get('Shading');
+
               if (!shadingRes) {
                 throw new _util.FormatError('No shading resource found');
               }
+
               var shading = shadingRes.get(args[0].name);
+
               if (!shading) {
                 throw new _util.FormatError('No shading object found');
               }
+
               var shadingFill = _pattern.Pattern.parseShading(shading, null, xref, resources, self.handler, self.pdfFunctionFactory);
+
               var patternIR = shadingFill.getIR();
               args = [patternIR];
               fn = _util.OPS.shadingFill;
               break;
+
             case _util.OPS.setGState:
               var dictName = args[0];
               var extGState = resources.get('ExtGState');
+
               if (!(0, _primitives.isDict)(extGState) || !extGState.has(dictName.name)) {
                 break;
               }
+
               var gState = extGState.get(dictName.name);
               next(self.setGState(resources, gState, operatorList, task, stateManager));
               return;
+
             case _util.OPS.moveTo:
             case _util.OPS.lineTo:
             case _util.OPS.curveTo:
             case _util.OPS.curveTo2:
             case _util.OPS.curveTo3:
             case _util.OPS.closePath:
-              self.buildPath(operatorList, fn, args);
-              continue;
             case _util.OPS.rectangle:
-              self.buildPath(operatorList, fn, args);
+              self.buildPath(operatorList, fn, args, parsingText);
               continue;
+
             case _util.OPS.markPoint:
             case _util.OPS.markPointProps:
             case _util.OPS.beginMarkedContent:
@@ -1042,6 +1336,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
             case _util.OPS.beginCompat:
             case _util.OPS.endCompat:
               continue;
+
             default:
               if (args !== null) {
                 for (i = 0, ii = args.length; i < ii; i++) {
@@ -1049,46 +1344,54 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                     break;
                   }
                 }
+
                 if (i < ii) {
                   (0, _util.warn)('getOperatorList - ignoring operator: ' + fn);
                   continue;
                 }
               }
+
           }
+
           operatorList.addOp(fn, args);
         }
+
         if (stop) {
           next(deferred);
           return;
         }
+
         closePendingRestoreOPS();
         resolve();
-      }).catch(function (reason) {
-        if (_this8.options.ignoreErrors) {
-          _this8.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.unknown });
-          (0, _util.warn)('getOperatorList - ignoring errors during task: ' + task.name);
+      })["catch"](function (reason) {
+        if (_this7.options.ignoreErrors) {
+          _this7.handler.send('UnsupportedFeature', {
+            featureId: _util.UNSUPPORTED_FEATURES.unknown
+          });
+
+          (0, _util.warn)("getOperatorList - ignoring errors during \"".concat(task.name, "\" ") + "task: \"".concat(reason, "\"."));
           closePendingRestoreOPS();
           return;
         }
+
         throw reason;
       });
     },
-    getTextContent: function getTextContent(_ref6) {
-      var _this9 = this;
-
-      var stream = _ref6.stream,
-          task = _ref6.task,
-          resources = _ref6.resources,
-          _ref6$stateManager = _ref6.stateManager,
-          stateManager = _ref6$stateManager === undefined ? null : _ref6$stateManager,
-          _ref6$normalizeWhites = _ref6.normalizeWhitespace,
-          normalizeWhitespace = _ref6$normalizeWhites === undefined ? false : _ref6$normalizeWhites,
-          _ref6$combineTextItem = _ref6.combineTextItems,
-          combineTextItems = _ref6$combineTextItem === undefined ? false : _ref6$combineTextItem,
-          sink = _ref6.sink,
-          _ref6$seenStyles = _ref6.seenStyles,
-          seenStyles = _ref6$seenStyles === undefined ? Object.create(null) : _ref6$seenStyles;
+    getTextContent: function getTextContent(_ref5) {
+      var _this8 = this;
 
+      var stream = _ref5.stream,
+          task = _ref5.task,
+          resources = _ref5.resources,
+          _ref5$stateManager = _ref5.stateManager,
+          stateManager = _ref5$stateManager === void 0 ? null : _ref5$stateManager,
+          _ref5$normalizeWhites = _ref5.normalizeWhitespace,
+          normalizeWhitespace = _ref5$normalizeWhites === void 0 ? false : _ref5$normalizeWhites,
+          _ref5$combineTextItem = _ref5.combineTextItems,
+          combineTextItems = _ref5$combineTextItem === void 0 ? false : _ref5$combineTextItem,
+          sink = _ref5.sink,
+          _ref5$seenStyles = _ref5.seenStyles,
+          seenStyles = _ref5$seenStyles === void 0 ? Object.create(null) : _ref5$seenStyles;
       resources = resources || _primitives.Dict.empty;
       stateManager = stateManager || new StateManager(new TextState());
       var WhitespaceRegexp = /\s/g;
@@ -1122,31 +1425,39 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       var skipEmptyXObjs = Object.create(null);
       var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
       var textState;
+
       function ensureTextContentItem() {
         if (textContentItem.initialized) {
           return textContentItem;
         }
+
         var font = textState.font;
+
         if (!(font.loadedName in seenStyles)) {
           seenStyles[font.loadedName] = true;
           textContent.styles[font.loadedName] = {
             fontFamily: font.fallbackName,
             ascent: font.ascent,
             descent: font.descent,
-            vertical: font.vertical
+            vertical: !!font.vertical
           };
         }
+
         textContentItem.fontName = font.loadedName;
         var tsm = [textState.fontSize * textState.textHScale, 0, 0, textState.fontSize, 0, textState.textRise];
-        if (font.isType3Font && textState.fontMatrix !== _util.FONT_IDENTITY_MATRIX && textState.fontSize === 1) {
+
+        if (font.isType3Font && textState.fontSize <= 1 && !(0, _util.isArrayEqual)(textState.fontMatrix, _util.FONT_IDENTITY_MATRIX)) {
           var glyphHeight = font.bbox[3] - font.bbox[1];
+
           if (glyphHeight > 0) {
-            glyphHeight = glyphHeight * textState.fontMatrix[3];
-            tsm[3] *= glyphHeight;
+            tsm[3] *= glyphHeight * textState.fontMatrix[3];
           }
         }
+
         var trm = _util.Util.transform(textState.ctm, _util.Util.transform(textState.textMatrix, tsm));
+
         textContentItem.transform = trm;
+
         if (!font.vertical) {
           textContentItem.width = 0;
           textContentItem.height = Math.sqrt(trm[2] * trm[2] + trm[3] * trm[3]);
@@ -1156,6 +1467,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           textContentItem.height = 0;
           textContentItem.vertical = true;
         }
+
         var a = textState.textLineMatrix[0];
         var b = textState.textLineMatrix[1];
         var scaleLineX = Math.sqrt(a * a + b * b);
@@ -1166,6 +1478,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         textContentItem.lastAdvanceWidth = 0;
         textContentItem.lastAdvanceHeight = 0;
         var spaceWidth = font.spaceWidth / 1000 * textState.fontSize;
+
         if (spaceWidth) {
           textContentItem.spaceWidth = spaceWidth;
           textContentItem.fakeSpaceMin = spaceWidth * SPACE_FACTOR;
@@ -1179,18 +1492,23 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           textContentItem.fakeMultiSpaceMax = 0;
           textContentItem.textRunBreakAllowed = false;
         }
+
         textContentItem.initialized = true;
         return textContentItem;
       }
+
       function replaceWhitespace(str) {
         var i = 0,
             ii = str.length,
             code;
+
         while (i < ii && (code = str.charCodeAt(i)) >= 0x20 && code <= 0x7F) {
           i++;
         }
+
         return i < ii ? str.replace(WhitespaceRegexp, ' ') : str;
       }
+
       function runBidiTransform(textChunk) {
         var str = textChunk.str.join('');
         var bidiResult = (0, _bidi.bidi)(str, -1, textChunk.vertical);
@@ -1203,42 +1521,53 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           fontName: textChunk.fontName
         };
       }
+
       function handleSetFont(fontName, fontRef) {
         return self.loadFont(fontName, fontRef, resources).then(function (translated) {
           textState.font = translated.font;
           textState.fontMatrix = translated.font.fontMatrix || _util.FONT_IDENTITY_MATRIX;
         });
       }
+
       function buildTextContentItem(chars) {
         var font = textState.font;
         var textChunk = ensureTextContentItem();
         var width = 0;
         var height = 0;
         var glyphs = font.charsToGlyphs(chars);
+
         for (var i = 0; i < glyphs.length; i++) {
           var glyph = glyphs[i];
           var glyphWidth = null;
+
           if (font.vertical && glyph.vmetric) {
             glyphWidth = glyph.vmetric[0];
           } else {
             glyphWidth = glyph.width;
           }
+
           var glyphUnicode = glyph.unicode;
           var NormalizedUnicodes = (0, _unicode.getNormalizedUnicodes)();
+
           if (NormalizedUnicodes[glyphUnicode] !== undefined) {
             glyphUnicode = NormalizedUnicodes[glyphUnicode];
           }
+
           glyphUnicode = (0, _unicode.reverseIfRtl)(glyphUnicode);
           var charSpacing = textState.charSpacing;
+
           if (glyph.isSpace) {
             var wordSpacing = textState.wordSpacing;
             charSpacing += wordSpacing;
+
             if (wordSpacing > 0) {
               addFakeSpaces(wordSpacing, textChunk.str);
             }
           }
+
           var tx = 0;
           var ty = 0;
+
           if (!font.vertical) {
             var w0 = glyphWidth * textState.fontMatrix[0];
             tx = (w0 * textState.fontSize + charSpacing) * textState.textHScale;
@@ -1248,9 +1577,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
             ty = w1 * textState.fontSize + charSpacing;
             height += ty;
           }
+
           textState.translateTextMatrix(tx, ty);
           textChunk.str.push(glyphUnicode);
         }
+
         if (!font.vertical) {
           textChunk.lastAdvanceWidth = width;
           textChunk.width += width;
@@ -1258,39 +1589,53 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           textChunk.lastAdvanceHeight = height;
           textChunk.height += Math.abs(height);
         }
+
         return textChunk;
       }
+
       function addFakeSpaces(width, strBuf) {
         if (width < textContentItem.fakeSpaceMin) {
           return;
         }
+
         if (width < textContentItem.fakeMultiSpaceMin) {
           strBuf.push(' ');
           return;
         }
+
         var fakeSpaces = Math.round(width / textContentItem.spaceWidth);
+
         while (fakeSpaces-- > 0) {
           strBuf.push(' ');
         }
       }
+
       function flushTextContentItem() {
         if (!textContentItem.initialized) {
           return;
         }
-        textContentItem.width *= textContentItem.textAdvanceScale;
-        textContentItem.height *= textContentItem.textAdvanceScale;
+
+        if (!textContentItem.vertical) {
+          textContentItem.width *= textContentItem.textAdvanceScale;
+        } else {
+          textContentItem.height *= textContentItem.textAdvanceScale;
+        }
+
         textContent.items.push(runBidiTransform(textContentItem));
         textContentItem.initialized = false;
         textContentItem.str.length = 0;
       }
+
       function enqueueChunk() {
         var length = textContent.items.length;
+
         if (length > 0) {
           sink.enqueue(textContent, length);
           textContent.items = [];
           textContent.styles = Object.create(null);
         }
       }
+
       var timeSlotManager = new TimeSlotManager();
       return new Promise(function promiseBody(resolve, reject) {
         var next = function next(promise) {
@@ -1303,48 +1648,60 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
             }
           }, reject);
         };
+
         task.ensureNotTerminated();
         timeSlotManager.reset();
         var stop,
             operation = {},
             args = [];
+
         while (!(stop = timeSlotManager.check())) {
           args.length = 0;
           operation.args = args;
+
           if (!preprocessor.read(operation)) {
             break;
           }
+
           textState = stateManager.state;
           var fn = operation.fn;
           args = operation.args;
           var advance, diff;
+
           switch (fn | 0) {
             case _util.OPS.setFont:
               var fontNameArg = args[0].name,
                   fontSizeArg = args[1];
+
               if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
                 break;
               }
+
               flushTextContentItem();
               textState.fontName = fontNameArg;
               textState.fontSize = fontSizeArg;
               next(handleSetFont(fontNameArg, null));
               return;
+
             case _util.OPS.setTextRise:
               flushTextContentItem();
               textState.textRise = args[0];
               break;
+
             case _util.OPS.setHScale:
               flushTextContentItem();
               textState.textHScale = args[0] / 100;
               break;
+
             case _util.OPS.setLeading:
               flushTextContentItem();
               textState.leading = args[0];
               break;
+
             case _util.OPS.moveText:
               var isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
               advance = args[0] - args[1];
+
               if (combineTextItems && isSameTextLine && textContentItem.initialized && advance > 0 && advance <= textContentItem.fakeMultiSpaceMax) {
                 textState.translateTextLineMatrix(args[0], args[1]);
                 textContentItem.width += args[0] - textContentItem.lastAdvanceWidth;
@@ -1353,22 +1710,27 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                 addFakeSpaces(diff, textContentItem.str);
                 break;
               }
+
               flushTextContentItem();
               textState.translateTextLineMatrix(args[0], args[1]);
               textState.textMatrix = textState.textLineMatrix.slice();
               break;
+
             case _util.OPS.setLeadingMoveText:
               flushTextContentItem();
               textState.leading = -args[1];
               textState.translateTextLineMatrix(args[0], args[1]);
               textState.textMatrix = textState.textLineMatrix.slice();
               break;
+
             case _util.OPS.nextLine:
               flushTextContentItem();
               textState.carriageReturn();
               break;
+
             case _util.OPS.setTextMatrix:
               advance = textState.calcTextLineMatrixAdvance(args[0], args[1], args[2], args[3], args[4], args[5]);
+
               if (combineTextItems && advance !== null && textContentItem.initialized && advance.value > 0 && advance.value <= textContentItem.fakeMultiSpaceMax) {
                 textState.translateTextLineMatrix(advance.width, advance.height);
                 textContentItem.width += advance.width - textContentItem.lastAdvanceWidth;
@@ -1377,24 +1739,30 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                 addFakeSpaces(diff, textContentItem.str);
                 break;
               }
+
               flushTextContentItem();
               textState.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
               textState.setTextLineMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
               break;
+
             case _util.OPS.setCharSpacing:
               textState.charSpacing = args[0];
               break;
+
             case _util.OPS.setWordSpacing:
               textState.wordSpacing = args[0];
               break;
+
             case _util.OPS.beginText:
               flushTextContentItem();
               textState.textMatrix = _util.IDENTITY_MATRIX.slice();
               textState.textLineMatrix = _util.IDENTITY_MATRIX.slice();
               break;
+
             case _util.OPS.showSpacedText:
               var items = args[0];
               var offset;
+
               for (var j = 0, jj = items.length; j < jj; j++) {
                 if (typeof items[j] === 'string') {
                   buildTextContentItem(items[j]);
@@ -1402,10 +1770,12 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                   ensureTextContentItem();
                   advance = items[j] * textState.fontSize / 1000;
                   var breakTextRun = false;
+
                   if (textState.font.vertical) {
                     offset = advance;
                     textState.translateTextMatrix(0, offset);
                     breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+
                     if (!breakTextRun) {
                       textContentItem.height += offset;
                     }
@@ -1414,10 +1784,12 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                     offset = advance * textState.textHScale;
                     textState.translateTextMatrix(offset, 0);
                     breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+
                     if (!breakTextRun) {
                       textContentItem.width += offset;
                     }
                   }
+
                   if (breakTextRun) {
                     flushTextContentItem();
                   } else if (advance > 0) {
@@ -1425,15 +1797,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                   }
                 }
               }
+
               break;
+
             case _util.OPS.showText:
               buildTextContentItem(args[0]);
               break;
+
             case _util.OPS.nextLineShowText:
               flushTextContentItem();
               textState.carriageReturn();
               buildTextContentItem(args[0]);
               break;
+
             case _util.OPS.nextLineSetSpacingShowText:
               flushTextContentItem();
               textState.wordSpacing = args[0];
@@ -1441,42 +1817,56 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
               textState.carriageReturn();
               buildTextContentItem(args[2]);
               break;
+
             case _util.OPS.paintXObject:
               flushTextContentItem();
+
               if (!xobjs) {
                 xobjs = resources.get('XObject') || _primitives.Dict.empty;
               }
+
               var name = args[0].name;
+
               if (name && skipEmptyXObjs[name] !== undefined) {
                 break;
               }
+
               next(new Promise(function (resolveXObject, rejectXObject) {
                 if (!name) {
                   throw new _util.FormatError('XObject must be referred to by name.');
                 }
+
                 var xobj = xobjs.get(name);
+
                 if (!xobj) {
                   resolveXObject();
                   return;
                 }
+
                 if (!(0, _primitives.isStream)(xobj)) {
                   throw new _util.FormatError('XObject should be a stream');
                 }
+
                 var type = xobj.dict.get('Subtype');
+
                 if (!(0, _primitives.isName)(type)) {
                   throw new _util.FormatError('XObject should have a Name subtype');
                 }
+
                 if (type.name !== 'Form') {
                   skipEmptyXObjs[name] = true;
                   resolveXObject();
                   return;
                 }
+
                 var currentState = stateManager.state.clone();
                 var xObjStateManager = new StateManager(currentState);
                 var matrix = xobj.dict.getArray('Matrix');
+
                 if (Array.isArray(matrix) && matrix.length === 6) {
                   xObjStateManager.transform(matrix);
                 }
+
                 enqueueChunk();
                 var sinkWrapper = {
                   enqueueInvoked: false,
@@ -1488,9 +1878,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                   get desiredSize() {
                     return sink.desiredSize;
                   },
+
                   get ready() {
                     return sink.ready;
                   }
+
                 };
                 self.getTextContent({
                   stream: xobj,
@@ -1505,104 +1897,129 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
                   if (!sinkWrapper.enqueueInvoked) {
                     skipEmptyXObjs[name] = true;
                   }
+
                   resolveXObject();
                 }, rejectXObject);
-              }).catch(function (reason) {
+              })["catch"](function (reason) {
                 if (reason instanceof _util.AbortException) {
                   return;
                 }
+
                 if (self.options.ignoreErrors) {
-                  (0, _util.warn)('getTextContent - ignoring XObject: "' + reason + '".');
+                  (0, _util.warn)("getTextContent - ignoring XObject: \"".concat(reason, "\"."));
                   return;
                 }
+
                 throw reason;
               }));
               return;
+
             case _util.OPS.setGState:
               flushTextContentItem();
               var dictName = args[0];
               var extGState = resources.get('ExtGState');
+
               if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
                 break;
               }
+
               var gState = extGState.get(dictName.name);
+
               if (!(0, _primitives.isDict)(gState)) {
                 break;
               }
+
               var gStateFont = gState.get('Font');
+
               if (gStateFont) {
                 textState.fontName = null;
                 textState.fontSize = gStateFont[1];
                 next(handleSetFont(null, gStateFont[0]));
                 return;
               }
+
               break;
           }
+
           if (textContent.items.length >= sink.desiredSize) {
             stop = true;
             break;
           }
         }
+
         if (stop) {
           next(deferred);
           return;
         }
+
         flushTextContentItem();
         enqueueChunk();
         resolve();
-      }).catch(function (reason) {
+      })["catch"](function (reason) {
         if (reason instanceof _util.AbortException) {
           return;
         }
-        if (_this9.options.ignoreErrors) {
-          (0, _util.warn)('getTextContent - ignoring errors during task: ' + task.name);
+
+        if (_this8.options.ignoreErrors) {
+          (0, _util.warn)("getTextContent - ignoring errors during \"".concat(task.name, "\" ") + "task: \"".concat(reason, "\"."));
           flushTextContentItem();
           enqueueChunk();
           return;
         }
+
         throw reason;
       });
     },
-
     extractDataStructures: function PartialEvaluator_extractDataStructures(dict, baseDict, properties) {
-      var _this10 = this;
+      var _this9 = this;
 
-      var xref = this.xref;
+      var xref = this.xref,
+          cidToGidBytes;
       var toUnicode = dict.get('ToUnicode') || baseDict.get('ToUnicode');
       var toUnicodePromise = toUnicode ? this.readToUnicode(toUnicode) : Promise.resolve(undefined);
+
       if (properties.composite) {
         var cidSystemInfo = dict.get('CIDSystemInfo');
+
         if ((0, _primitives.isDict)(cidSystemInfo)) {
           properties.cidSystemInfo = {
-            registry: cidSystemInfo.get('Registry'),
-            ordering: cidSystemInfo.get('Ordering'),
+            registry: (0, _util.stringToPDFString)(cidSystemInfo.get('Registry')),
+            ordering: (0, _util.stringToPDFString)(cidSystemInfo.get('Ordering')),
             supplement: cidSystemInfo.get('Supplement')
           };
         }
+
         var cidToGidMap = dict.get('CIDToGIDMap');
+
         if ((0, _primitives.isStream)(cidToGidMap)) {
-          properties.cidToGidMap = this.readCidToGidMap(cidToGidMap);
+          cidToGidBytes = cidToGidMap.getBytes();
         }
       }
+
       var differences = [];
       var baseEncodingName = null;
       var encoding;
+
       if (dict.has('Encoding')) {
         encoding = dict.get('Encoding');
+
         if ((0, _primitives.isDict)(encoding)) {
           baseEncodingName = encoding.get('BaseEncoding');
           baseEncodingName = (0, _primitives.isName)(baseEncodingName) ? baseEncodingName.name : null;
+
           if (encoding.has('Differences')) {
             var diffEncoding = encoding.get('Differences');
             var index = 0;
+
             for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
               var data = xref.fetchIfRef(diffEncoding[j]);
+
               if ((0, _util.isNum)(data)) {
                 index = data;
               } else if ((0, _primitives.isName)(data)) {
                 differences[index++] = data.name;
               } else {
-                throw new _util.FormatError('Invalid entry in \'Differences\' array: ' + data);
+                throw new _util.FormatError("Invalid entry in 'Differences' array: ".concat(data));
               }
             }
           }
@@ -1611,21 +2028,26 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         } else {
           throw new _util.FormatError('Encoding is not a Name nor a Dict');
         }
+
         if (baseEncodingName !== 'MacRomanEncoding' && baseEncodingName !== 'MacExpertEncoding' && baseEncodingName !== 'WinAnsiEncoding') {
           baseEncodingName = null;
         }
       }
+
       if (baseEncodingName) {
         properties.defaultEncoding = (0, _encodings.getEncoding)(baseEncodingName).slice();
       } else {
         var isSymbolicFont = !!(properties.flags & _fonts.FontFlags.Symbolic);
         var isNonsymbolicFont = !!(properties.flags & _fonts.FontFlags.Nonsymbolic);
         encoding = _encodings.StandardEncoding;
+
         if (properties.type === 'TrueType' && !isNonsymbolicFont) {
           encoding = _encodings.WinAnsiEncoding;
         }
+
         if (isSymbolicFont) {
           encoding = _encodings.MacRomanEncoding;
+
           if (!properties.file) {
             if (/Symbol/i.test(properties.name)) {
               encoding = _encodings.SymbolSetEncoding;
@@ -1634,96 +2056,130 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
             }
           }
         }
+
         properties.defaultEncoding = encoding;
       }
+
       properties.differences = differences;
       properties.baseEncodingName = baseEncodingName;
       properties.hasEncoding = !!baseEncodingName || differences.length > 0;
       properties.dict = dict;
       return toUnicodePromise.then(function (toUnicode) {
         properties.toUnicode = toUnicode;
-        return _this10.buildToUnicode(properties);
+        return _this9.buildToUnicode(properties);
       }).then(function (toUnicode) {
         properties.toUnicode = toUnicode;
+
+        if (cidToGidBytes) {
+          properties.cidToGidMap = _this9.readCidToGidMap(cidToGidBytes, toUnicode);
+        }
+
         return properties;
       });
     },
     _buildSimpleFontToUnicode: function _buildSimpleFontToUnicode(properties) {
       (0, _util.assert)(!properties.composite, 'Must be a simple font.');
       var toUnicode = [],
-          charcode = void 0,
-          glyphName = void 0;
+          charcode,
+          glyphName;
       var encoding = properties.defaultEncoding.slice();
       var baseEncodingName = properties.baseEncodingName;
       var differences = properties.differences;
+
       for (charcode in differences) {
         glyphName = differences[charcode];
+
         if (glyphName === '.notdef') {
           continue;
         }
+
         encoding[charcode] = glyphName;
       }
+
       var glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+
       for (charcode in encoding) {
         glyphName = encoding[charcode];
+
         if (glyphName === '') {
           continue;
         } else if (glyphsUnicodeMap[glyphName] === undefined) {
           var code = 0;
+
           switch (glyphName[0]) {
             case 'G':
               if (glyphName.length === 3) {
-                code = parseInt(glyphName.substr(1), 16);
+                code = parseInt(glyphName.substring(1), 16);
               }
+
               break;
+
             case 'g':
               if (glyphName.length === 5) {
-                code = parseInt(glyphName.substr(1), 16);
+                code = parseInt(glyphName.substring(1), 16);
               }
+
               break;
+
             case 'C':
             case 'c':
               if (glyphName.length >= 3) {
-                code = +glyphName.substr(1);
+                code = +glyphName.substring(1);
               }
+
               break;
+
             default:
               var unicode = (0, _unicode.getUnicodeForGlyph)(glyphName, glyphsUnicodeMap);
+
               if (unicode !== -1) {
                 code = unicode;
               }
+
           }
+
           if (code) {
             if (baseEncodingName && code === +charcode) {
               var baseEncoding = (0, _encodings.getEncoding)(baseEncodingName);
+
               if (baseEncoding && (glyphName = baseEncoding[charcode])) {
                 toUnicode[charcode] = String.fromCharCode(glyphsUnicodeMap[glyphName]);
                 continue;
               }
             }
-            toUnicode[charcode] = String.fromCharCode(code);
+
+            toUnicode[charcode] = String.fromCodePoint(code);
           }
+
           continue;
         }
+
         toUnicode[charcode] = String.fromCharCode(glyphsUnicodeMap[glyphName]);
       }
+
       return new _fonts.ToUnicodeMap(toUnicode);
     },
     buildToUnicode: function buildToUnicode(properties) {
       properties.hasIncludedToUnicodeMap = !!properties.toUnicode && properties.toUnicode.length > 0;
+
       if (properties.hasIncludedToUnicodeMap) {
         if (!properties.composite && properties.hasEncoding) {
           properties.fallbackToUnicode = this._buildSimpleFontToUnicode(properties);
         }
+
         return Promise.resolve(properties.toUnicode);
       }
+
       if (!properties.composite) {
         return Promise.resolve(this._buildSimpleFontToUnicode(properties));
       }
+
       if (properties.composite && (properties.cMap.builtInCMap && !(properties.cMap instanceof _cmap.IdentityCMap) || properties.cidSystemInfo.registry === 'Adobe' && (properties.cidSystemInfo.ordering === 'GB1' || properties.cidSystemInfo.ordering === 'CNS1' || properties.cidSystemInfo.ordering === 'Japan1' || properties.cidSystemInfo.ordering === 'Korea1'))) {
         var registry = properties.cidSystemInfo.registry;
         var ordering = properties.cidSystemInfo.ordering;
+
         var ucs2CMapName = _primitives.Name.get(registry + '-' + ordering + '-UCS2');
+
         return _cmap.CMapFactory.create({
           encoding: ucs2CMapName,
           fetchBuiltInCMap: this.fetchBuiltInCMap,
@@ -1735,7 +2191,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
             if (cid > 0xffff) {
               throw new _util.FormatError('Max size of CID is 65,535');
             }
+
             var ucs2 = ucs2CMap.lookup(cid);
+
             if (ucs2) {
               toUnicode[charcode] = String.fromCharCode((ucs2.charCodeAt(0) << 8) + ucs2.charCodeAt(1));
             }
@@ -1743,11 +2201,12 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           return new _fonts.ToUnicodeMap(toUnicode);
         });
       }
+
       return Promise.resolve(new _fonts.IdentityToUnicodeMap(properties.firstChar, properties.lastChar));
     },
-
     readToUnicode: function PartialEvaluator_readToUnicode(toUnicode) {
       var cmapObj = toUnicode;
+
       if ((0, _primitives.isName)(cmapObj)) {
         return _cmap.CMapFactory.create({
           encoding: cmapObj,
@@ -1757,6 +2216,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           if (cmap instanceof _cmap.IdentityCMap) {
             return new _fonts.IdentityToUnicodeMap(0, 0xFFFF);
           }
+
           return new _fonts.ToUnicodeMap(cmap.getMap());
         });
       } else if ((0, _primitives.isStream)(cmapObj)) {
@@ -1768,37 +2228,46 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           if (cmap instanceof _cmap.IdentityCMap) {
             return new _fonts.IdentityToUnicodeMap(0, 0xFFFF);
           }
+
           var map = new Array(cmap.length);
           cmap.forEach(function (charCode, token) {
             var str = [];
+
             for (var k = 0; k < token.length; k += 2) {
               var w1 = token.charCodeAt(k) << 8 | token.charCodeAt(k + 1);
+
               if ((w1 & 0xF800) !== 0xD800) {
                 str.push(w1);
                 continue;
               }
+
               k += 2;
               var w2 = token.charCodeAt(k) << 8 | token.charCodeAt(k + 1);
               str.push(((w1 & 0x3ff) << 10) + (w2 & 0x3ff) + 0x10000);
             }
-            map[charCode] = String.fromCharCode.apply(String, str);
+
+            map[charCode] = String.fromCodePoint.apply(String, str);
           });
           return new _fonts.ToUnicodeMap(map);
         });
       }
+
       return Promise.resolve(null);
     },
-    readCidToGidMap: function PartialEvaluator_readCidToGidMap(cidToGidStream) {
-      var glyphsData = cidToGidStream.getBytes();
+    readCidToGidMap: function readCidToGidMap(glyphsData, toUnicode) {
       var result = [];
+
       for (var j = 0, jj = glyphsData.length; j < jj; j++) {
         var glyphID = glyphsData[j++] << 8 | glyphsData[j];
-        if (glyphID === 0) {
+        var code = j >> 1;
+
+        if (glyphID === 0 && !toUnicode.has(code)) {
           continue;
         }
-        var code = j >> 1;
+
         result[code] = glyphID;
       }
+
       return result;
     },
     extractWidths: function PartialEvaluator_extractWidths(dict, descriptor, properties) {
@@ -1808,39 +2277,47 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       var glyphsVMetrics = [];
       var defaultVMetrics;
       var i, ii, j, jj, start, code, widths;
+
       if (properties.composite) {
         defaultWidth = dict.has('DW') ? dict.get('DW') : 1000;
         widths = dict.get('W');
+
         if (widths) {
           for (i = 0, ii = widths.length; i < ii; i++) {
             start = xref.fetchIfRef(widths[i++]);
             code = xref.fetchIfRef(widths[i]);
+
             if (Array.isArray(code)) {
               for (j = 0, jj = code.length; j < jj; j++) {
                 glyphsWidths[start++] = xref.fetchIfRef(code[j]);
               }
             } else {
               var width = xref.fetchIfRef(widths[++i]);
+
               for (j = start; j <= code; j++) {
                 glyphsWidths[j] = width;
               }
             }
           }
         }
+
         if (properties.vertical) {
           var vmetrics = dict.getArray('DW2') || [880, -1000];
           defaultVMetrics = [vmetrics[1], defaultWidth * 0.5, vmetrics[0]];
           vmetrics = dict.get('W2');
+
           if (vmetrics) {
             for (i = 0, ii = vmetrics.length; i < ii; i++) {
               start = xref.fetchIfRef(vmetrics[i++]);
               code = xref.fetchIfRef(vmetrics[i]);
+
               if (Array.isArray(code)) {
                 for (j = 0, jj = code.length; j < jj; j++) {
                   glyphsVMetrics[start++] = [xref.fetchIfRef(code[j++]), xref.fetchIfRef(code[j++]), xref.fetchIfRef(code[j])];
                 }
               } else {
                 var vmetric = [xref.fetchIfRef(vmetrics[++i]), xref.fetchIfRef(vmetrics[++i]), xref.fetchIfRef(vmetrics[++i])];
+
                 for (j = start; j <= code; j++) {
                   glyphsVMetrics[j] = vmetric;
                 }
@@ -1851,14 +2328,18 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       } else {
         var firstChar = properties.firstChar;
         widths = dict.get('Widths');
+
         if (widths) {
           j = firstChar;
+
           for (i = 0, ii = widths.length; i < ii; i++) {
             glyphsWidths[j++] = xref.fetchIfRef(widths[i]);
           }
+
           defaultWidth = parseFloat(descriptor.get('MissingWidth')) || 0;
         } else {
           var baseFontName = dict.get('BaseFont');
+
           if ((0, _primitives.isName)(baseFontName)) {
             var metrics = this.getBaseFontMetrics(baseFontName.name);
             glyphsWidths = this.buildCharCodeToWidth(metrics.widths, properties);
@@ -1866,25 +2347,32 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           }
         }
       }
+
       var isMonospace = true;
       var firstWidth = defaultWidth;
+
       for (var glyph in glyphsWidths) {
         var glyphWidth = glyphsWidths[glyph];
+
         if (!glyphWidth) {
           continue;
         }
+
         if (!firstWidth) {
           firstWidth = glyphWidth;
           continue;
         }
+
         if (firstWidth !== glyphWidth) {
           isMonospace = false;
           break;
         }
       }
+
       if (isMonospace) {
         properties.flags |= _fonts.FontFlags.FixedPitch;
       }
+
       properties.defaultWidth = defaultWidth;
       properties.widths = glyphsWidths;
       properties.defaultVMetrics = defaultVMetrics;
@@ -1901,6 +2389,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       var stdFontMap = (0, _standard_fonts.getStdFontMap)();
       var lookupName = stdFontMap[name] || name;
       var Metrics = (0, _metrics.getMetrics)();
+
       if (!(lookupName in Metrics)) {
         if (this.isSerifFont(name)) {
           lookupName = 'Times-Roman';
@@ -1908,13 +2397,16 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           lookupName = 'Helvetica';
         }
       }
+
       var glyphWidths = Metrics[lookupName];
+
       if ((0, _util.isNum)(glyphWidths)) {
         defaultWidth = glyphWidths;
         monospace = true;
       } else {
         widths = glyphWidths();
       }
+
       return {
         defaultWidth: defaultWidth,
         monospace: monospace,
@@ -1925,50 +2417,65 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       var widths = Object.create(null);
       var differences = properties.differences;
       var encoding = properties.defaultEncoding;
+
       for (var charCode = 0; charCode < 256; charCode++) {
         if (charCode in differences && widthsByGlyphName[differences[charCode]]) {
           widths[charCode] = widthsByGlyphName[differences[charCode]];
           continue;
         }
+
         if (charCode in encoding && widthsByGlyphName[encoding[charCode]]) {
           widths[charCode] = widthsByGlyphName[encoding[charCode]];
           continue;
         }
       }
+
       return widths;
     },
     preEvaluateFont: function PartialEvaluator_preEvaluateFont(dict) {
       var baseDict = dict;
       var type = dict.get('Subtype');
+
       if (!(0, _primitives.isName)(type)) {
         throw new _util.FormatError('invalid font Subtype');
       }
+
       var composite = false;
       var uint8array;
+
       if (type.name === 'Type0') {
         var df = dict.get('DescendantFonts');
+
         if (!df) {
           throw new _util.FormatError('Descendant fonts are not specified');
         }
+
         dict = Array.isArray(df) ? this.xref.fetchIfRef(df[0]) : df;
         type = dict.get('Subtype');
+
         if (!(0, _primitives.isName)(type)) {
           throw new _util.FormatError('invalid font Subtype');
         }
+
         composite = true;
       }
+
       var descriptor = dict.get('FontDescriptor');
+
       if (descriptor) {
         var hash = new _murmurhash.MurmurHash3_64();
         var encoding = baseDict.getRaw('Encoding');
+
         if ((0, _primitives.isName)(encoding)) {
           hash.update(encoding.name);
         } else if ((0, _primitives.isRef)(encoding)) {
           hash.update(encoding.toString());
         } else if ((0, _primitives.isDict)(encoding)) {
           var keys = encoding.getKeys();
+
           for (var i = 0, ii = keys.length; i < ii; i++) {
             var entry = encoding.getRaw(keys[i]);
+
             if ((0, _primitives.isName)(entry)) {
               hash.update(entry.name);
             } else if ((0, _primitives.isRef)(entry)) {
@@ -1976,19 +2483,27 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
             } else if (Array.isArray(entry)) {
               var diffLength = entry.length,
                   diffBuf = new Array(diffLength);
+
               for (var j = 0; j < diffLength; j++) {
                 var diffEntry = entry[j];
+
                 if ((0, _primitives.isName)(diffEntry)) {
                   diffBuf[j] = diffEntry.name;
                 } else if ((0, _util.isNum)(diffEntry) || (0, _primitives.isRef)(diffEntry)) {
                   diffBuf[j] = diffEntry.toString();
                 }
               }
+
               hash.update(diffBuf.join());
             }
           }
         }
+
+        var firstChar = dict.get('FirstChar') || 0;
+        var lastChar = dict.get('LastChar') || (composite ? 0xFFFF : 0xFF);
+        hash.update("".concat(firstChar, "-").concat(lastChar));
         var toUnicode = dict.get('ToUnicode') || baseDict.get('ToUnicode');
+
         if ((0, _primitives.isStream)(toUnicode)) {
           var stream = toUnicode.str || toUnicode;
           uint8array = stream.buffer ? new Uint8Array(stream.buffer.buffer, 0, stream.bufferLength) : new Uint8Array(stream.bytes.buffer, stream.start, stream.end - stream.start);
@@ -1996,12 +2511,15 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         } else if ((0, _primitives.isName)(toUnicode)) {
           hash.update(toUnicode.name);
         }
+
         var widths = dict.get('Widths') || baseDict.get('Widths');
+
         if (widths) {
           uint8array = new Uint8Array(new Uint32Array(widths).buffer);
           hash.update(uint8array);
         }
       }
+
       return {
         descriptor: descriptor,
         dict: dict,
@@ -2012,7 +2530,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       };
     },
     translateFont: function PartialEvaluator_translateFont(preEvaluatedFont) {
-      var _this11 = this;
+      var _this10 = this;
 
       var baseDict = preEvaluatedFont.baseDict;
       var dict = preEvaluatedFont.dict;
@@ -2021,6 +2539,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       var type = preEvaluatedFont.type;
       var maxCharIndex = composite ? 0xFFFF : 0xFF;
       var properties;
+
       if (!descriptor) {
         if (type === 'Type3') {
           descriptor = new _primitives.Dict(null);
@@ -2028,9 +2547,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           descriptor.set('FontBBox', dict.getArray('FontBBox'));
         } else {
           var baseFontName = dict.get('BaseFont');
+
           if (!(0, _primitives.isName)(baseFontName)) {
             throw new _util.FormatError('Base font is not specified');
           }
+
           baseFontName = baseFontName.name.replace(/[,_]/g, '-');
           var metrics = this.getBaseFontMetrics(baseFontName);
           var fontNameWoStyle = baseFontName.split('-')[0];
@@ -2045,47 +2566,60 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
             lastChar: maxCharIndex
           };
           return this.extractDataStructures(dict, dict, properties).then(function (properties) {
-            properties.widths = _this11.buildCharCodeToWidth(metrics.widths, properties);
+            properties.widths = _this10.buildCharCodeToWidth(metrics.widths, properties);
             return new _fonts.Font(baseFontName, null, properties);
           });
         }
       }
+
       var firstChar = dict.get('FirstChar') || 0;
       var lastChar = dict.get('LastChar') || maxCharIndex;
       var fontName = descriptor.get('FontName');
       var baseFont = dict.get('BaseFont');
+
       if ((0, _util.isString)(fontName)) {
         fontName = _primitives.Name.get(fontName);
       }
+
       if ((0, _util.isString)(baseFont)) {
         baseFont = _primitives.Name.get(baseFont);
       }
+
       if (type !== 'Type3') {
         var fontNameStr = fontName && fontName.name;
         var baseFontStr = baseFont && baseFont.name;
+
         if (fontNameStr !== baseFontStr) {
-          (0, _util.info)('The FontDescriptor\'s FontName is "' + fontNameStr + '" but should be the same as the Font\'s BaseFont "' + baseFontStr + '"');
-          if (fontNameStr && baseFontStr && baseFontStr.indexOf(fontNameStr) === 0) {
+          (0, _util.info)("The FontDescriptor's FontName is \"".concat(fontNameStr, "\" but ") + "should be the same as the Font's BaseFont \"".concat(baseFontStr, "\"."));
+
+          if (fontNameStr && baseFontStr && baseFontStr.startsWith(fontNameStr)) {
             fontName = baseFont;
           }
         }
       }
+
       fontName = fontName || baseFont;
+
       if (!(0, _primitives.isName)(fontName)) {
         throw new _util.FormatError('invalid font name');
       }
+
       var fontFile = descriptor.get('FontFile', 'FontFile2', 'FontFile3');
+
       if (fontFile) {
         if (fontFile.dict) {
           var subtype = fontFile.dict.get('Subtype');
+
           if (subtype) {
             subtype = subtype.name;
           }
+
           var length1 = fontFile.dict.get('Length1');
           var length2 = fontFile.dict.get('Length2');
           var length3 = fontFile.dict.get('Length3');
         }
       }
+
       properties = {
         type: type,
         name: fontName.name,
@@ -2111,11 +2645,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         isType3Font: false
       };
       var cMapPromise;
+
       if (composite) {
         var cidEncoding = baseDict.get('Encoding');
+
         if ((0, _primitives.isName)(cidEncoding)) {
           properties.cidEncoding = cidEncoding.name;
         }
+
         cMapPromise = _cmap.CMapFactory.create({
           encoding: cidEncoding,
           fetchBuiltInCMap: this.fetchBuiltInCMap,
@@ -2127,19 +2664,65 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       } else {
         cMapPromise = Promise.resolve(undefined);
       }
+
       return cMapPromise.then(function () {
-        return _this11.extractDataStructures(dict, baseDict, properties);
+        return _this10.extractDataStructures(dict, baseDict, properties);
       }).then(function (properties) {
-        _this11.extractWidths(dict, descriptor, properties);
+        _this10.extractWidths(dict, descriptor, properties);
+
         if (type === 'Type3') {
           properties.isType3Font = true;
         }
+
         return new _fonts.Font(fontName.name, fontFile, properties);
       });
     }
   };
+
+  PartialEvaluator.buildFontPaths = function (font, glyphs, handler) {
+    function buildPath(fontChar) {
+      if (font.renderer.hasBuiltPath(fontChar)) {
+        return;
+      }
+
+      handler.send('commonobj', ["".concat(font.loadedName, "_path_").concat(fontChar), 'FontPath', font.renderer.getPathJs(fontChar)]);
+    }
+
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = glyphs[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var glyph = _step.value;
+        buildPath(glyph.fontChar);
+        var accent = glyph.accent;
+
+        if (accent && accent.fontChar) {
+          buildPath(accent.fontChar);
+        }
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator["return"] != null) {
+          _iterator["return"]();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+  };
+
   return PartialEvaluator;
 }();
+
+exports.PartialEvaluator = PartialEvaluator;
+
 var TranslatedFont = function TranslatedFontClosure() {
   function TranslatedFont(loadedName, font, dict) {
     this.loadedName = loadedName;
@@ -2148,25 +2731,39 @@ var TranslatedFont = function TranslatedFontClosure() {
     this.type3Loaded = null;
     this.sent = false;
   }
+
   TranslatedFont.prototype = {
     send: function send(handler) {
       if (this.sent) {
         return;
       }
-      var fontData = this.font.exportData();
-      handler.send('commonobj', [this.loadedName, 'Font', fontData]);
+
       this.sent = true;
+      handler.send('commonobj', [this.loadedName, 'Font', this.font.exportData()]);
+    },
+    fallback: function fallback(handler) {
+      if (!this.font.data) {
+        return;
+      }
+
+      this.font.disableFontFace = true;
+      var glyphs = this.font.glyphCacheValues;
+      PartialEvaluator.buildFontPaths(this.font, glyphs, handler);
     },
     loadType3Data: function loadType3Data(evaluator, resources, parentOperatorList, task) {
       if (!this.font.isType3Font) {
         throw new Error('Must be a Type3 font.');
       }
+
       if (this.type3Loaded) {
         return this.type3Loaded;
       }
+
       var type3Options = Object.create(evaluator.options);
       type3Options.ignoreErrors = false;
+      type3Options.nativeImageDecoderSupport = _util.NativeImageDecoding.NONE;
       var type3Evaluator = evaluator.clone(type3Options);
+      type3Evaluator.parsingType3Font = true;
       var translatedFont = this.font;
       var loadCharProcsPromise = Promise.resolve();
       var charProcs = this.dict.get('CharProcs');
@@ -2187,8 +2784,8 @@ var TranslatedFont = function TranslatedFontClosure() {
           }).then(function () {
             charProcOperatorList[key] = operatorList.getIR();
             parentOperatorList.addDependencies(operatorList.dependencies);
-          }).catch(function (reason) {
-            (0, _util.warn)('Type3 font resource "' + key + '" is not available.');
+          })["catch"](function (reason) {
+            (0, _util.warn)("Type3 font resource \"".concat(key, "\" is not available."));
             var operatorList = new _operator_list.OperatorList();
             charProcOperatorList[key] = operatorList.getIR();
           });
@@ -2198,6 +2795,7 @@ var TranslatedFont = function TranslatedFontClosure() {
       for (var i = 0, n = charProcKeys.length; i < n; ++i) {
         _loop2();
       }
+
       this.type3Loaded = loadCharProcsPromise.then(function () {
         translatedFont.charProcOperatorList = charProcOperatorList;
       });
@@ -2206,11 +2804,13 @@ var TranslatedFont = function TranslatedFontClosure() {
   };
   return TranslatedFont;
 }();
+
 var StateManager = function StateManagerClosure() {
   function StateManager(initialState) {
     this.state = initialState;
     this.stateStack = [];
   }
+
   StateManager.prototype = {
     save: function save() {
       var old = this.state;
@@ -2219,6 +2819,7 @@ var StateManager = function StateManagerClosure() {
     },
     restore: function restore() {
       var prev = this.stateStack.pop();
+
       if (prev) {
         this.state = prev;
       }
@@ -2229,6 +2830,7 @@ var StateManager = function StateManagerClosure() {
   };
   return StateManager;
 }();
+
 var TextState = function TextStateClosure() {
   function TextState() {
     this.ctm = new Float32Array(_util.IDENTITY_MATRIX);
@@ -2244,6 +2846,7 @@ var TextState = function TextStateClosure() {
     this.textHScale = 1;
     this.textRise = 0;
   }
+
   TextState.prototype = {
     setTextMatrix: function TextState_setTextMatrix(a, b, c, d, e, f) {
       var m = this.textMatrix;
@@ -2275,21 +2878,28 @@ var TextState = function TextStateClosure() {
     },
     calcTextLineMatrixAdvance: function TextState_calcTextLineMatrixAdvance(a, b, c, d, e, f) {
       var font = this.font;
+
       if (!font) {
         return null;
       }
+
       var m = this.textLineMatrix;
+
       if (!(a === m[0] && b === m[1] && c === m[2] && d === m[3])) {
         return null;
       }
+
       var txDiff = e - m[4],
           tyDiff = f - m[5];
+
       if (font.vertical && txDiff !== 0 || !font.vertical && tyDiff !== 0) {
         return null;
       }
+
       var tx,
           ty,
           denominator = a * d - b * c;
+
       if (font.vertical) {
         tx = -tyDiff * c / denominator;
         ty = tyDiff * a / denominator;
@@ -2297,6 +2907,7 @@ var TextState = function TextStateClosure() {
         tx = txDiff * d / denominator;
         ty = -txDiff * b / denominator;
       }
+
       return {
         width: tx,
         height: ty,
@@ -2321,6 +2932,7 @@ var TextState = function TextStateClosure() {
   };
   return TextState;
 }();
+
 var EvalState = function EvalStateClosure() {
   function EvalState() {
     this.ctm = new Float32Array(_util.IDENTITY_MATRIX);
@@ -2329,6 +2941,7 @@ var EvalState = function EvalStateClosure() {
     this.fillColorSpace = _colorspace.ColorSpace.singletons.gray;
     this.strokeColorSpace = _colorspace.ColorSpace.singletons.gray;
   }
+
   EvalState.prototype = {
     clone: function CanvasExtraState_clone() {
       return Object.create(this);
@@ -2336,8 +2949,9 @@ var EvalState = function EvalStateClosure() {
   };
   return EvalState;
 }();
+
 var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() {
-  var getOPMap = (0, _util.getLookupTableFactory)(function (t) {
+  var getOPMap = (0, _core_utils.getLookupTableFactory)(function (t) {
     t['w'] = {
       id: _util.OPS.setLineWidth,
       numArgs: 1,
@@ -2714,68 +3328,98 @@ var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() {
     t['nul'] = null;
     t['null'] = null;
   });
+  var MAX_INVALID_PATH_OPS = 20;
+
   function EvaluatorPreprocessor(stream, xref, stateManager) {
     this.opMap = getOPMap();
-    this.parser = new _parser.Parser(new _parser.Lexer(stream, this.opMap), false, xref);
+    this.parser = new _parser.Parser({
+      lexer: new _parser.Lexer(stream, this.opMap),
+      xref: xref
+    });
     this.stateManager = stateManager;
     this.nonProcessedArgs = [];
+    this._numInvalidPathOPS = 0;
   }
+
   EvaluatorPreprocessor.prototype = {
     get savedStatesDepth() {
       return this.stateManager.stateStack.length;
     },
+
     read: function EvaluatorPreprocessor_read(operation) {
       var args = operation.args;
+
       while (true) {
         var obj = this.parser.getObj();
+
         if ((0, _primitives.isCmd)(obj)) {
           var cmd = obj.cmd;
           var opSpec = this.opMap[cmd];
+
           if (!opSpec) {
-            (0, _util.warn)('Unknown command "' + cmd + '"');
+            (0, _util.warn)("Unknown command \"".concat(cmd, "\"."));
             continue;
           }
+
           var fn = opSpec.id;
           var numArgs = opSpec.numArgs;
           var argsLength = args !== null ? args.length : 0;
+
           if (!opSpec.variableArgs) {
             if (argsLength !== numArgs) {
               var nonProcessedArgs = this.nonProcessedArgs;
+
               while (argsLength > numArgs) {
                 nonProcessedArgs.push(args.shift());
                 argsLength--;
               }
+
               while (argsLength < numArgs && nonProcessedArgs.length !== 0) {
                 if (args === null) {
                   args = [];
                 }
+
                 args.unshift(nonProcessedArgs.pop());
                 argsLength++;
               }
             }
+
             if (argsLength < numArgs) {
-              (0, _util.warn)('Skipping command ' + fn + ': expected ' + numArgs + ' args, but received ' + argsLength + ' args.');
+              var partialMsg = "command ".concat(cmd, ": expected ").concat(numArgs, " args, ") + "but received ".concat(argsLength, " args.");
+
+              if (fn >= _util.OPS.moveTo && fn <= _util.OPS.endPath && ++this._numInvalidPathOPS > MAX_INVALID_PATH_OPS) {
+                throw new _util.FormatError("Invalid ".concat(partialMsg));
+              }
+
+              (0, _util.warn)("Skipping ".concat(partialMsg));
+
               if (args !== null) {
                 args.length = 0;
               }
+
               continue;
             }
           } else if (argsLength > numArgs) {
-            (0, _util.info)('Command ' + fn + ': expected [0,' + numArgs + '] args, but received ' + argsLength + ' args.');
+            (0, _util.info)("Command ".concat(cmd, ": expected [0, ").concat(numArgs, "] args, ") + "but received ".concat(argsLength, " args."));
           }
+
           this.preprocessCommand(fn, args);
           operation.fn = fn;
           operation.args = args;
           return true;
         }
+
         if ((0, _primitives.isEOF)(obj)) {
           return false;
         }
+
         if (obj !== null) {
           if (args === null) {
             args = [];
           }
+
           args.push(obj);
+
           if (args.length > 33) {
             throw new _util.FormatError('Too many arguments');
           }
@@ -2787,9 +3431,11 @@ var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() {
         case _util.OPS.save:
           this.stateManager.save();
           break;
+
         case _util.OPS.restore:
           this.stateManager.restore();
           break;
+
         case _util.OPS.transform:
           this.stateManager.transform(args);
           break;
@@ -2797,5 +3443,4 @@ var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() {
     }
   };
   return EvaluatorPreprocessor;
-}();
-exports.PartialEvaluator = PartialEvaluator;
+}();