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

PDF.js version 1.5.430 - See mozilla/pdf.js@38c85039d17c40239c597044975a1a9fdde1feb6

master v1.5.430
Pdf Bot 9 years ago
parent
d6427837a3
commit
a65d65eacc
5 changed files with 285 additions and 174 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bower.json
  2. 210
      build/pdf.combined.js
  3. 210
      build/pdf.js
  4. 35
      build/pdf.worker.js
  5. 2
      package.json

2
bower.json
Unescape View File

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

210
build/pdf.combined.js
Unescape View File

@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfCombined = {}));
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
'use strict'; 'use strict';
var pdfjsVersion = '1.5.426'; var pdfjsVersion = '1.5.430';
var pdfjsBuild = '7db1983'; var pdfjsBuild = '38c8503';
var pdfjsFilePath = var pdfjsFilePath =
typeof document !== 'undefined' && document.currentScript ? typeof document !== 'undefined' && document.currentScript ?
@ -2443,6 +2443,37 @@ function createPromiseCapability() {
globalScope.Promise = Promise; globalScope.Promise = Promise;
})(); })();
(function WeakMapClosure() {
if (globalScope.WeakMap) {
return;
}
var id = 0;
function WeakMap() {
this.id = '$weakmap' + (id++);
}
WeakMap.prototype = {
has: function(obj) {
return !!Object.getOwnPropertyDescriptor(obj, this.id);
},
get: function(obj, defaultValue) {
return this.has(obj) ? obj[this.id] : defaultValue;
},
set: function(obj, value) {
Object.defineProperty(obj, this.id, {
value: value,
enumerable: false,
configurable: true
});
},
delete: function(obj) {
delete obj[this.id];
}
};
globalScope.WeakMap = WeakMap;
})();
var StatTimer = (function StatTimerClosure() { var StatTimer = (function StatTimerClosure() {
function rpad(str, pad, length) { function rpad(str, pad, length) {
while (str.length < length) { while (str.length < length) {
@ -24985,6 +25016,8 @@ var getDefaultSetting = displayDOMUtils.getDefaultSetting;
* initially be set to empty array. * initially be set to empty array.
* @property {number} timeout - (optional) Delay in milliseconds before * @property {number} timeout - (optional) Delay in milliseconds before
* rendering of the text runs occurs. * rendering of the text runs occurs.
* @property {boolean} enhanceTextSelection - (optional) Whether to turn on the
* text selection enhancement.
*/ */
var renderTextLayer = (function renderTextLayerClosure() { var renderTextLayer = (function renderTextLayerClosure() {
var MAX_TEXT_DIVS_TO_RENDER = 100000; var MAX_TEXT_DIVS_TO_RENDER = 100000;
@ -24995,17 +25028,31 @@ var renderTextLayer = (function renderTextLayerClosure() {
return !NonWhitespaceRegexp.test(str); return !NonWhitespaceRegexp.test(str);
} }
function appendText(textDivs, viewport, geom, styles, bounds, function appendText(task, geom, styles) {
enhanceTextSelection) { // Initialize all used properties to keep the caches monomorphic.
var style = styles[geom.fontName];
var textDiv = document.createElement('div'); var textDiv = document.createElement('div');
textDivs.push(textDiv); var textDivProperties = {
angle: 0,
canvasWidth: 0,
isWhitespace: false,
originalTransform: '',
paddingBottom: 0,
paddingLeft: 0,
paddingRight: 0,
paddingTop: 0,
scale: 1,
};
task._textDivs.push(textDiv);
if (isAllWhitespace(geom.str)) { if (isAllWhitespace(geom.str)) {
textDiv.dataset.isWhitespace = true; textDivProperties.isWhitespace = true;
task._textDivProperties.set(textDiv, textDivProperties);
return; return;
} }
var tx = Util.transform(viewport.transform, geom.transform);
var tx = Util.transform(task._viewport.transform, geom.transform);
var angle = Math.atan2(tx[1], tx[0]); var angle = Math.atan2(tx[1], tx[0]);
var style = styles[geom.fontName];
if (style.vertical) { if (style.vertical) {
angle += Math.PI / 2; angle += Math.PI / 2;
} }
@ -25034,32 +25081,34 @@ var renderTextLayer = (function renderTextLayerClosure() {
textDiv.textContent = geom.str; textDiv.textContent = geom.str;
// |fontName| is only used by the Font Inspector. This test will succeed // |fontName| is only used by the Font Inspector. This test will succeed
// when e.g. the Font Inspector is off but the Stepper is on, but it's // when e.g. the Font Inspector is off but the Stepper is on, but it's
// not worth the effort to do a more accurate test. // not worth the effort to do a more accurate test. We only use `dataset`
// here to make the font name available for the debugger.
if (getDefaultSetting('pdfBug')) { if (getDefaultSetting('pdfBug')) {
textDiv.dataset.fontName = geom.fontName; textDiv.dataset.fontName = geom.fontName;
} }
// Storing into dataset will convert number into string.
if (angle !== 0) { if (angle !== 0) {
textDiv.dataset.angle = angle * (180 / Math.PI); textDivProperties.angle = angle * (180 / Math.PI);
} }
// We don't bother scaling single-char text divs, because it has very // We don't bother scaling single-char text divs, because it has very
// little effect on text highlighting. This makes scrolling on docs with // little effect on text highlighting. This makes scrolling on docs with
// lots of such divs a lot faster. // lots of such divs a lot faster.
if (geom.str.length > 1) { if (geom.str.length > 1) {
if (style.vertical) { if (style.vertical) {
textDiv.dataset.canvasWidth = geom.height * viewport.scale; textDivProperties.canvasWidth = geom.height * task._viewport.scale;
} else { } else {
textDiv.dataset.canvasWidth = geom.width * viewport.scale; textDivProperties.canvasWidth = geom.width * task._viewport.scale;
} }
} }
if (enhanceTextSelection) { task._textDivProperties.set(textDiv, textDivProperties);
if (task._enhanceTextSelection) {
var angleCos = 1, angleSin = 0; var angleCos = 1, angleSin = 0;
if (angle !== 0) { if (angle !== 0) {
angleCos = Math.cos(angle); angleCos = Math.cos(angle);
angleSin = Math.sin(angle); angleSin = Math.sin(angle);
} }
var divWidth = (style.vertical ? geom.height : geom.width) * var divWidth = (style.vertical ? geom.height : geom.width) *
viewport.scale; task._viewport.scale;
var divHeight = fontHeight; var divHeight = fontHeight;
var m, b; var m, b;
@ -25070,7 +25119,7 @@ var renderTextLayer = (function renderTextLayerClosure() {
b = [left, top, left + divWidth, top + divHeight]; b = [left, top, left + divWidth, top + divHeight];
} }
bounds.push({ task._bounds.push({
left: b[0], left: b[0],
top: b[1], top: b[1],
right: b[2], right: b[2],
@ -25106,7 +25155,8 @@ var renderTextLayer = (function renderTextLayerClosure() {
var lastFontFamily; var lastFontFamily;
for (var i = 0; i < textDivsLength; i++) { for (var i = 0; i < textDivsLength; i++) {
var textDiv = textDivs[i]; var textDiv = textDivs[i];
if (textDiv.dataset.isWhitespace !== undefined) { var textDivProperties = task._textDivProperties.get(textDiv);
if (textDivProperties.isWhitespace) {
continue; continue;
} }
@ -25121,39 +25171,40 @@ var renderTextLayer = (function renderTextLayerClosure() {
} }
var width = ctx.measureText(textDiv.textContent).width; var width = ctx.measureText(textDiv.textContent).width;
textDiv.dataset.originalWidth = width;
textLayerFrag.appendChild(textDiv); textLayerFrag.appendChild(textDiv);
var transform; var transform = '';
if (textDiv.dataset.canvasWidth !== undefined && width > 0) { if (textDivProperties.canvasWidth !== 0 && width > 0) {
// Dataset values are of type string. textDivProperties.scale = textDivProperties.canvasWidth / width;
var textScale = textDiv.dataset.canvasWidth / width; transform = 'scaleX(' + textDivProperties.scale + ')';
transform = 'scaleX(' + textScale + ')';
} else {
transform = '';
} }
var rotation = textDiv.dataset.angle; if (textDivProperties.angle !== 0) {
if (rotation) { transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
transform = 'rotate(' + rotation + 'deg) ' + transform;
} }
if (transform) { if (transform !== '') {
textDiv.dataset.originalTransform = transform; textDivProperties.originalTransform = transform;
CustomStyle.setProp('transform' , textDiv, transform); CustomStyle.setProp('transform', textDiv, transform);
} }
task._textDivProperties.set(textDiv, textDivProperties);
} }
task._renderingDone = true; task._renderingDone = true;
capability.resolve(); capability.resolve();
} }
function expand(bounds, viewport) { function expand(task) {
var bounds = task._bounds;
var viewport = task._viewport;
var expanded = expandBounds(viewport.width, viewport.height, bounds); var expanded = expandBounds(viewport.width, viewport.height, bounds);
for (var i = 0; i < expanded.length; i++) { for (var i = 0; i < expanded.length; i++) {
var div = bounds[i].div; var div = bounds[i].div;
if (!div.dataset.angle) { var divProperties = task._textDivProperties.get(div);
div.dataset.paddingLeft = bounds[i].left - expanded[i].left; if (divProperties.angle === 0) {
div.dataset.paddingTop = bounds[i].top - expanded[i].top; divProperties.paddingLeft = bounds[i].left - expanded[i].left;
div.dataset.paddingRight = expanded[i].right - bounds[i].right; divProperties.paddingTop = bounds[i].top - expanded[i].top;
div.dataset.paddingBottom = expanded[i].bottom - bounds[i].bottom; divProperties.paddingRight = expanded[i].right - bounds[i].right;
divProperties.paddingBottom = expanded[i].bottom - bounds[i].bottom;
task._textDivProperties.set(div, divProperties);
continue; continue;
} }
// Box is rotated -- trying to find padding so rotated div will not // Box is rotated -- trying to find padding so rotated div will not
@ -25198,10 +25249,11 @@ var renderTextLayer = (function renderTextLayerClosure() {
// Not based on math, but to simplify calculations, using cos and sin // Not based on math, but to simplify calculations, using cos and sin
// absolute values to not exceed the box (it can but insignificantly). // absolute values to not exceed the box (it can but insignificantly).
var boxScale = 1 + Math.min(Math.abs(c), Math.abs(s)); var boxScale = 1 + Math.min(Math.abs(c), Math.abs(s));
div.dataset.paddingLeft = findPositiveMin(ts, 32, 16) / boxScale; divProperties.paddingLeft = findPositiveMin(ts, 32, 16) / boxScale;
div.dataset.paddingTop = findPositiveMin(ts, 48, 16) / boxScale; divProperties.paddingTop = findPositiveMin(ts, 48, 16) / boxScale;
div.dataset.paddingRight = findPositiveMin(ts, 0, 16) / boxScale; divProperties.paddingRight = findPositiveMin(ts, 0, 16) / boxScale;
div.dataset.paddingBottom = findPositiveMin(ts, 16, 16) / boxScale; divProperties.paddingBottom = findPositiveMin(ts, 16, 16) / boxScale;
task._textDivProperties.set(div, divProperties);
} }
} }
@ -25423,8 +25475,8 @@ var renderTextLayer = (function renderTextLayerClosure() {
this._textContent = textContent; this._textContent = textContent;
this._container = container; this._container = container;
this._viewport = viewport; this._viewport = viewport;
textDivs = textDivs || []; this._textDivs = textDivs || [];
this._textDivs = textDivs; this._textDivProperties = new WeakMap();
this._renderingDone = false; this._renderingDone = false;
this._canceled = false; this._canceled = false;
this._capability = createPromiseCapability(); this._capability = createPromiseCapability();
@ -25449,15 +25501,9 @@ var renderTextLayer = (function renderTextLayerClosure() {
_render: function TextLayer_render(timeout) { _render: function TextLayer_render(timeout) {
var textItems = this._textContent.items; var textItems = this._textContent.items;
var styles = this._textContent.styles; var textStyles = this._textContent.styles;
var textDivs = this._textDivs;
var viewport = this._viewport;
var bounds = this._bounds;
var enhanceTextSelection = this._enhanceTextSelection;
for (var i = 0, len = textItems.length; i < len; i++) { for (var i = 0, len = textItems.length; i < len; i++) {
appendText(textDivs, viewport, textItems[i], styles, bounds, appendText(this, textItems[i], textStyles);
enhanceTextSelection);
} }
if (!timeout) { // Render right away if (!timeout) { // Render right away
@ -25476,59 +25522,53 @@ var renderTextLayer = (function renderTextLayerClosure() {
return; return;
} }
if (!this._expanded) { if (!this._expanded) {
expand(this._bounds, this._viewport); expand(this);
this._expanded = true; this._expanded = true;
this._bounds.length = 0; this._bounds.length = 0;
} }
if (expandDivs) {
for (var i = 0, ii = this._textDivs.length; i < ii; i++) { for (var i = 0, ii = this._textDivs.length; i < ii; i++) {
var div = this._textDivs[i]; var div = this._textDivs[i];
var transform; var divProperties = this._textDivProperties.get(div);
var width = div.dataset.originalWidth;
if (div.dataset.canvasWidth !== undefined && width > 0) { if (expandDivs) {
// Dataset values are of type string. var transform = '';
var textScale = div.dataset.canvasWidth / width;
transform = 'scaleX(' + textScale + ')'; if (divProperties.scale !== 1) {
} else { transform = 'scaleX(' + divProperties.scale + ')';
transform = '';
} }
var rotation = div.dataset.angle; if (divProperties.angle !== 0) {
if (rotation) { transform = 'rotate(' + divProperties.angle + 'deg) ' + transform;
transform = 'rotate(' + rotation + 'deg) ' + transform;
} }
if (div.dataset.paddingLeft) { if (divProperties.paddingLeft !== 0) {
div.style.paddingLeft = div.style.paddingLeft =
(div.dataset.paddingLeft / textScale) + 'px'; (divProperties.paddingLeft / divProperties.scale) + 'px';
transform += ' translateX(' + transform += ' translateX(' +
(-div.dataset.paddingLeft / textScale) + 'px)'; (-divProperties.paddingLeft / divProperties.scale) + 'px)';
} }
if (div.dataset.paddingTop) { if (divProperties.paddingTop !== 0) {
div.style.paddingTop = div.dataset.paddingTop + 'px'; div.style.paddingTop = divProperties.paddingTop + 'px';
transform += ' translateY(' + (-div.dataset.paddingTop) + 'px)'; transform += ' translateY(' + (-divProperties.paddingTop) + 'px)';
} }
if (div.dataset.paddingRight) { if (divProperties.paddingRight !== 0) {
div.style.paddingRight = div.style.paddingRight =
div.dataset.paddingRight / textScale + 'px'; (divProperties.paddingRight / divProperties.scale) + 'px';
} }
if (div.dataset.paddingBottom) { if (divProperties.paddingBottom !== 0) {
div.style.paddingBottom = div.dataset.paddingBottom + 'px'; div.style.paddingBottom = divProperties.paddingBottom + 'px';
} }
if (transform) { if (transform !== '') {
CustomStyle.setProp('transform' , div, transform); CustomStyle.setProp('transform', div, transform);
} }
} } else {
} else {
for (i = 0, ii = this._textDivs.length; i < ii; i++) {
div = this._textDivs[i];
div.style.padding = 0; div.style.padding = 0;
transform = div.dataset.originalTransform || ''; CustomStyle.setProp('transform', div,
CustomStyle.setProp('transform', div, transform); divProperties.originalTransform);
} }
} }
}, },
}; };
/** /**
* Starts rendering of the text layer. * Starts rendering of the text layer.
* *

210
build/pdf.js
Unescape View File

@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdf = {}));
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
'use strict'; 'use strict';
var pdfjsVersion = '1.5.426'; var pdfjsVersion = '1.5.430';
var pdfjsBuild = '7db1983'; var pdfjsBuild = '38c8503';
var pdfjsFilePath = var pdfjsFilePath =
typeof document !== 'undefined' && document.currentScript ? typeof document !== 'undefined' && document.currentScript ?
@ -1457,6 +1457,37 @@ function createPromiseCapability() {
globalScope.Promise = Promise; globalScope.Promise = Promise;
})(); })();
(function WeakMapClosure() {
if (globalScope.WeakMap) {
return;
}
var id = 0;
function WeakMap() {
this.id = '$weakmap' + (id++);
}
WeakMap.prototype = {
has: function(obj) {
return !!Object.getOwnPropertyDescriptor(obj, this.id);
},
get: function(obj, defaultValue) {
return this.has(obj) ? obj[this.id] : defaultValue;
},
set: function(obj, value) {
Object.defineProperty(obj, this.id, {
value: value,
enumerable: false,
configurable: true
});
},
delete: function(obj) {
delete obj[this.id];
}
};
globalScope.WeakMap = WeakMap;
})();
var StatTimer = (function StatTimerClosure() { var StatTimer = (function StatTimerClosure() {
function rpad(str, pad, length) { function rpad(str, pad, length) {
while (str.length < length) { while (str.length < length) {
@ -5179,6 +5210,8 @@ var getDefaultSetting = displayDOMUtils.getDefaultSetting;
* initially be set to empty array. * initially be set to empty array.
* @property {number} timeout - (optional) Delay in milliseconds before * @property {number} timeout - (optional) Delay in milliseconds before
* rendering of the text runs occurs. * rendering of the text runs occurs.
* @property {boolean} enhanceTextSelection - (optional) Whether to turn on the
* text selection enhancement.
*/ */
var renderTextLayer = (function renderTextLayerClosure() { var renderTextLayer = (function renderTextLayerClosure() {
var MAX_TEXT_DIVS_TO_RENDER = 100000; var MAX_TEXT_DIVS_TO_RENDER = 100000;
@ -5189,17 +5222,31 @@ var renderTextLayer = (function renderTextLayerClosure() {
return !NonWhitespaceRegexp.test(str); return !NonWhitespaceRegexp.test(str);
} }
function appendText(textDivs, viewport, geom, styles, bounds, function appendText(task, geom, styles) {
enhanceTextSelection) { // Initialize all used properties to keep the caches monomorphic.
var style = styles[geom.fontName];
var textDiv = document.createElement('div'); var textDiv = document.createElement('div');
textDivs.push(textDiv); var textDivProperties = {
angle: 0,
canvasWidth: 0,
isWhitespace: false,
originalTransform: '',
paddingBottom: 0,
paddingLeft: 0,
paddingRight: 0,
paddingTop: 0,
scale: 1,
};
task._textDivs.push(textDiv);
if (isAllWhitespace(geom.str)) { if (isAllWhitespace(geom.str)) {
textDiv.dataset.isWhitespace = true; textDivProperties.isWhitespace = true;
task._textDivProperties.set(textDiv, textDivProperties);
return; return;
} }
var tx = Util.transform(viewport.transform, geom.transform);
var tx = Util.transform(task._viewport.transform, geom.transform);
var angle = Math.atan2(tx[1], tx[0]); var angle = Math.atan2(tx[1], tx[0]);
var style = styles[geom.fontName];
if (style.vertical) { if (style.vertical) {
angle += Math.PI / 2; angle += Math.PI / 2;
} }
@ -5228,32 +5275,34 @@ var renderTextLayer = (function renderTextLayerClosure() {
textDiv.textContent = geom.str; textDiv.textContent = geom.str;
// |fontName| is only used by the Font Inspector. This test will succeed // |fontName| is only used by the Font Inspector. This test will succeed
// when e.g. the Font Inspector is off but the Stepper is on, but it's // when e.g. the Font Inspector is off but the Stepper is on, but it's
// not worth the effort to do a more accurate test. // not worth the effort to do a more accurate test. We only use `dataset`
// here to make the font name available for the debugger.
if (getDefaultSetting('pdfBug')) { if (getDefaultSetting('pdfBug')) {
textDiv.dataset.fontName = geom.fontName; textDiv.dataset.fontName = geom.fontName;
} }
// Storing into dataset will convert number into string.
if (angle !== 0) { if (angle !== 0) {
textDiv.dataset.angle = angle * (180 / Math.PI); textDivProperties.angle = angle * (180 / Math.PI);
} }
// We don't bother scaling single-char text divs, because it has very // We don't bother scaling single-char text divs, because it has very
// little effect on text highlighting. This makes scrolling on docs with // little effect on text highlighting. This makes scrolling on docs with
// lots of such divs a lot faster. // lots of such divs a lot faster.
if (geom.str.length > 1) { if (geom.str.length > 1) {
if (style.vertical) { if (style.vertical) {
textDiv.dataset.canvasWidth = geom.height * viewport.scale; textDivProperties.canvasWidth = geom.height * task._viewport.scale;
} else { } else {
textDiv.dataset.canvasWidth = geom.width * viewport.scale; textDivProperties.canvasWidth = geom.width * task._viewport.scale;
} }
} }
if (enhanceTextSelection) { task._textDivProperties.set(textDiv, textDivProperties);
if (task._enhanceTextSelection) {
var angleCos = 1, angleSin = 0; var angleCos = 1, angleSin = 0;
if (angle !== 0) { if (angle !== 0) {
angleCos = Math.cos(angle); angleCos = Math.cos(angle);
angleSin = Math.sin(angle); angleSin = Math.sin(angle);
} }
var divWidth = (style.vertical ? geom.height : geom.width) * var divWidth = (style.vertical ? geom.height : geom.width) *
viewport.scale; task._viewport.scale;
var divHeight = fontHeight; var divHeight = fontHeight;
var m, b; var m, b;
@ -5264,7 +5313,7 @@ var renderTextLayer = (function renderTextLayerClosure() {
b = [left, top, left + divWidth, top + divHeight]; b = [left, top, left + divWidth, top + divHeight];
} }
bounds.push({ task._bounds.push({
left: b[0], left: b[0],
top: b[1], top: b[1],
right: b[2], right: b[2],
@ -5301,7 +5350,8 @@ var renderTextLayer = (function renderTextLayerClosure() {
var lastFontFamily; var lastFontFamily;
for (var i = 0; i < textDivsLength; i++) { for (var i = 0; i < textDivsLength; i++) {
var textDiv = textDivs[i]; var textDiv = textDivs[i];
if (textDiv.dataset.isWhitespace !== undefined) { var textDivProperties = task._textDivProperties.get(textDiv);
if (textDivProperties.isWhitespace) {
continue; continue;
} }
@ -5316,39 +5366,40 @@ var renderTextLayer = (function renderTextLayerClosure() {
} }
var width = ctx.measureText(textDiv.textContent).width; var width = ctx.measureText(textDiv.textContent).width;
textDiv.dataset.originalWidth = width;
textLayerFrag.appendChild(textDiv); textLayerFrag.appendChild(textDiv);
var transform; var transform = '';
if (textDiv.dataset.canvasWidth !== undefined && width > 0) { if (textDivProperties.canvasWidth !== 0 && width > 0) {
// Dataset values are of type string. textDivProperties.scale = textDivProperties.canvasWidth / width;
var textScale = textDiv.dataset.canvasWidth / width; transform = 'scaleX(' + textDivProperties.scale + ')';
transform = 'scaleX(' + textScale + ')';
} else {
transform = '';
} }
var rotation = textDiv.dataset.angle; if (textDivProperties.angle !== 0) {
if (rotation) { transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
transform = 'rotate(' + rotation + 'deg) ' + transform;
} }
if (transform) { if (transform !== '') {
textDiv.dataset.originalTransform = transform; textDivProperties.originalTransform = transform;
CustomStyle.setProp('transform' , textDiv, transform); CustomStyle.setProp('transform', textDiv, transform);
} }
task._textDivProperties.set(textDiv, textDivProperties);
} }
task._renderingDone = true; task._renderingDone = true;
capability.resolve(); capability.resolve();
} }
function expand(bounds, viewport) { function expand(task) {
var bounds = task._bounds;
var viewport = task._viewport;
var expanded = expandBounds(viewport.width, viewport.height, bounds); var expanded = expandBounds(viewport.width, viewport.height, bounds);
for (var i = 0; i < expanded.length; i++) { for (var i = 0; i < expanded.length; i++) {
var div = bounds[i].div; var div = bounds[i].div;
if (!div.dataset.angle) { var divProperties = task._textDivProperties.get(div);
div.dataset.paddingLeft = bounds[i].left - expanded[i].left; if (divProperties.angle === 0) {
div.dataset.paddingTop = bounds[i].top - expanded[i].top; divProperties.paddingLeft = bounds[i].left - expanded[i].left;
div.dataset.paddingRight = expanded[i].right - bounds[i].right; divProperties.paddingTop = bounds[i].top - expanded[i].top;
div.dataset.paddingBottom = expanded[i].bottom - bounds[i].bottom; divProperties.paddingRight = expanded[i].right - bounds[i].right;
divProperties.paddingBottom = expanded[i].bottom - bounds[i].bottom;
task._textDivProperties.set(div, divProperties);
continue; continue;
} }
// Box is rotated -- trying to find padding so rotated div will not // Box is rotated -- trying to find padding so rotated div will not
@ -5393,10 +5444,11 @@ var renderTextLayer = (function renderTextLayerClosure() {
// Not based on math, but to simplify calculations, using cos and sin // Not based on math, but to simplify calculations, using cos and sin
// absolute values to not exceed the box (it can but insignificantly). // absolute values to not exceed the box (it can but insignificantly).
var boxScale = 1 + Math.min(Math.abs(c), Math.abs(s)); var boxScale = 1 + Math.min(Math.abs(c), Math.abs(s));
div.dataset.paddingLeft = findPositiveMin(ts, 32, 16) / boxScale; divProperties.paddingLeft = findPositiveMin(ts, 32, 16) / boxScale;
div.dataset.paddingTop = findPositiveMin(ts, 48, 16) / boxScale; divProperties.paddingTop = findPositiveMin(ts, 48, 16) / boxScale;
div.dataset.paddingRight = findPositiveMin(ts, 0, 16) / boxScale; divProperties.paddingRight = findPositiveMin(ts, 0, 16) / boxScale;
div.dataset.paddingBottom = findPositiveMin(ts, 16, 16) / boxScale; divProperties.paddingBottom = findPositiveMin(ts, 16, 16) / boxScale;
task._textDivProperties.set(div, divProperties);
} }
} }
@ -5618,8 +5670,8 @@ var renderTextLayer = (function renderTextLayerClosure() {
this._textContent = textContent; this._textContent = textContent;
this._container = container; this._container = container;
this._viewport = viewport; this._viewport = viewport;
textDivs = textDivs || []; this._textDivs = textDivs || [];
this._textDivs = textDivs; this._textDivProperties = new WeakMap();
this._renderingDone = false; this._renderingDone = false;
this._canceled = false; this._canceled = false;
this._capability = createPromiseCapability(); this._capability = createPromiseCapability();
@ -5644,15 +5696,9 @@ var renderTextLayer = (function renderTextLayerClosure() {
_render: function TextLayer_render(timeout) { _render: function TextLayer_render(timeout) {
var textItems = this._textContent.items; var textItems = this._textContent.items;
var styles = this._textContent.styles; var textStyles = this._textContent.styles;
var textDivs = this._textDivs;
var viewport = this._viewport;
var bounds = this._bounds;
var enhanceTextSelection = this._enhanceTextSelection;
for (var i = 0, len = textItems.length; i < len; i++) { for (var i = 0, len = textItems.length; i < len; i++) {
appendText(textDivs, viewport, textItems[i], styles, bounds, appendText(this, textItems[i], textStyles);
enhanceTextSelection);
} }
if (!timeout) { // Render right away if (!timeout) { // Render right away
@ -5671,59 +5717,53 @@ var renderTextLayer = (function renderTextLayerClosure() {
return; return;
} }
if (!this._expanded) { if (!this._expanded) {
expand(this._bounds, this._viewport); expand(this);
this._expanded = true; this._expanded = true;
this._bounds.length = 0; this._bounds.length = 0;
} }
if (expandDivs) {
for (var i = 0, ii = this._textDivs.length; i < ii; i++) { for (var i = 0, ii = this._textDivs.length; i < ii; i++) {
var div = this._textDivs[i]; var div = this._textDivs[i];
var transform; var divProperties = this._textDivProperties.get(div);
var width = div.dataset.originalWidth;
if (div.dataset.canvasWidth !== undefined && width > 0) { if (expandDivs) {
// Dataset values are of type string. var transform = '';
var textScale = div.dataset.canvasWidth / width;
transform = 'scaleX(' + textScale + ')'; if (divProperties.scale !== 1) {
} else { transform = 'scaleX(' + divProperties.scale + ')';
transform = '';
} }
var rotation = div.dataset.angle; if (divProperties.angle !== 0) {
if (rotation) { transform = 'rotate(' + divProperties.angle + 'deg) ' + transform;
transform = 'rotate(' + rotation + 'deg) ' + transform;
} }
if (div.dataset.paddingLeft) { if (divProperties.paddingLeft !== 0) {
div.style.paddingLeft = div.style.paddingLeft =
(div.dataset.paddingLeft / textScale) + 'px'; (divProperties.paddingLeft / divProperties.scale) + 'px';
transform += ' translateX(' + transform += ' translateX(' +
(-div.dataset.paddingLeft / textScale) + 'px)'; (-divProperties.paddingLeft / divProperties.scale) + 'px)';
} }
if (div.dataset.paddingTop) { if (divProperties.paddingTop !== 0) {
div.style.paddingTop = div.dataset.paddingTop + 'px'; div.style.paddingTop = divProperties.paddingTop + 'px';
transform += ' translateY(' + (-div.dataset.paddingTop) + 'px)'; transform += ' translateY(' + (-divProperties.paddingTop) + 'px)';
} }
if (div.dataset.paddingRight) { if (divProperties.paddingRight !== 0) {
div.style.paddingRight = div.style.paddingRight =
div.dataset.paddingRight / textScale + 'px'; (divProperties.paddingRight / divProperties.scale) + 'px';
} }
if (div.dataset.paddingBottom) { if (divProperties.paddingBottom !== 0) {
div.style.paddingBottom = div.dataset.paddingBottom + 'px'; div.style.paddingBottom = divProperties.paddingBottom + 'px';
} }
if (transform) { if (transform !== '') {
CustomStyle.setProp('transform' , div, transform); CustomStyle.setProp('transform', div, transform);
} }
} } else {
} else {
for (i = 0, ii = this._textDivs.length; i < ii; i++) {
div = this._textDivs[i];
div.style.padding = 0; div.style.padding = 0;
transform = div.dataset.originalTransform || ''; CustomStyle.setProp('transform', div,
CustomStyle.setProp('transform', div, transform); divProperties.originalTransform);
} }
} }
}, },
}; };
/** /**
* Starts rendering of the text layer. * Starts rendering of the text layer.
* *

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

@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfWorker = {}));
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
'use strict'; 'use strict';
var pdfjsVersion = '1.5.426'; var pdfjsVersion = '1.5.430';
var pdfjsBuild = '7db1983'; var pdfjsBuild = '38c8503';
var pdfjsFilePath = var pdfjsFilePath =
typeof document !== 'undefined' && document.currentScript ? typeof document !== 'undefined' && document.currentScript ?
@ -2443,6 +2443,37 @@ function createPromiseCapability() {
globalScope.Promise = Promise; globalScope.Promise = Promise;
})(); })();
(function WeakMapClosure() {
if (globalScope.WeakMap) {
return;
}
var id = 0;
function WeakMap() {
this.id = '$weakmap' + (id++);
}
WeakMap.prototype = {
has: function(obj) {
return !!Object.getOwnPropertyDescriptor(obj, this.id);
},
get: function(obj, defaultValue) {
return this.has(obj) ? obj[this.id] : defaultValue;
},
set: function(obj, value) {
Object.defineProperty(obj, this.id, {
value: value,
enumerable: false,
configurable: true
});
},
delete: function(obj) {
delete obj[this.id];
}
};
globalScope.WeakMap = WeakMap;
})();
var StatTimer = (function StatTimerClosure() { var StatTimer = (function StatTimerClosure() {
function rpad(str, pad, length) { function rpad(str, pad, length) {
while (str.length < length) { while (str.length < length) {

2
package.json
Unescape View File

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

Write Preview
Loading…
Cancel
Save