akira
/
pdfjs-dist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PDF.js version 1.8.484 - See mozilla/pdf.js@e2ca894fec53893fe7afbefda4a115698e37b4eb

master v1.8.484
pdfjsbot 8 years ago
parent
2f69d70e1f
commit
c7ae56e6b3
23 changed files with 1383 additions and 811 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bower.json
  2. 367
      build/pdf.combined.js
  3. 2
      build/pdf.combined.js.map
  4. 206
      build/pdf.js
  5. 2
      build/pdf.js.map
  6. 16
      build/pdf.min.js
  7. 180
      build/pdf.worker.js
  8. 2
      build/pdf.worker.js.map
  9. 30
      build/pdf.worker.min.js
  10. 4
      lib/core/document.js
  11. 145
      lib/core/evaluator.js
  12. 14
      lib/core/worker.js
  13. 44
      lib/display/api.js
  14. 4
      lib/display/global.js
  15. 141
      lib/display/text_layer.js
  16. 4
      lib/pdf.js
  17. 4
      lib/pdf.worker.js
  18. 13
      lib/shared/util.js
  19. 9
      lib/web/pdf_page_view.js
  20. 33
      lib/web/text_layer_builder.js
  21. 2
      package.json
  22. 42
      web/pdf_viewer.js
  23. 2
      web/pdf_viewer.js.map

2
bower.json
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "1.8.482",
"version": "1.8.484",
"main": [
"build/pdf.js",
"build/pdf.worker.js"

367
build/pdf.combined.js
Unescape View File

@ -1138,7 +1138,8 @@ MessageHandler.prototype = { @@ -1138,7 +1138,8 @@ MessageHandler.prototype = {
var startCapability = createPromiseCapability();
_this2.streamControllers[streamId] = {
controller: controller,
startCall: startCapability
startCall: startCapability,
isClosed: false
};
_this2.postMessage({
sourceName: sourceName,
@ -1165,6 +1166,7 @@ MessageHandler.prototype = { @@ -1165,6 +1166,7 @@ MessageHandler.prototype = {
cancel: function cancel(reason) {
var cancelCapability = createPromiseCapability();
_this2.streamControllers[streamId].cancelCall = cancelCapability;
_this2.streamControllers[streamId].isClosed = true;
_this2.postMessage({
sourceName: sourceName,
targetName: targetName,
@ -1310,9 +1312,15 @@ MessageHandler.prototype = { @@ -1310,9 +1312,15 @@ MessageHandler.prototype = {
});
break;
case 'enqueue':
if (!this.streamControllers[data.streamId].isClosed) {
this.streamControllers[data.streamId].controller.enqueue(data.chunk);
}
break;
case 'close':
if (this.streamControllers[data.streamId].isClosed) {
break;
}
this.streamControllers[data.streamId].isClosed = true;
this.streamControllers[data.streamId].controller.close();
deleteStreamController();
break;
@ -1325,6 +1333,9 @@ MessageHandler.prototype = { @@ -1325,6 +1333,9 @@ MessageHandler.prototype = {
deleteStreamController();
break;
case 'cancel':
if (!this.streamSinks[data.streamId]) {
break;
}
resolveCall(this.streamSinks[data.streamId].onCancel, [data.reason]).then(function () {
sendStreamResponse({
stream: 'cancel_complete',
@ -12209,12 +12220,46 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -12209,12 +12220,46 @@ var PDFPageProxy = function PDFPageProxyClosure() {
}
return intentState.opListReadCapability.promise;
},
getTextContent: function PDFPageProxy_getTextContent(params) {
params = params || {};
return this.transport.messageHandler.sendWithPromise('GetTextContent', {
streamTextContent: function streamTextContent() {
var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var TEXT_CONTENT_CHUNK_SIZE = 100;
return this.transport.messageHandler.sendWithStream('GetTextContent', {
pageIndex: this.pageNumber - 1,
normalizeWhitespace: params.normalizeWhitespace === true,
combineTextItems: params.disableCombineTextItems !== true
}, {
highWaterMark: TEXT_CONTENT_CHUNK_SIZE,
size: function size(textContent) {
return textContent.items.length;
}
});
},
getTextContent: function PDFPageProxy_getTextContent(params) {
params = params || {};
var readableStream = this.streamTextContent(params);
return new Promise(function (resolve, reject) {
function pump() {
reader.read().then(function (_ref) {
var value = _ref.value,
done = _ref.done;
if (done) {
resolve(textContent);
return;
}
_util.Util.extendObj(textContent.styles, value.styles);
_util.Util.appendToArray(textContent.items, value.items);
pump();
}, reject);
}
var reader = readableStream.getReader();
var textContent = {
items: [],
styles: Object.create(null)
};
pump();
});
},
_destroy: function PDFPageProxy_destroy() {
@ -13080,8 +13125,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() { @@ -13080,8 +13125,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
}();
var version, build;
{
exports.version = version = '1.8.482';
exports.build = build = 'd1567a94';
exports.version = version = '1.8.484';
exports.build = build = 'e2ca894f';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
@ -14156,6 +14201,9 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -14156,6 +14201,9 @@ var renderTextLayer = function renderTextLayerClosure() {
}
}
task._textDivProperties.set(textDiv, textDivProperties);
if (task._textContentStream) {
task._layoutText(textDiv);
}
if (task._enhanceTextSelection) {
var angleCos = 1,
angleSin = 0;
@ -14187,7 +14235,6 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -14187,7 +14235,6 @@ var renderTextLayer = function renderTextLayerClosure() {
if (task._canceled) {
return;
}
var textLayerFrag = task._container;
var textDivs = task._textDivs;
var capability = task._capability;
var textDivsLength = textDivs.length;
@ -14196,38 +14243,10 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -14196,38 +14243,10 @@ var renderTextLayer = function renderTextLayerClosure() {
capability.resolve();
return;
}
var canvas = document.createElement('canvas');
var ctx = canvas.getContext('2d', { alpha: false });
var lastFontSize;
var lastFontFamily;
if (!task._textContentStream) {
for (var i = 0; i < textDivsLength; i++) {
var textDiv = textDivs[i];
var textDivProperties = task._textDivProperties.get(textDiv);
if (textDivProperties.isWhitespace) {
continue;
task._layoutText(textDivs[i]);
}
var fontSize = textDiv.style.fontSize;
var fontFamily = textDiv.style.fontFamily;
if (fontSize !== lastFontSize || fontFamily !== lastFontFamily) {
ctx.font = fontSize + ' ' + fontFamily;
lastFontSize = fontSize;
lastFontFamily = fontFamily;
}
var width = ctx.measureText(textDiv.textContent).width;
textLayerFrag.appendChild(textDiv);
var transform = '';
if (textDivProperties.canvasWidth !== 0 && width > 0) {
textDivProperties.scale = textDivProperties.canvasWidth / width;
transform = 'scaleX(' + textDivProperties.scale + ')';
}
if (textDivProperties.angle !== 0) {
transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
}
if (transform !== '') {
textDivProperties.originalTransform = transform;
_dom_utils.CustomStyle.setProp('transform', textDiv, transform);
}
task._textDivProperties.set(textDiv, textDivProperties);
}
task._renderingDone = true;
capability.resolve();
@ -14457,24 +14476,42 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -14457,24 +14476,42 @@ var renderTextLayer = function renderTextLayerClosure() {
}
});
}
function TextLayerRenderTask(textContent, container, viewport, textDivs, enhanceTextSelection) {
function TextLayerRenderTask(_ref) {
var textContent = _ref.textContent,
textContentStream = _ref.textContentStream,
container = _ref.container,
viewport = _ref.viewport,
textDivs = _ref.textDivs,
textContentItemsStr = _ref.textContentItemsStr,
enhanceTextSelection = _ref.enhanceTextSelection;
this._textContent = textContent;
this._textContentStream = textContentStream;
this._container = container;
this._viewport = viewport;
this._textDivs = textDivs || [];
this._textContentItemsStr = textContentItemsStr || [];
this._enhanceTextSelection = !!enhanceTextSelection;
this._reader = null;
this._layoutTextLastFontSize = null;
this._layoutTextLastFontFamily = null;
this._layoutTextCtx = null;
this._textDivProperties = new WeakMap();
this._renderingDone = false;
this._canceled = false;
this._capability = (0, _util.createPromiseCapability)();
this._renderTimer = null;
this._bounds = [];
this._enhanceTextSelection = !!enhanceTextSelection;
}
TextLayerRenderTask.prototype = {
get promise() {
return this._capability.promise;
},
cancel: function TextLayer_cancel() {
if (this._reader) {
this._reader.cancel();
this._reader = null;
}
this._canceled = true;
if (this._renderTimer !== null) {
clearTimeout(this._renderTimer);
@ -14482,22 +14519,85 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -14482,22 +14519,85 @@ var renderTextLayer = function renderTextLayerClosure() {
}
this._capability.reject('canceled');
},
_processItems: function _processItems(items, styleCache) {
for (var i = 0, len = items.length; i < len; i++) {
this._textContentItemsStr.push(items[i].str);
appendText(this, items[i], styleCache);
}
},
_layoutText: function _layoutText(textDiv) {
var textLayerFrag = this._container;
var textDivProperties = this._textDivProperties.get(textDiv);
if (textDivProperties.isWhitespace) {
return;
}
var fontSize = textDiv.style.fontSize;
var fontFamily = textDiv.style.fontFamily;
if (fontSize !== this._layoutTextLastFontSize || fontFamily !== this._layoutTextLastFontFamily) {
this._layoutTextCtx.font = fontSize + ' ' + fontFamily;
this._lastFontSize = fontSize;
this._lastFontFamily = fontFamily;
}
var width = this._layoutTextCtx.measureText(textDiv.textContent).width;
var transform = '';
if (textDivProperties.canvasWidth !== 0 && width > 0) {
textDivProperties.scale = textDivProperties.canvasWidth / width;
transform = 'scaleX(' + textDivProperties.scale + ')';
}
if (textDivProperties.angle !== 0) {
transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
}
if (transform !== '') {
textDivProperties.originalTransform = transform;
_dom_utils.CustomStyle.setProp('transform', textDiv, transform);
}
this._textDivProperties.set(textDiv, textDivProperties);
textLayerFrag.appendChild(textDiv);
},
_render: function TextLayer_render(timeout) {
var _this = this;
var capability = (0, _util.createPromiseCapability)();
var styleCache = Object.create(null);
var canvas = document.createElement('canvas');
this._layoutTextCtx = canvas.getContext('2d', { alpha: false });
if (this._textContent) {
var textItems = this._textContent.items;
var textStyles = this._textContent.styles;
for (var i = 0, len = textItems.length; i < len; i++) {
appendText(this, textItems[i], textStyles);
this._processItems(textItems, textStyles);
capability.resolve();
} else if (this._textContentStream) {
var pump = function pump() {
_this._reader.read().then(function (_ref2) {
var value = _ref2.value,
done = _ref2.done;
if (done) {
capability.resolve();
return;
}
_util.Util.extendObj(styleCache, value.styles);
_this._processItems(value.items, styleCache);
pump();
}, capability.reject);
};
this._reader = this._textContentStream.getReader();
pump();
} else {
throw new Error('Neither "textContent" nor "textContentStream"' + ' parameters specified.');
}
capability.promise.then(function () {
styleCache = null;
if (!timeout) {
render(this);
render(_this);
} else {
this._renderTimer = setTimeout(function () {
_this._renderTimer = setTimeout(function () {
render(_this);
_this._renderTimer = null;
}, timeout);
}
}, this._capability.reject);
},
expandTextDivs: function TextLayer_expandTextDivs(expandDivs) {
if (!this._enhanceTextSelection || !this._renderingDone) {
@ -14550,7 +14650,15 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -14550,7 +14650,15 @@ var renderTextLayer = function renderTextLayerClosure() {
}
};
function renderTextLayer(renderParameters) {
var task = new TextLayerRenderTask(renderParameters.textContent, renderParameters.container, renderParameters.viewport, renderParameters.textDivs, renderParameters.enhanceTextSelection);
var task = new TextLayerRenderTask({
textContent: renderParameters.textContent,
textContentStream: renderParameters.textContentStream,
container: renderParameters.container,
viewport: renderParameters.viewport,
textDivs: renderParameters.textDivs,
textContentItemsStr: renderParameters.textContentItemsStr,
enhanceTextSelection: renderParameters.enhanceTextSelection
});
task._render(renderParameters.timeout);
return task;
}
@ -18392,6 +18500,8 @@ Object.defineProperty(exports, "__esModule", { @@ -18392,6 +18500,8 @@ Object.defineProperty(exports, "__esModule", {
});
exports.PartialEvaluator = exports.OperatorList = undefined;
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
var _util = __w_pdfjs_require__(0);
var _cmap = __w_pdfjs_require__(31);
@ -19350,7 +19460,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -19350,7 +19460,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
_ref3$normalizeWhites = _ref3.normalizeWhitespace,
normalizeWhitespace = _ref3$normalizeWhites === undefined ? false : _ref3$normalizeWhites,
_ref3$combineTextItem = _ref3.combineTextItems,
combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem;
combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem,
sink = _ref3.sink,
_ref3$seenStyles = _ref3.seenStyles,
seenStyles = _ref3$seenStyles === undefined ? Object.create(null) : _ref3$seenStyles;
resources = resources || _primitives.Dict.empty;
stateManager = stateManager || new StateManager(new TextState());
@ -19382,7 +19495,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -19382,7 +19495,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var self = this;
var xref = this.xref;
var xobjs = null;
var xobjsCache = Object.create(null);
var skipEmptyXObjs = Object.create(null);
var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
var textState;
function ensureTextContentItem() {
@ -19390,7 +19503,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -19390,7 +19503,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
return textContentItem;
}
var font = textState.font;
if (!(font.loadedName in textContent.styles)) {
if (!(font.loadedName in seenStyles)) {
seenStyles[font.loadedName] = true;
textContent.styles[font.loadedName] = {
fontFamily: font.fallbackName,
ascent: font.ascent,
@ -19545,10 +19659,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -19545,10 +19659,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
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) {
promise.then(function () {
enqueueChunk();
Promise.all([promise, sink.ready]).then(function () {
try {
promiseBody(resolve, reject);
} catch (ex) {
@ -19571,10 +19694,29 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -19571,10 +19694,29 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var fn = operation.fn;
args = operation.args;
var advance, diff;
var fontNameArg, fontSizeArg;
var isSameTextLine;
var items;
var offset;
var j, jj;
var breakTextRun;
var name;
var xobj;
var type;
var currentState;
var xObjStateManager;
var matrix;
var dictName;
var extGState;
var gState;
var gStateFont;
var _ret2 = function () {
switch (fn | 0) {
case _util.OPS.setFont:
var fontNameArg = args[0].name,
fontNameArg = args[0].name;
fontSizeArg = args[1];
if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
break;
}
@ -19582,7 +19724,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -19582,7 +19724,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textState.fontName = fontNameArg;
textState.fontSize = fontSizeArg;
next(handleSetFont(fontNameArg, null));
return;
return {
v: void 0
};
case _util.OPS.setTextRise:
flushTextContentItem();
textState.textRise = args[0];
@ -19596,7 +19740,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -19596,7 +19740,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textState.leading = args[0];
break;
case _util.OPS.moveText:
var isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
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]);
@ -19646,15 +19791,16 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -19646,15 +19791,16 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
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++) {
items = args[0];
for (j = 0, jj = items.length; j < jj; j++) {
if (typeof items[j] === 'string') {
buildTextContentItem(items[j]);
} else if ((0, _util.isNum)(items[j])) {
ensureTextContentItem();
advance = items[j] * textState.fontSize / 1000;
var breakTextRun = false;
breakTextRun = false;
if (textState.font.vertical) {
offset = advance;
textState.translateTextMatrix(0, offset);
@ -19702,78 +19848,109 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -19702,78 +19848,109 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
if (!xobjs) {
xobjs = resources.get('XObject') || _primitives.Dict.empty;
}
var name = args[0].name;
if (xobjsCache.key === name) {
if (xobjsCache.texts) {
_util.Util.appendToArray(textContent.items, xobjsCache.texts.items);
_util.Util.extendObj(textContent.styles, xobjsCache.texts.styles);
}
name = args[0].name;
if (name in skipEmptyXObjs) {
break;
}
var xobj = xobjs.get(name);
xobj = xobjs.get(name);
if (!xobj) {
break;
}
(0, _util.assert)((0, _primitives.isStream)(xobj), 'XObject should be a stream');
var type = xobj.dict.get('Subtype');
type = xobj.dict.get('Subtype');
(0, _util.assert)((0, _primitives.isName)(type), 'XObject should have a Name subtype');
if (type.name !== 'Form') {
xobjsCache.key = name;
xobjsCache.texts = null;
skipEmptyXObjs[name] = true;
break;
}
var currentState = stateManager.state.clone();
var xObjStateManager = new StateManager(currentState);
var matrix = xobj.dict.getArray('Matrix');
currentState = stateManager.state.clone();
xObjStateManager = new StateManager(currentState);
matrix = xobj.dict.getArray('Matrix');
if ((0, _util.isArray)(matrix) && matrix.length === 6) {
xObjStateManager.transform(matrix);
}
enqueueChunk();
var sinkWrapper = {
enqueueInvoked: false,
enqueue: function enqueue(chunk, size) {
this.enqueueInvoked = true;
sink.enqueue(chunk, size);
},
get desiredSize() {
return sink.desiredSize;
},
get ready() {
return sink.ready;
}
};
next(self.getTextContent({
stream: xobj,
task: task,
resources: xobj.dict.get('Resources') || resources,
stateManager: xObjStateManager,
normalizeWhitespace: normalizeWhitespace,
combineTextItems: combineTextItems
}).then(function (formTextContent) {
_util.Util.appendToArray(textContent.items, formTextContent.items);
_util.Util.extendObj(textContent.styles, formTextContent.styles);
xobjsCache.key = name;
xobjsCache.texts = formTextContent;
combineTextItems: combineTextItems,
sink: sinkWrapper,
seenStyles: seenStyles
}).then(function () {
if (!sinkWrapper.enqueueInvoked) {
skipEmptyXObjs[name] = true;
}
}));
return;
return {
v: void 0
};
case _util.OPS.setGState:
flushTextContentItem();
var dictName = args[0];
var extGState = resources.get('ExtGState');
dictName = args[0];
extGState = resources.get('ExtGState');
if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
break;
}
var gState = extGState.get(dictName.name);
gState = extGState.get(dictName.name);
if (!(0, _primitives.isDict)(gState)) {
break;
}
var gStateFont = gState.get('Font');
gStateFont = gState.get('Font');
if (gStateFont) {
textState.fontName = null;
textState.fontSize = gStateFont[1];
next(handleSetFont(null, gStateFont[0]));
return;
return {
v: void 0
};
}
break;
}
}();
if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
if (textContent.items.length >= sink.desiredSize) {
stop = true;
break;
}
}
if (stop) {
next(deferred);
return;
}
flushTextContentItem();
resolve(textContent);
enqueueChunk();
resolve();
}).catch(function (reason) {
if (_this9.options.ignoreErrors) {
(0, _util.warn)('getTextContent - ignoring errors during task: ' + task.name);
flushTextContentItem();
return textContent;
enqueueChunk();
return;
}
throw reason;
});
@ -27884,27 +28061,31 @@ var WorkerMessageHandler = { @@ -27884,27 +28061,31 @@ var WorkerMessageHandler = {
});
});
}, this);
handler.on('GetTextContent', function wphExtractText(data) {
handler.on('GetTextContent', function wphExtractText(data, sink) {
var pageIndex = data.pageIndex;
return pdfManager.getPage(pageIndex).then(function (page) {
sink.onPull = function (desiredSize) {};
sink.onCancel = function (reason) {};
pdfManager.getPage(pageIndex).then(function (page) {
var task = new WorkerTask('GetTextContent: page ' + pageIndex);
startWorkerTask(task);
var pageNum = pageIndex + 1;
var start = Date.now();
return page.extractTextContent({
page.extractTextContent({
handler: handler,
task: task,
sink: sink,
normalizeWhitespace: data.normalizeWhitespace,
combineTextItems: data.combineTextItems
}).then(function (textContent) {
}).then(function () {
finishWorkerTask(task);
(0, _util.info)('text indexing: page=' + pageNum + ' - time=' + (Date.now() - start) + 'ms');
return textContent;
sink.close();
}, function (reason) {
finishWorkerTask(task);
if (task.terminated) {
return;
}
sink.error(reason);
throw reason;
});
});
@ -28436,8 +28617,8 @@ if (!_util.globalScope.PDFJS) { @@ -28436,8 +28617,8 @@ if (!_util.globalScope.PDFJS) {
}
var PDFJS = _util.globalScope.PDFJS;
{
PDFJS.version = '1.8.482';
PDFJS.build = 'd1567a94';
PDFJS.version = '1.8.484';
PDFJS.build = 'e2ca894f';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {
@ -33423,6 +33604,7 @@ var Page = function PageClosure() { @@ -33423,6 +33604,7 @@ var Page = function PageClosure() {
var handler = _ref6.handler,
task = _ref6.task,
normalizeWhitespace = _ref6.normalizeWhitespace,
sink = _ref6.sink,
combineTextItems = _ref6.combineTextItems;
var contentStreamPromise = this.pdfManager.ensure(this, 'getContentStream');
@ -33447,7 +33629,8 @@ var Page = function PageClosure() { @@ -33447,7 +33629,8 @@ var Page = function PageClosure() {
task: task,
resources: _this3.resources,
normalizeWhitespace: normalizeWhitespace,
combineTextItems: combineTextItems
combineTextItems: combineTextItems,
sink: sink
});
});
},
@ -47054,8 +47237,8 @@ exports.TilingPattern = TilingPattern; @@ -47054,8 +47237,8 @@ exports.TilingPattern = TilingPattern;
"use strict";
var pdfjsVersion = '1.8.482';
var pdfjsBuild = 'd1567a94';
var pdfjsVersion = '1.8.484';
var pdfjsBuild = 'e2ca894f';
var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(26);
var pdfjsDisplayAPI = __w_pdfjs_require__(10);

2
build/pdf.combined.js.map
View File

File diff suppressed because one or more lines are too long

206
build/pdf.js
Unescape View File

@ -1138,7 +1138,8 @@ MessageHandler.prototype = { @@ -1138,7 +1138,8 @@ MessageHandler.prototype = {
var startCapability = createPromiseCapability();
_this2.streamControllers[streamId] = {
controller: controller,
startCall: startCapability
startCall: startCapability,
isClosed: false
};
_this2.postMessage({
sourceName: sourceName,
@ -1165,6 +1166,7 @@ MessageHandler.prototype = { @@ -1165,6 +1166,7 @@ MessageHandler.prototype = {
cancel: function cancel(reason) {
var cancelCapability = createPromiseCapability();
_this2.streamControllers[streamId].cancelCall = cancelCapability;
_this2.streamControllers[streamId].isClosed = true;
_this2.postMessage({
sourceName: sourceName,
targetName: targetName,
@ -1310,9 +1312,15 @@ MessageHandler.prototype = { @@ -1310,9 +1312,15 @@ MessageHandler.prototype = {
});
break;
case 'enqueue':
if (!this.streamControllers[data.streamId].isClosed) {
this.streamControllers[data.streamId].controller.enqueue(data.chunk);
}
break;
case 'close':
if (this.streamControllers[data.streamId].isClosed) {
break;
}
this.streamControllers[data.streamId].isClosed = true;
this.streamControllers[data.streamId].controller.close();
deleteStreamController();
break;
@ -1325,6 +1333,9 @@ MessageHandler.prototype = { @@ -1325,6 +1333,9 @@ MessageHandler.prototype = {
deleteStreamController();
break;
case 'cancel':
if (!this.streamSinks[data.streamId]) {
break;
}
resolveCall(this.streamSinks[data.streamId].onCancel, [data.reason]).then(function () {
sendStreamResponse({
stream: 'cancel_complete',
@ -2853,12 +2864,46 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -2853,12 +2864,46 @@ var PDFPageProxy = function PDFPageProxyClosure() {
}
return intentState.opListReadCapability.promise;
},
getTextContent: function PDFPageProxy_getTextContent(params) {
params = params || {};
return this.transport.messageHandler.sendWithPromise('GetTextContent', {
streamTextContent: function streamTextContent() {
var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var TEXT_CONTENT_CHUNK_SIZE = 100;
return this.transport.messageHandler.sendWithStream('GetTextContent', {
pageIndex: this.pageNumber - 1,
normalizeWhitespace: params.normalizeWhitespace === true,
combineTextItems: params.disableCombineTextItems !== true
}, {
highWaterMark: TEXT_CONTENT_CHUNK_SIZE,
size: function size(textContent) {
return textContent.items.length;
}
});
},
getTextContent: function PDFPageProxy_getTextContent(params) {
params = params || {};
var readableStream = this.streamTextContent(params);
return new Promise(function (resolve, reject) {
function pump() {
reader.read().then(function (_ref) {
var value = _ref.value,
done = _ref.done;
if (done) {
resolve(textContent);
return;
}
_util.Util.extendObj(textContent.styles, value.styles);
_util.Util.appendToArray(textContent.items, value.items);
pump();
}, reject);
}
var reader = readableStream.getReader();
var textContent = {
items: [],
styles: Object.create(null)
};
pump();
});
},
_destroy: function PDFPageProxy_destroy() {
@ -3809,8 +3854,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() { @@ -3809,8 +3854,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
}();
var version, build;
{
exports.version = version = '1.8.482';
exports.build = build = 'd1567a94';
exports.version = version = '1.8.484';
exports.build = build = 'e2ca894f';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
@ -4885,6 +4930,9 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -4885,6 +4930,9 @@ var renderTextLayer = function renderTextLayerClosure() {
}
}
task._textDivProperties.set(textDiv, textDivProperties);
if (task._textContentStream) {
task._layoutText(textDiv);
}
if (task._enhanceTextSelection) {
var angleCos = 1,
angleSin = 0;
@ -4916,7 +4964,6 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -4916,7 +4964,6 @@ var renderTextLayer = function renderTextLayerClosure() {
if (task._canceled) {
return;
}
var textLayerFrag = task._container;
var textDivs = task._textDivs;
var capability = task._capability;
var textDivsLength = textDivs.length;
@ -4925,39 +4972,10 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -4925,39 +4972,10 @@ var renderTextLayer = function renderTextLayerClosure() {
capability.resolve();
return;
}
var canvas = document.createElement('canvas');
canvas.mozOpaque = true;
var ctx = canvas.getContext('2d', { alpha: false });
var lastFontSize;
var lastFontFamily;
if (!task._textContentStream) {
for (var i = 0; i < textDivsLength; i++) {
var textDiv = textDivs[i];
var textDivProperties = task._textDivProperties.get(textDiv);
if (textDivProperties.isWhitespace) {
continue;
}
var fontSize = textDiv.style.fontSize;
var fontFamily = textDiv.style.fontFamily;
if (fontSize !== lastFontSize || fontFamily !== lastFontFamily) {
ctx.font = fontSize + ' ' + fontFamily;
lastFontSize = fontSize;
lastFontFamily = fontFamily;
}
var width = ctx.measureText(textDiv.textContent).width;
textLayerFrag.appendChild(textDiv);
var transform = '';
if (textDivProperties.canvasWidth !== 0 && width > 0) {
textDivProperties.scale = textDivProperties.canvasWidth / width;
transform = 'scaleX(' + textDivProperties.scale + ')';
}
if (textDivProperties.angle !== 0) {
transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
}
if (transform !== '') {
textDivProperties.originalTransform = transform;
_dom_utils.CustomStyle.setProp('transform', textDiv, transform);
task._layoutText(textDivs[i]);
}
task._textDivProperties.set(textDiv, textDivProperties);
}
task._renderingDone = true;
capability.resolve();
@ -5187,24 +5205,42 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -5187,24 +5205,42 @@ var renderTextLayer = function renderTextLayerClosure() {
}
});
}
function TextLayerRenderTask(textContent, container, viewport, textDivs, enhanceTextSelection) {
function TextLayerRenderTask(_ref) {
var textContent = _ref.textContent,
textContentStream = _ref.textContentStream,
container = _ref.container,
viewport = _ref.viewport,
textDivs = _ref.textDivs,
textContentItemsStr = _ref.textContentItemsStr,
enhanceTextSelection = _ref.enhanceTextSelection;
this._textContent = textContent;
this._textContentStream = textContentStream;
this._container = container;
this._viewport = viewport;
this._textDivs = textDivs || [];
this._textContentItemsStr = textContentItemsStr || [];
this._enhanceTextSelection = !!enhanceTextSelection;
this._reader = null;
this._layoutTextLastFontSize = null;
this._layoutTextLastFontFamily = null;
this._layoutTextCtx = null;
this._textDivProperties = new WeakMap();
this._renderingDone = false;
this._canceled = false;
this._capability = (0, _util.createPromiseCapability)();
this._renderTimer = null;
this._bounds = [];
this._enhanceTextSelection = !!enhanceTextSelection;
}
TextLayerRenderTask.prototype = {
get promise() {
return this._capability.promise;
},
cancel: function TextLayer_cancel() {
if (this._reader) {
this._reader.cancel();
this._reader = null;
}
this._canceled = true;
if (this._renderTimer !== null) {
clearTimeout(this._renderTimer);
@ -5212,22 +5248,86 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -5212,22 +5248,86 @@ var renderTextLayer = function renderTextLayerClosure() {
}
this._capability.reject('canceled');
},
_processItems: function _processItems(items, styleCache) {
for (var i = 0, len = items.length; i < len; i++) {
this._textContentItemsStr.push(items[i].str);
appendText(this, items[i], styleCache);
}
},
_layoutText: function _layoutText(textDiv) {
var textLayerFrag = this._container;
var textDivProperties = this._textDivProperties.get(textDiv);
if (textDivProperties.isWhitespace) {
return;
}
var fontSize = textDiv.style.fontSize;
var fontFamily = textDiv.style.fontFamily;
if (fontSize !== this._layoutTextLastFontSize || fontFamily !== this._layoutTextLastFontFamily) {
this._layoutTextCtx.font = fontSize + ' ' + fontFamily;
this._lastFontSize = fontSize;
this._lastFontFamily = fontFamily;
}
var width = this._layoutTextCtx.measureText(textDiv.textContent).width;
var transform = '';
if (textDivProperties.canvasWidth !== 0 && width > 0) {
textDivProperties.scale = textDivProperties.canvasWidth / width;
transform = 'scaleX(' + textDivProperties.scale + ')';
}
if (textDivProperties.angle !== 0) {
transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
}
if (transform !== '') {
textDivProperties.originalTransform = transform;
_dom_utils.CustomStyle.setProp('transform', textDiv, transform);
}
this._textDivProperties.set(textDiv, textDivProperties);
textLayerFrag.appendChild(textDiv);
},
_render: function TextLayer_render(timeout) {
var _this = this;
var capability = (0, _util.createPromiseCapability)();
var styleCache = Object.create(null);
var canvas = document.createElement('canvas');
canvas.mozOpaque = true;
this._layoutTextCtx = canvas.getContext('2d', { alpha: false });
if (this._textContent) {
var textItems = this._textContent.items;
var textStyles = this._textContent.styles;
for (var i = 0, len = textItems.length; i < len; i++) {
appendText(this, textItems[i], textStyles);
this._processItems(textItems, textStyles);
capability.resolve();
} else if (this._textContentStream) {
var pump = function pump() {
_this._reader.read().then(function (_ref2) {
var value = _ref2.value,
done = _ref2.done;
if (done) {
capability.resolve();
return;
}
_util.Util.extendObj(styleCache, value.styles);
_this._processItems(value.items, styleCache);
pump();
}, capability.reject);
};
this._reader = this._textContentStream.getReader();
pump();
} else {
throw new Error('Neither "textContent" nor "textContentStream"' + ' parameters specified.');
}
capability.promise.then(function () {
styleCache = null;
if (!timeout) {
render(this);
render(_this);
} else {
this._renderTimer = setTimeout(function () {
_this._renderTimer = setTimeout(function () {
render(_this);
_this._renderTimer = null;
}, timeout);
}
}, this._capability.reject);
},
expandTextDivs: function TextLayer_expandTextDivs(expandDivs) {
if (!this._enhanceTextSelection || !this._renderingDone) {
@ -5280,7 +5380,15 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -5280,7 +5380,15 @@ var renderTextLayer = function renderTextLayerClosure() {
}
};
function renderTextLayer(renderParameters) {
var task = new TextLayerRenderTask(renderParameters.textContent, renderParameters.container, renderParameters.viewport, renderParameters.textDivs, renderParameters.enhanceTextSelection);
var task = new TextLayerRenderTask({
textContent: renderParameters.textContent,
textContentStream: renderParameters.textContentStream,
container: renderParameters.container,
viewport: renderParameters.viewport,
textDivs: renderParameters.textDivs,
textContentItemsStr: renderParameters.textContentItemsStr,
enhanceTextSelection: renderParameters.enhanceTextSelection
});
task._render(renderParameters.timeout);
return task;
}
@ -5791,8 +5899,8 @@ if (!_util.globalScope.PDFJS) { @@ -5791,8 +5899,8 @@ if (!_util.globalScope.PDFJS) {
}
var PDFJS = _util.globalScope.PDFJS;
{
PDFJS.version = '1.8.482';
PDFJS.build = 'd1567a94';
PDFJS.version = '1.8.484';
PDFJS.build = 'e2ca894f';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {
@ -11331,8 +11439,8 @@ exports.TilingPattern = TilingPattern; @@ -11331,8 +11439,8 @@ exports.TilingPattern = TilingPattern;
"use strict";
var pdfjsVersion = '1.8.482';
var pdfjsBuild = 'd1567a94';
var pdfjsVersion = '1.8.484';
var pdfjsBuild = 'e2ca894f';
var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(9);
var pdfjsDisplayAPI = __w_pdfjs_require__(3);

2
build/pdf.js.map
View File

File diff suppressed because one or more lines are too long

16
build/pdf.min.js vendored
View File

File diff suppressed because one or more lines are too long

180
build/pdf.worker.js vendored
Unescape View File

@ -1138,7 +1138,8 @@ MessageHandler.prototype = { @@ -1138,7 +1138,8 @@ MessageHandler.prototype = {
var startCapability = createPromiseCapability();
_this2.streamControllers[streamId] = {
controller: controller,
startCall: startCapability
startCall: startCapability,
isClosed: false
};
_this2.postMessage({
sourceName: sourceName,
@ -1165,6 +1166,7 @@ MessageHandler.prototype = { @@ -1165,6 +1166,7 @@ MessageHandler.prototype = {
cancel: function cancel(reason) {
var cancelCapability = createPromiseCapability();
_this2.streamControllers[streamId].cancelCall = cancelCapability;
_this2.streamControllers[streamId].isClosed = true;
_this2.postMessage({
sourceName: sourceName,
targetName: targetName,
@ -1310,9 +1312,15 @@ MessageHandler.prototype = { @@ -1310,9 +1312,15 @@ MessageHandler.prototype = {
});
break;
case 'enqueue':
if (!this.streamControllers[data.streamId].isClosed) {
this.streamControllers[data.streamId].controller.enqueue(data.chunk);
}
break;
case 'close':
if (this.streamControllers[data.streamId].isClosed) {
break;
}
this.streamControllers[data.streamId].isClosed = true;
this.streamControllers[data.streamId].controller.close();
deleteStreamController();
break;
@ -1325,6 +1333,9 @@ MessageHandler.prototype = { @@ -1325,6 +1333,9 @@ MessageHandler.prototype = {
deleteStreamController();
break;
case 'cancel':
if (!this.streamSinks[data.streamId]) {
break;
}
resolveCall(this.streamSinks[data.streamId].onCancel, [data.reason]).then(function () {
sendStreamResponse({
stream: 'cancel_complete',
@ -11430,27 +11441,31 @@ var WorkerMessageHandler = { @@ -11430,27 +11441,31 @@ var WorkerMessageHandler = {
});
});
}, this);
handler.on('GetTextContent', function wphExtractText(data) {
handler.on('GetTextContent', function wphExtractText(data, sink) {
var pageIndex = data.pageIndex;
return pdfManager.getPage(pageIndex).then(function (page) {
sink.onPull = function (desiredSize) {};
sink.onCancel = function (reason) {};
pdfManager.getPage(pageIndex).then(function (page) {
var task = new WorkerTask('GetTextContent: page ' + pageIndex);
startWorkerTask(task);
var pageNum = pageIndex + 1;
var start = Date.now();
return page.extractTextContent({
page.extractTextContent({
handler: handler,
task: task,
sink: sink,
normalizeWhitespace: data.normalizeWhitespace,
combineTextItems: data.combineTextItems
}).then(function (textContent) {
}).then(function () {
finishWorkerTask(task);
(0, _util.info)('text indexing: page=' + pageNum + ' - time=' + (Date.now() - start) + 'ms');
return textContent;
sink.close();
}, function (reason) {
finishWorkerTask(task);
if (task.terminated) {
return;
}
sink.error(reason);
throw reason;
});
});
@ -15333,6 +15348,8 @@ Object.defineProperty(exports, "__esModule", { @@ -15333,6 +15348,8 @@ Object.defineProperty(exports, "__esModule", {
});
exports.PartialEvaluator = exports.OperatorList = undefined;
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
var _util = __w_pdfjs_require__(0);
var _cmap = __w_pdfjs_require__(24);
@ -16291,7 +16308,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -16291,7 +16308,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
_ref3$normalizeWhites = _ref3.normalizeWhitespace,
normalizeWhitespace = _ref3$normalizeWhites === undefined ? false : _ref3$normalizeWhites,
_ref3$combineTextItem = _ref3.combineTextItems,
combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem;
combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem,
sink = _ref3.sink,
_ref3$seenStyles = _ref3.seenStyles,
seenStyles = _ref3$seenStyles === undefined ? Object.create(null) : _ref3$seenStyles;
resources = resources || _primitives.Dict.empty;
stateManager = stateManager || new StateManager(new TextState());
@ -16323,7 +16343,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -16323,7 +16343,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var self = this;
var xref = this.xref;
var xobjs = null;
var xobjsCache = Object.create(null);
var skipEmptyXObjs = Object.create(null);
var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
var textState;
function ensureTextContentItem() {
@ -16331,7 +16351,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -16331,7 +16351,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
return textContentItem;
}
var font = textState.font;
if (!(font.loadedName in textContent.styles)) {
if (!(font.loadedName in seenStyles)) {
seenStyles[font.loadedName] = true;
textContent.styles[font.loadedName] = {
fontFamily: font.fallbackName,
ascent: font.ascent,
@ -16486,10 +16507,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -16486,10 +16507,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
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) {
promise.then(function () {
enqueueChunk();
Promise.all([promise, sink.ready]).then(function () {
try {
promiseBody(resolve, reject);
} catch (ex) {
@ -16512,10 +16542,29 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -16512,10 +16542,29 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var fn = operation.fn;
args = operation.args;
var advance, diff;
var fontNameArg, fontSizeArg;
var isSameTextLine;
var items;
var offset;
var j, jj;
var breakTextRun;
var name;
var xobj;
var type;
var currentState;
var xObjStateManager;
var matrix;
var dictName;
var extGState;
var gState;
var gStateFont;
var _ret2 = function () {
switch (fn | 0) {
case _util.OPS.setFont:
var fontNameArg = args[0].name,
fontNameArg = args[0].name;
fontSizeArg = args[1];
if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
break;
}
@ -16523,7 +16572,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -16523,7 +16572,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textState.fontName = fontNameArg;
textState.fontSize = fontSizeArg;
next(handleSetFont(fontNameArg, null));
return;
return {
v: void 0
};
case _util.OPS.setTextRise:
flushTextContentItem();
textState.textRise = args[0];
@ -16537,7 +16588,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -16537,7 +16588,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textState.leading = args[0];
break;
case _util.OPS.moveText:
var isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
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]);
@ -16587,15 +16639,16 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -16587,15 +16639,16 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
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++) {
items = args[0];
for (j = 0, jj = items.length; j < jj; j++) {
if (typeof items[j] === 'string') {
buildTextContentItem(items[j]);
} else if ((0, _util.isNum)(items[j])) {
ensureTextContentItem();
advance = items[j] * textState.fontSize / 1000;
var breakTextRun = false;
breakTextRun = false;
if (textState.font.vertical) {
offset = advance;
textState.translateTextMatrix(0, offset);
@ -16643,78 +16696,109 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -16643,78 +16696,109 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
if (!xobjs) {
xobjs = resources.get('XObject') || _primitives.Dict.empty;
}
var name = args[0].name;
if (xobjsCache.key === name) {
if (xobjsCache.texts) {
_util.Util.appendToArray(textContent.items, xobjsCache.texts.items);
_util.Util.extendObj(textContent.styles, xobjsCache.texts.styles);
}
name = args[0].name;
if (name in skipEmptyXObjs) {
break;
}
var xobj = xobjs.get(name);
xobj = xobjs.get(name);
if (!xobj) {
break;
}
(0, _util.assert)((0, _primitives.isStream)(xobj), 'XObject should be a stream');
var type = xobj.dict.get('Subtype');
type = xobj.dict.get('Subtype');
(0, _util.assert)((0, _primitives.isName)(type), 'XObject should have a Name subtype');
if (type.name !== 'Form') {
xobjsCache.key = name;
xobjsCache.texts = null;
skipEmptyXObjs[name] = true;
break;
}
var currentState = stateManager.state.clone();
var xObjStateManager = new StateManager(currentState);
var matrix = xobj.dict.getArray('Matrix');
currentState = stateManager.state.clone();
xObjStateManager = new StateManager(currentState);
matrix = xobj.dict.getArray('Matrix');
if ((0, _util.isArray)(matrix) && matrix.length === 6) {
xObjStateManager.transform(matrix);
}
enqueueChunk();
var sinkWrapper = {
enqueueInvoked: false,
enqueue: function enqueue(chunk, size) {
this.enqueueInvoked = true;
sink.enqueue(chunk, size);
},
get desiredSize() {
return sink.desiredSize;
},
get ready() {
return sink.ready;
}
};
next(self.getTextContent({
stream: xobj,
task: task,
resources: xobj.dict.get('Resources') || resources,
stateManager: xObjStateManager,
normalizeWhitespace: normalizeWhitespace,
combineTextItems: combineTextItems
}).then(function (formTextContent) {
_util.Util.appendToArray(textContent.items, formTextContent.items);
_util.Util.extendObj(textContent.styles, formTextContent.styles);
xobjsCache.key = name;
xobjsCache.texts = formTextContent;
combineTextItems: combineTextItems,
sink: sinkWrapper,
seenStyles: seenStyles
}).then(function () {
if (!sinkWrapper.enqueueInvoked) {
skipEmptyXObjs[name] = true;
}
}));
return;
return {
v: void 0
};
case _util.OPS.setGState:
flushTextContentItem();
var dictName = args[0];
var extGState = resources.get('ExtGState');
dictName = args[0];
extGState = resources.get('ExtGState');
if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
break;
}
var gState = extGState.get(dictName.name);
gState = extGState.get(dictName.name);
if (!(0, _primitives.isDict)(gState)) {
break;
}
var gStateFont = gState.get('Font');
gStateFont = gState.get('Font');
if (gStateFont) {
textState.fontName = null;
textState.fontSize = gStateFont[1];
next(handleSetFont(null, gStateFont[0]));
return;
return {
v: void 0
};
}
break;
}
}();
if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
if (textContent.items.length >= sink.desiredSize) {
stop = true;
break;
}
}
if (stop) {
next(deferred);
return;
}
flushTextContentItem();
resolve(textContent);
enqueueChunk();
resolve();
}).catch(function (reason) {
if (_this9.options.ignoreErrors) {
(0, _util.warn)('getTextContent - ignoring errors during task: ' + task.name);
flushTextContentItem();
return textContent;
enqueueChunk();
return;
}
throw reason;
});
@ -29588,6 +29672,7 @@ var Page = function PageClosure() { @@ -29588,6 +29672,7 @@ var Page = function PageClosure() {
var handler = _ref6.handler,
task = _ref6.task,
normalizeWhitespace = _ref6.normalizeWhitespace,
sink = _ref6.sink,
combineTextItems = _ref6.combineTextItems;
var contentStreamPromise = this.pdfManager.ensure(this, 'getContentStream');
@ -29612,7 +29697,8 @@ var Page = function PageClosure() { @@ -29612,7 +29697,8 @@ var Page = function PageClosure() {
task: task,
resources: _this3.resources,
normalizeWhitespace: normalizeWhitespace,
combineTextItems: combineTextItems
combineTextItems: combineTextItems,
sink: sink
});
});
},
@ -40317,8 +40403,8 @@ exports.Type1Parser = Type1Parser; @@ -40317,8 +40403,8 @@ exports.Type1Parser = Type1Parser;
"use strict";
var pdfjsVersion = '1.8.482';
var pdfjsBuild = 'd1567a94';
var pdfjsVersion = '1.8.484';
var pdfjsBuild = 'e2ca894f';
var pdfjsCoreWorker = __w_pdfjs_require__(8);
{
__w_pdfjs_require__(19);

2
build/pdf.worker.js.map vendored
View File

File diff suppressed because one or more lines are too long

30
build/pdf.worker.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
lib/core/document.js
Unescape View File

@ -245,6 +245,7 @@ var Page = function PageClosure() { @@ -245,6 +245,7 @@ var Page = function PageClosure() {
var handler = _ref6.handler,
task = _ref6.task,
normalizeWhitespace = _ref6.normalizeWhitespace,
sink = _ref6.sink,
combineTextItems = _ref6.combineTextItems;
var contentStreamPromise = this.pdfManager.ensure(this, 'getContentStream');
@ -269,7 +270,8 @@ var Page = function PageClosure() { @@ -269,7 +270,8 @@ var Page = function PageClosure() {
task: task,
resources: _this3.resources,
normalizeWhitespace: normalizeWhitespace,
combineTextItems: combineTextItems
combineTextItems: combineTextItems,
sink: sink
});
});
},

145
lib/core/evaluator.js
Unescape View File

@ -19,6 +19,8 @@ Object.defineProperty(exports, "__esModule", { @@ -19,6 +19,8 @@ Object.defineProperty(exports, "__esModule", {
});
exports.PartialEvaluator = exports.OperatorList = undefined;
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
var _util = require('../shared/util');
var _cmap = require('./cmap');
@ -977,7 +979,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -977,7 +979,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
_ref3$normalizeWhites = _ref3.normalizeWhitespace,
normalizeWhitespace = _ref3$normalizeWhites === undefined ? false : _ref3$normalizeWhites,
_ref3$combineTextItem = _ref3.combineTextItems,
combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem;
combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem,
sink = _ref3.sink,
_ref3$seenStyles = _ref3.seenStyles,
seenStyles = _ref3$seenStyles === undefined ? Object.create(null) : _ref3$seenStyles;
resources = resources || _primitives.Dict.empty;
stateManager = stateManager || new StateManager(new TextState());
@ -1009,7 +1014,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -1009,7 +1014,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var self = this;
var xref = this.xref;
var xobjs = null;
var xobjsCache = Object.create(null);
var skipEmptyXObjs = Object.create(null);
var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
var textState;
function ensureTextContentItem() {
@ -1017,7 +1022,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -1017,7 +1022,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
return textContentItem;
}
var font = textState.font;
if (!(font.loadedName in textContent.styles)) {
if (!(font.loadedName in seenStyles)) {
seenStyles[font.loadedName] = true;
textContent.styles[font.loadedName] = {
fontFamily: font.fallbackName,
ascent: font.ascent,
@ -1172,10 +1178,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -1172,10 +1178,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
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) {
promise.then(function () {
enqueueChunk();
Promise.all([promise, sink.ready]).then(function () {
try {
promiseBody(resolve, reject);
} catch (ex) {
@ -1198,10 +1213,29 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -1198,10 +1213,29 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var fn = operation.fn;
args = operation.args;
var advance, diff;
var fontNameArg, fontSizeArg;
var isSameTextLine;
var items;
var offset;
var j, jj;
var breakTextRun;
var name;
var xobj;
var type;
var currentState;
var xObjStateManager;
var matrix;
var dictName;
var extGState;
var gState;
var gStateFont;
var _ret2 = function () {
switch (fn | 0) {
case _util.OPS.setFont:
var fontNameArg = args[0].name,
fontNameArg = args[0].name;
fontSizeArg = args[1];
if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
break;
}
@ -1209,7 +1243,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -1209,7 +1243,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textState.fontName = fontNameArg;
textState.fontSize = fontSizeArg;
next(handleSetFont(fontNameArg, null));
return;
return {
v: void 0
};
case _util.OPS.setTextRise:
flushTextContentItem();
textState.textRise = args[0];
@ -1223,7 +1259,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -1223,7 +1259,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textState.leading = args[0];
break;
case _util.OPS.moveText:
var isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
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]);
@ -1273,15 +1310,16 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -1273,15 +1310,16 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
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++) {
items = args[0];
for (j = 0, jj = items.length; j < jj; j++) {
if (typeof items[j] === 'string') {
buildTextContentItem(items[j]);
} else if ((0, _util.isNum)(items[j])) {
ensureTextContentItem();
advance = items[j] * textState.fontSize / 1000;
var breakTextRun = false;
breakTextRun = false;
if (textState.font.vertical) {
offset = advance;
textState.translateTextMatrix(0, offset);
@ -1329,78 +1367,109 @@ var PartialEvaluator = function PartialEvaluatorClosure() { @@ -1329,78 +1367,109 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
if (!xobjs) {
xobjs = resources.get('XObject') || _primitives.Dict.empty;
}
var name = args[0].name;
if (xobjsCache.key === name) {
if (xobjsCache.texts) {
_util.Util.appendToArray(textContent.items, xobjsCache.texts.items);
_util.Util.extendObj(textContent.styles, xobjsCache.texts.styles);
}
name = args[0].name;
if (name in skipEmptyXObjs) {
break;
}
var xobj = xobjs.get(name);
xobj = xobjs.get(name);
if (!xobj) {
break;
}
(0, _util.assert)((0, _primitives.isStream)(xobj), 'XObject should be a stream');
var type = xobj.dict.get('Subtype');
type = xobj.dict.get('Subtype');
(0, _util.assert)((0, _primitives.isName)(type), 'XObject should have a Name subtype');
if (type.name !== 'Form') {
xobjsCache.key = name;
xobjsCache.texts = null;
skipEmptyXObjs[name] = true;
break;
}
var currentState = stateManager.state.clone();
var xObjStateManager = new StateManager(currentState);
var matrix = xobj.dict.getArray('Matrix');
currentState = stateManager.state.clone();
xObjStateManager = new StateManager(currentState);
matrix = xobj.dict.getArray('Matrix');
if ((0, _util.isArray)(matrix) && matrix.length === 6) {
xObjStateManager.transform(matrix);
}
enqueueChunk();
var sinkWrapper = {
enqueueInvoked: false,
enqueue: function enqueue(chunk, size) {
this.enqueueInvoked = true;
sink.enqueue(chunk, size);
},
get desiredSize() {
return sink.desiredSize;
},
get ready() {
return sink.ready;
}
};
next(self.getTextContent({
stream: xobj,
task: task,
resources: xobj.dict.get('Resources') || resources,
stateManager: xObjStateManager,
normalizeWhitespace: normalizeWhitespace,
combineTextItems: combineTextItems
}).then(function (formTextContent) {
_util.Util.appendToArray(textContent.items, formTextContent.items);
_util.Util.extendObj(textContent.styles, formTextContent.styles);
xobjsCache.key = name;
xobjsCache.texts = formTextContent;
combineTextItems: combineTextItems,
sink: sinkWrapper,
seenStyles: seenStyles
}).then(function () {
if (!sinkWrapper.enqueueInvoked) {
skipEmptyXObjs[name] = true;
}
}));
return;
return {
v: void 0
};
case _util.OPS.setGState:
flushTextContentItem();
var dictName = args[0];
var extGState = resources.get('ExtGState');
dictName = args[0];
extGState = resources.get('ExtGState');
if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
break;
}
var gState = extGState.get(dictName.name);
gState = extGState.get(dictName.name);
if (!(0, _primitives.isDict)(gState)) {
break;
}
var gStateFont = gState.get('Font');
gStateFont = gState.get('Font');
if (gStateFont) {
textState.fontName = null;
textState.fontSize = gStateFont[1];
next(handleSetFont(null, gStateFont[0]));
return;
return {
v: void 0
};
}
break;
}
}();
if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
if (textContent.items.length >= sink.desiredSize) {
stop = true;
break;
}
}
if (stop) {
next(deferred);
return;
}
flushTextContentItem();
resolve(textContent);
enqueueChunk();
resolve();
}).catch(function (reason) {
if (_this9.options.ignoreErrors) {
(0, _util.warn)('getTextContent - ignoring errors during task: ' + task.name);
flushTextContentItem();
return textContent;
enqueueChunk();
return;
}
throw reason;
});

14
lib/core/worker.js
Unescape View File

@ -620,27 +620,31 @@ var WorkerMessageHandler = { @@ -620,27 +620,31 @@ var WorkerMessageHandler = {
});
});
}, this);
handler.on('GetTextContent', function wphExtractText(data) {
handler.on('GetTextContent', function wphExtractText(data, sink) {
var pageIndex = data.pageIndex;
return pdfManager.getPage(pageIndex).then(function (page) {
sink.onPull = function (desiredSize) {};
sink.onCancel = function (reason) {};
pdfManager.getPage(pageIndex).then(function (page) {
var task = new WorkerTask('GetTextContent: page ' + pageIndex);
startWorkerTask(task);
var pageNum = pageIndex + 1;
var start = Date.now();
return page.extractTextContent({
page.extractTextContent({
handler: handler,
task: task,
sink: sink,
normalizeWhitespace: data.normalizeWhitespace,
combineTextItems: data.combineTextItems
}).then(function (textContent) {
}).then(function () {
finishWorkerTask(task);
(0, _util.info)('text indexing: page=' + pageNum + ' - time=' + (Date.now() - start) + 'ms');
return textContent;
sink.close();
}, function (reason) {
finishWorkerTask(task);
if (task.terminated) {
return;
}
sink.error(reason);
throw reason;
});
});

44
lib/display/api.js
Unescape View File

@ -490,12 +490,46 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -490,12 +490,46 @@ var PDFPageProxy = function PDFPageProxyClosure() {
}
return intentState.opListReadCapability.promise;
},
getTextContent: function PDFPageProxy_getTextContent(params) {
params = params || {};
return this.transport.messageHandler.sendWithPromise('GetTextContent', {
streamTextContent: function streamTextContent() {
var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var TEXT_CONTENT_CHUNK_SIZE = 100;
return this.transport.messageHandler.sendWithStream('GetTextContent', {
pageIndex: this.pageNumber - 1,
normalizeWhitespace: params.normalizeWhitespace === true,
combineTextItems: params.disableCombineTextItems !== true
}, {
highWaterMark: TEXT_CONTENT_CHUNK_SIZE,
size: function size(textContent) {
return textContent.items.length;
}
});
},
getTextContent: function PDFPageProxy_getTextContent(params) {
params = params || {};
var readableStream = this.streamTextContent(params);
return new Promise(function (resolve, reject) {
function pump() {
reader.read().then(function (_ref) {
var value = _ref.value,
done = _ref.done;
if (done) {
resolve(textContent);
return;
}
_util.Util.extendObj(textContent.styles, value.styles);
_util.Util.appendToArray(textContent.items, value.items);
pump();
}, reject);
}
var reader = readableStream.getReader();
var textContent = {
items: [],
styles: Object.create(null)
};
pump();
});
},
_destroy: function PDFPageProxy_destroy() {
@ -1446,8 +1480,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() { @@ -1446,8 +1480,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
}();
var version, build;
{
exports.version = version = '1.8.482';
exports.build = build = 'd1567a94';
exports.version = version = '1.8.484';
exports.build = build = 'e2ca894f';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;

4
lib/display/global.js
Unescape View File

@ -39,8 +39,8 @@ if (!_util.globalScope.PDFJS) { @@ -39,8 +39,8 @@ if (!_util.globalScope.PDFJS) {
}
var PDFJS = _util.globalScope.PDFJS;
{
PDFJS.version = '1.8.482';
PDFJS.build = 'd1567a94';
PDFJS.version = '1.8.484';
PDFJS.build = 'e2ca894f';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {

141
lib/display/text_layer.js
Unescape View File

@ -93,6 +93,9 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -93,6 +93,9 @@ var renderTextLayer = function renderTextLayerClosure() {
}
}
task._textDivProperties.set(textDiv, textDivProperties);
if (task._textContentStream) {
task._layoutText(textDiv);
}
if (task._enhanceTextSelection) {
var angleCos = 1,
angleSin = 0;
@ -124,7 +127,6 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -124,7 +127,6 @@ var renderTextLayer = function renderTextLayerClosure() {
if (task._canceled) {
return;
}
var textLayerFrag = task._container;
var textDivs = task._textDivs;
var capability = task._capability;
var textDivsLength = textDivs.length;
@ -133,39 +135,10 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -133,39 +135,10 @@ var renderTextLayer = function renderTextLayerClosure() {
capability.resolve();
return;
}
var canvas = document.createElement('canvas');
canvas.mozOpaque = true;
var ctx = canvas.getContext('2d', { alpha: false });
var lastFontSize;
var lastFontFamily;
if (!task._textContentStream) {
for (var i = 0; i < textDivsLength; i++) {
var textDiv = textDivs[i];
var textDivProperties = task._textDivProperties.get(textDiv);
if (textDivProperties.isWhitespace) {
continue;
}
var fontSize = textDiv.style.fontSize;
var fontFamily = textDiv.style.fontFamily;
if (fontSize !== lastFontSize || fontFamily !== lastFontFamily) {
ctx.font = fontSize + ' ' + fontFamily;
lastFontSize = fontSize;
lastFontFamily = fontFamily;
}
var width = ctx.measureText(textDiv.textContent).width;
textLayerFrag.appendChild(textDiv);
var transform = '';
if (textDivProperties.canvasWidth !== 0 && width > 0) {
textDivProperties.scale = textDivProperties.canvasWidth / width;
transform = 'scaleX(' + textDivProperties.scale + ')';
}
if (textDivProperties.angle !== 0) {
transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
}
if (transform !== '') {
textDivProperties.originalTransform = transform;
_dom_utils.CustomStyle.setProp('transform', textDiv, transform);
task._layoutText(textDivs[i]);
}
task._textDivProperties.set(textDiv, textDivProperties);
}
task._renderingDone = true;
capability.resolve();
@ -395,24 +368,42 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -395,24 +368,42 @@ var renderTextLayer = function renderTextLayerClosure() {
}
});
}
function TextLayerRenderTask(textContent, container, viewport, textDivs, enhanceTextSelection) {
function TextLayerRenderTask(_ref) {
var textContent = _ref.textContent,
textContentStream = _ref.textContentStream,
container = _ref.container,
viewport = _ref.viewport,
textDivs = _ref.textDivs,
textContentItemsStr = _ref.textContentItemsStr,
enhanceTextSelection = _ref.enhanceTextSelection;
this._textContent = textContent;
this._textContentStream = textContentStream;
this._container = container;
this._viewport = viewport;
this._textDivs = textDivs || [];
this._textContentItemsStr = textContentItemsStr || [];
this._enhanceTextSelection = !!enhanceTextSelection;
this._reader = null;
this._layoutTextLastFontSize = null;
this._layoutTextLastFontFamily = null;
this._layoutTextCtx = null;
this._textDivProperties = new WeakMap();
this._renderingDone = false;
this._canceled = false;
this._capability = (0, _util.createPromiseCapability)();
this._renderTimer = null;
this._bounds = [];
this._enhanceTextSelection = !!enhanceTextSelection;
}
TextLayerRenderTask.prototype = {
get promise() {
return this._capability.promise;
},
cancel: function TextLayer_cancel() {
if (this._reader) {
this._reader.cancel();
this._reader = null;
}
this._canceled = true;
if (this._renderTimer !== null) {
clearTimeout(this._renderTimer);
@ -420,22 +411,86 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -420,22 +411,86 @@ var renderTextLayer = function renderTextLayerClosure() {
}
this._capability.reject('canceled');
},
_processItems: function _processItems(items, styleCache) {
for (var i = 0, len = items.length; i < len; i++) {
this._textContentItemsStr.push(items[i].str);
appendText(this, items[i], styleCache);
}
},
_layoutText: function _layoutText(textDiv) {
var textLayerFrag = this._container;
var textDivProperties = this._textDivProperties.get(textDiv);
if (textDivProperties.isWhitespace) {
return;
}
var fontSize = textDiv.style.fontSize;
var fontFamily = textDiv.style.fontFamily;
if (fontSize !== this._layoutTextLastFontSize || fontFamily !== this._layoutTextLastFontFamily) {
this._layoutTextCtx.font = fontSize + ' ' + fontFamily;
this._lastFontSize = fontSize;
this._lastFontFamily = fontFamily;
}
var width = this._layoutTextCtx.measureText(textDiv.textContent).width;
var transform = '';
if (textDivProperties.canvasWidth !== 0 && width > 0) {
textDivProperties.scale = textDivProperties.canvasWidth / width;
transform = 'scaleX(' + textDivProperties.scale + ')';
}
if (textDivProperties.angle !== 0) {
transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
}
if (transform !== '') {
textDivProperties.originalTransform = transform;
_dom_utils.CustomStyle.setProp('transform', textDiv, transform);
}
this._textDivProperties.set(textDiv, textDivProperties);
textLayerFrag.appendChild(textDiv);
},
_render: function TextLayer_render(timeout) {
var _this = this;
var capability = (0, _util.createPromiseCapability)();
var styleCache = Object.create(null);
var canvas = document.createElement('canvas');
canvas.mozOpaque = true;
this._layoutTextCtx = canvas.getContext('2d', { alpha: false });
if (this._textContent) {
var textItems = this._textContent.items;
var textStyles = this._textContent.styles;
for (var i = 0, len = textItems.length; i < len; i++) {
appendText(this, textItems[i], textStyles);
this._processItems(textItems, textStyles);
capability.resolve();
} else if (this._textContentStream) {
var pump = function pump() {
_this._reader.read().then(function (_ref2) {
var value = _ref2.value,
done = _ref2.done;
if (done) {
capability.resolve();
return;
}
_util.Util.extendObj(styleCache, value.styles);
_this._processItems(value.items, styleCache);
pump();
}, capability.reject);
};
this._reader = this._textContentStream.getReader();
pump();
} else {
throw new Error('Neither "textContent" nor "textContentStream"' + ' parameters specified.');
}
capability.promise.then(function () {
styleCache = null;
if (!timeout) {
render(this);
render(_this);
} else {
this._renderTimer = setTimeout(function () {
_this._renderTimer = setTimeout(function () {
render(_this);
_this._renderTimer = null;
}, timeout);
}
}, this._capability.reject);
},
expandTextDivs: function TextLayer_expandTextDivs(expandDivs) {
if (!this._enhanceTextSelection || !this._renderingDone) {
@ -488,7 +543,15 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -488,7 +543,15 @@ var renderTextLayer = function renderTextLayerClosure() {
}
};
function renderTextLayer(renderParameters) {
var task = new TextLayerRenderTask(renderParameters.textContent, renderParameters.container, renderParameters.viewport, renderParameters.textDivs, renderParameters.enhanceTextSelection);
var task = new TextLayerRenderTask({
textContent: renderParameters.textContent,
textContentStream: renderParameters.textContentStream,
container: renderParameters.container,
viewport: renderParameters.viewport,
textDivs: renderParameters.textDivs,
textContentItemsStr: renderParameters.textContentItemsStr,
enhanceTextSelection: renderParameters.enhanceTextSelection
});
task._render(renderParameters.timeout);
return task;
}

4
lib/pdf.js
Unescape View File

@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
*/
'use strict';
var pdfjsVersion = '1.8.482';
var pdfjsBuild = 'd1567a94';
var pdfjsVersion = '1.8.484';
var pdfjsBuild = 'e2ca894f';
var pdfjsSharedUtil = require('./shared/util.js');
var pdfjsDisplayGlobal = require('./display/global.js');
var pdfjsDisplayAPI = require('./display/api.js');

4
lib/pdf.worker.js vendored
Unescape View File

@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
*/
'use strict';
var pdfjsVersion = '1.8.482';
var pdfjsBuild = 'd1567a94';
var pdfjsVersion = '1.8.484';
var pdfjsBuild = 'e2ca894f';
var pdfjsCoreWorker = require('./core/worker.js');
{
require('./core/network.js');

13
lib/shared/util.js
Unescape View File

@ -1054,7 +1054,8 @@ MessageHandler.prototype = { @@ -1054,7 +1054,8 @@ MessageHandler.prototype = {
var startCapability = createPromiseCapability();
_this2.streamControllers[streamId] = {
controller: controller,
startCall: startCapability
startCall: startCapability,
isClosed: false
};
_this2.postMessage({
sourceName: sourceName,
@ -1081,6 +1082,7 @@ MessageHandler.prototype = { @@ -1081,6 +1082,7 @@ MessageHandler.prototype = {
cancel: function cancel(reason) {
var cancelCapability = createPromiseCapability();
_this2.streamControllers[streamId].cancelCall = cancelCapability;
_this2.streamControllers[streamId].isClosed = true;
_this2.postMessage({
sourceName: sourceName,
targetName: targetName,
@ -1226,9 +1228,15 @@ MessageHandler.prototype = { @@ -1226,9 +1228,15 @@ MessageHandler.prototype = {
});
break;
case 'enqueue':
if (!this.streamControllers[data.streamId].isClosed) {
this.streamControllers[data.streamId].controller.enqueue(data.chunk);
}
break;
case 'close':
if (this.streamControllers[data.streamId].isClosed) {
break;
}
this.streamControllers[data.streamId].isClosed = true;
this.streamControllers[data.streamId].controller.close();
deleteStreamController();
break;
@ -1241,6 +1249,9 @@ MessageHandler.prototype = { @@ -1241,6 +1249,9 @@ MessageHandler.prototype = {
deleteStreamController();
break;
case 'cancel':
if (!this.streamSinks[data.streamId]) {
break;
}
resolveCall(this.streamSinks[data.streamId].onCancel, [data.reason]).then(function () {
sendStreamResponse({
stream: 'cancel_complete',

9
lib/web/pdf_page_view.js
Unescape View File

@ -31,8 +31,6 @@ var _pdf_rendering_queue = require('./pdf_rendering_queue'); @@ -31,8 +31,6 @@ var _pdf_rendering_queue = require('./pdf_rendering_queue');
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var TEXT_LAYER_RENDER_DELAY = 200;
var PDFPageView = function () {
function PDFPageView(options) {
_classCallCheck(this, PDFPageView);
@ -361,10 +359,9 @@ var PDFPageView = function () { @@ -361,10 +359,9 @@ var PDFPageView = function () {
var resultPromise = paintTask.promise.then(function () {
return finishPaintTask(null).then(function () {
if (textLayer) {
pdfPage.getTextContent({ normalizeWhitespace: true }).then(function textContentResolved(textContent) {
textLayer.setTextContent(textContent);
textLayer.render(TEXT_LAYER_RENDER_DELAY);
});
var readableStream = pdfPage.streamTextContent({ normalizeWhitespace: true });
textLayer.setTextContentStream(readableStream);
textLayer.render();
}
});
}, function (reason) {

33
lib/web/text_layer_builder.js
Unescape View File

@ -29,6 +29,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -29,6 +29,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
this.textLayerDiv = options.textLayerDiv;
this.eventBus = options.eventBus || (0, _dom_events.getGlobalEventBus)();
this.textContent = null;
this.textContentItemsStr = [];
this.textContentStream = null;
this.renderingDone = false;
this.pageIdx = options.pageIndex;
this.pageNumber = this.pageIdx + 1;
@ -57,7 +59,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -57,7 +59,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
render: function TextLayerBuilder_render(timeout) {
var _this = this;
if (!this.textContent || this.renderingDone) {
if (!(this.textContent || this.textContentStream) || this.renderingDone) {
return;
}
this.cancel();
@ -65,9 +67,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -65,9 +67,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
var textLayerFrag = document.createDocumentFragment();
this.textLayerRenderTask = (0, _pdf.renderTextLayer)({
textContent: this.textContent,
textContentStream: this.textContentStream,
container: textLayerFrag,
viewport: this.viewport,
textDivs: this.textDivs,
textContentItemsStr: this.textContentItemsStr,
timeout: timeout,
enhanceTextSelection: this.enhanceTextSelection
});
@ -83,6 +87,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -83,6 +87,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
this.textLayerRenderTask = null;
}
},
setTextContentStream: function setTextContentStream(readableStream) {
this.cancel();
this.textContentStream = readableStream;
},
setTextContent: function TextLayerBuilder_setTextContent(textContent) {
this.cancel();
this.textContent = textContent;
@ -90,8 +99,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -90,8 +99,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
convertMatches: function TextLayerBuilder_convertMatches(matches, matchesLength) {
var i = 0;
var iIndex = 0;
var bidiTexts = this.textContent.items;
var end = bidiTexts.length - 1;
var textContentItemsStr = this.textContentItemsStr;
var end = textContentItemsStr.length - 1;
var queryLen = this.findController === null ? 0 : this.findController.state.query.length;
var ret = [];
if (!matches) {
@ -99,11 +108,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -99,11 +108,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
}
for (var m = 0, len = matches.length; m < len; m++) {
var matchIdx = matches[m];
while (i !== end && matchIdx >= iIndex + bidiTexts[i].str.length) {
iIndex += bidiTexts[i].str.length;
while (i !== end && matchIdx >= iIndex + textContentItemsStr[i].length) {
iIndex += textContentItemsStr[i].length;
i++;
}
if (i === bidiTexts.length) {
if (i === textContentItemsStr.length) {
console.error('Could not find a matching mapping');
}
var match = {
@ -117,8 +126,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -117,8 +126,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
} else {
matchIdx += queryLen;
}
while (i !== end && matchIdx > iIndex + bidiTexts[i].str.length) {
iIndex += bidiTexts[i].str.length;
while (i !== end && matchIdx > iIndex + textContentItemsStr[i].length) {
iIndex += textContentItemsStr[i].length;
i++;
}
match.end = {
@ -133,7 +142,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -133,7 +142,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
if (matches.length === 0) {
return;
}
var bidiTexts = this.textContent.items;
var textContentItemsStr = this.textContentItemsStr;
var textDivs = this.textDivs;
var prevEnd = null;
var pageIdx = this.pageIdx;
@ -151,7 +160,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -151,7 +160,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
}
function appendTextToDiv(divIdx, fromOffset, toOffset, className) {
var div = textDivs[divIdx];
var content = bidiTexts[divIdx].str.substring(fromOffset, toOffset);
var content = textContentItemsStr[divIdx].substring(fromOffset, toOffset);
var node = document.createTextNode(content);
if (className) {
var span = document.createElement('span');
@ -208,14 +217,14 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -208,14 +217,14 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
}
var matches = this.matches;
var textDivs = this.textDivs;
var bidiTexts = this.textContent.items;
var textContentItemsStr = this.textContentItemsStr;
var clearedUntilDivIdx = -1;
for (var i = 0, len = matches.length; i < len; i++) {
var match = matches[i];
var begin = Math.max(clearedUntilDivIdx, match.begin.divIdx);
for (var n = begin, end = match.end.divIdx; n <= end; n++) {
var div = textDivs[n];
div.textContent = bidiTexts[n].str;
div.textContent = textContentItemsStr[n];
div.className = '';
}
clearedUntilDivIdx = match.end.divIdx + 1;

2
package.json
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "1.8.482",
"version": "1.8.484",
"main": "build/pdf.js",
"description": "Generic build of Mozilla's PDF.js library.",
"keywords": [

42
web/pdf_viewer.js
Unescape View File

@ -1141,8 +1141,6 @@ var _pdf_rendering_queue = __w_pdfjs_require__(7); @@ -1141,8 +1141,6 @@ var _pdf_rendering_queue = __w_pdfjs_require__(7);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var TEXT_LAYER_RENDER_DELAY = 200;
var PDFPageView = function () {
function PDFPageView(options) {
_classCallCheck(this, PDFPageView);
@ -1471,10 +1469,9 @@ var PDFPageView = function () { @@ -1471,10 +1469,9 @@ var PDFPageView = function () {
var resultPromise = paintTask.promise.then(function () {
return finishPaintTask(null).then(function () {
if (textLayer) {
pdfPage.getTextContent({ normalizeWhitespace: true }).then(function textContentResolved(textContent) {
textLayer.setTextContent(textContent);
textLayer.render(TEXT_LAYER_RENDER_DELAY);
});
var readableStream = pdfPage.streamTextContent({ normalizeWhitespace: true });
textLayer.setTextContentStream(readableStream);
textLayer.render();
}
});
}, function (reason) {
@ -1661,6 +1658,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1661,6 +1658,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
this.textLayerDiv = options.textLayerDiv;
this.eventBus = options.eventBus || (0, _dom_events.getGlobalEventBus)();
this.textContent = null;
this.textContentItemsStr = [];
this.textContentStream = null;
this.renderingDone = false;
this.pageIdx = options.pageIndex;
this.pageNumber = this.pageIdx + 1;
@ -1689,7 +1688,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1689,7 +1688,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
render: function TextLayerBuilder_render(timeout) {
var _this = this;
if (!this.textContent || this.renderingDone) {
if (!(this.textContent || this.textContentStream) || this.renderingDone) {
return;
}
this.cancel();
@ -1697,9 +1696,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1697,9 +1696,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
var textLayerFrag = document.createDocumentFragment();
this.textLayerRenderTask = (0, _pdfjsLib.renderTextLayer)({
textContent: this.textContent,
textContentStream: this.textContentStream,
container: textLayerFrag,
viewport: this.viewport,
textDivs: this.textDivs,
textContentItemsStr: this.textContentItemsStr,
timeout: timeout,
enhanceTextSelection: this.enhanceTextSelection
});
@ -1715,6 +1716,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1715,6 +1716,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
this.textLayerRenderTask = null;
}
},
setTextContentStream: function setTextContentStream(readableStream) {
this.cancel();
this.textContentStream = readableStream;
},
setTextContent: function TextLayerBuilder_setTextContent(textContent) {
this.cancel();
this.textContent = textContent;
@ -1722,8 +1728,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1722,8 +1728,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
convertMatches: function TextLayerBuilder_convertMatches(matches, matchesLength) {
var i = 0;
var iIndex = 0;
var bidiTexts = this.textContent.items;
var end = bidiTexts.length - 1;
var textContentItemsStr = this.textContentItemsStr;
var end = textContentItemsStr.length - 1;
var queryLen = this.findController === null ? 0 : this.findController.state.query.length;
var ret = [];
if (!matches) {
@ -1731,11 +1737,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1731,11 +1737,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
}
for (var m = 0, len = matches.length; m < len; m++) {
var matchIdx = matches[m];
while (i !== end && matchIdx >= iIndex + bidiTexts[i].str.length) {
iIndex += bidiTexts[i].str.length;
while (i !== end && matchIdx >= iIndex + textContentItemsStr[i].length) {
iIndex += textContentItemsStr[i].length;
i++;
}
if (i === bidiTexts.length) {
if (i === textContentItemsStr.length) {
console.error('Could not find a matching mapping');
}
var match = {
@ -1749,8 +1755,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1749,8 +1755,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
} else {
matchIdx += queryLen;
}
while (i !== end && matchIdx > iIndex + bidiTexts[i].str.length) {
iIndex += bidiTexts[i].str.length;
while (i !== end && matchIdx > iIndex + textContentItemsStr[i].length) {
iIndex += textContentItemsStr[i].length;
i++;
}
match.end = {
@ -1765,7 +1771,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1765,7 +1771,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
if (matches.length === 0) {
return;
}
var bidiTexts = this.textContent.items;
var textContentItemsStr = this.textContentItemsStr;
var textDivs = this.textDivs;
var prevEnd = null;
var pageIdx = this.pageIdx;
@ -1783,7 +1789,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1783,7 +1789,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
}
function appendTextToDiv(divIdx, fromOffset, toOffset, className) {
var div = textDivs[divIdx];
var content = bidiTexts[divIdx].str.substring(fromOffset, toOffset);
var content = textContentItemsStr[divIdx].substring(fromOffset, toOffset);
var node = document.createTextNode(content);
if (className) {
var span = document.createElement('span');
@ -1840,14 +1846,14 @@ var TextLayerBuilder = function TextLayerBuilderClosure() { @@ -1840,14 +1846,14 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
}
var matches = this.matches;
var textDivs = this.textDivs;
var bidiTexts = this.textContent.items;
var textContentItemsStr = this.textContentItemsStr;
var clearedUntilDivIdx = -1;
for (var i = 0, len = matches.length; i < len; i++) {
var match = matches[i];
var begin = Math.max(clearedUntilDivIdx, match.begin.divIdx);
for (var n = begin, end = match.end.divIdx; n <= end; n++) {
var div = textDivs[n];
div.textContent = bidiTexts[n].str;
div.textContent = textContentItemsStr[n];
div.className = '';
}
clearedUntilDivIdx = match.end.divIdx + 1;

2
web/pdf_viewer.js.map
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save