|
@@ -11607,7 +11607,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
|
|
|
if (worker.destroyed) {
|
|
|
return Promise.reject(new Error('Worker was destroyed'));
|
|
|
}
|
|
|
- var apiVersion = '2.0.163';
|
|
|
+ var apiVersion = '2.0.165';
|
|
|
source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
|
|
|
source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
|
|
|
source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
|
|
@@ -12887,8 +12887,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
|
|
|
}();
|
|
|
var version, build;
|
|
|
{
|
|
|
- exports.version = version = '2.0.163';
|
|
|
- exports.build = build = '3e34eb31';
|
|
|
+ exports.version = version = '2.0.165';
|
|
|
+ exports.build = build = 'e78fe842';
|
|
|
}
|
|
|
exports.getDocument = getDocument;
|
|
|
exports.LoopbackPort = LoopbackPort;
|
|
@@ -26543,8 +26543,8 @@ exports.SVGGraphics = SVGGraphics;
|
|
|
"use strict";
|
|
|
|
|
|
|
|
|
-var pdfjsVersion = '2.0.163';
|
|
|
-var pdfjsBuild = '3e34eb31';
|
|
|
+var pdfjsVersion = '2.0.165';
|
|
|
+var pdfjsBuild = 'e78fe842';
|
|
|
var pdfjsSharedUtil = __w_pdfjs_require__(0);
|
|
|
var pdfjsDisplayGlobal = __w_pdfjs_require__(129);
|
|
|
var pdfjsDisplayAPI = __w_pdfjs_require__(65);
|
|
@@ -31873,8 +31873,8 @@ if (!_global_scope2.default.PDFJS) {
|
|
|
}
|
|
|
var PDFJS = _global_scope2.default.PDFJS;
|
|
|
{
|
|
|
- PDFJS.version = '2.0.163';
|
|
|
- PDFJS.build = '3e34eb31';
|
|
|
+ PDFJS.version = '2.0.165';
|
|
|
+ PDFJS.build = 'e78fe842';
|
|
|
}
|
|
|
PDFJS.pdfBug = false;
|
|
|
if (PDFJS.verbosity !== undefined) {
|
|
@@ -33311,7 +33311,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
|
|
|
nextLine: function CanvasGraphics_nextLine() {
|
|
|
this.moveText(0, this.current.leading);
|
|
|
},
|
|
|
- paintChar: function CanvasGraphics_paintChar(character, x, y) {
|
|
|
+ paintChar: function paintChar(character, x, y, patternTransform) {
|
|
|
var ctx = this.ctx;
|
|
|
var current = this.current;
|
|
|
var font = current.font;
|
|
@@ -33319,15 +33319,19 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
|
|
|
var fontSize = current.fontSize / current.fontSizeScale;
|
|
|
var fillStrokeMode = textRenderingMode & _util.TextRenderingMode.FILL_STROKE_MASK;
|
|
|
var isAddToPathSet = !!(textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG);
|
|
|
+ var patternFill = current.patternFill && font.data;
|
|
|
var addToPath;
|
|
|
- if (font.disableFontFace || isAddToPathSet) {
|
|
|
+ if (font.disableFontFace || isAddToPathSet || patternFill) {
|
|
|
addToPath = font.getPathGenerator(this.commonObjs, character);
|
|
|
}
|
|
|
- if (font.disableFontFace) {
|
|
|
+ if (font.disableFontFace || patternFill) {
|
|
|
ctx.save();
|
|
|
ctx.translate(x, y);
|
|
|
ctx.beginPath();
|
|
|
addToPath(ctx, fontSize);
|
|
|
+ if (patternTransform) {
|
|
|
+ ctx.setTransform.apply(ctx, patternTransform);
|
|
|
+ }
|
|
|
if (fillStrokeMode === _util.TextRenderingMode.FILL || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
|
|
|
ctx.fill();
|
|
|
}
|
|
@@ -33354,6 +33358,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
get isFontSubpixelAAEnabled() {
|
|
|
var ctx = this.canvasFactory.create(10, 10).context;
|
|
|
ctx.scale(1.5, 1);
|
|
@@ -33389,13 +33394,18 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
|
|
|
var spacingDir = vertical ? 1 : -1;
|
|
|
var defaultVMetrics = font.defaultVMetrics;
|
|
|
var widthAdvanceScale = fontSize * current.fontMatrix[0];
|
|
|
- var simpleFillText = current.textRenderingMode === _util.TextRenderingMode.FILL && !font.disableFontFace;
|
|
|
+ var simpleFillText = current.textRenderingMode === _util.TextRenderingMode.FILL && !font.disableFontFace && !current.patternFill;
|
|
|
ctx.save();
|
|
|
- ctx.transform.apply(ctx, current.textMatrix);
|
|
|
- ctx.translate(current.x, current.y + current.textRise);
|
|
|
+ var patternTransform = void 0;
|
|
|
if (current.patternFill) {
|
|
|
- ctx.fillStyle = current.fillColor.getPattern(ctx, this);
|
|
|
+ ctx.save();
|
|
|
+ var pattern = current.fillColor.getPattern(ctx, this);
|
|
|
+ patternTransform = ctx.mozCurrentTransform;
|
|
|
+ ctx.restore();
|
|
|
+ ctx.fillStyle = pattern;
|
|
|
}
|
|
|
+ ctx.transform.apply(ctx, current.textMatrix);
|
|
|
+ ctx.translate(current.x, current.y + current.textRise);
|
|
|
if (fontDirection > 0) {
|
|
|
ctx.scale(textHScale, -1);
|
|
|
} else {
|
|
@@ -33460,11 +33470,11 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
|
|
|
if (simpleFillText && !accent) {
|
|
|
ctx.fillText(character, scaledX, scaledY);
|
|
|
} else {
|
|
|
- this.paintChar(character, scaledX, scaledY);
|
|
|
+ this.paintChar(character, scaledX, scaledY, patternTransform);
|
|
|
if (accent) {
|
|
|
scaledAccentX = scaledX + accent.offset.x / fontSizeScale;
|
|
|
scaledAccentY = scaledY - accent.offset.y / fontSizeScale;
|
|
|
- this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY);
|
|
|
+ this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY, patternTransform);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -35224,7 +35234,7 @@ var WorkerMessageHandler = {
|
|
|
var cancelXHRs = null;
|
|
|
var WorkerTasks = [];
|
|
|
var apiVersion = docParams.apiVersion;
|
|
|
- var workerVersion = '2.0.163';
|
|
|
+ var workerVersion = '2.0.165';
|
|
|
if (apiVersion !== null && apiVersion !== workerVersion) {
|
|
|
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
|
|
|
}
|
|
@@ -40701,7 +40711,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
|
|
|
var font = state.font;
|
|
|
var glyphs = font.charsToGlyphs(chars);
|
|
|
var isAddToPathSet = !!(state.textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG);
|
|
|
- if (font.data && (isAddToPathSet || this.options.disableFontFace)) {
|
|
|
+ if (font.data && (isAddToPathSet || this.options.disableFontFace || state.fillColorSpace.name === 'Pattern')) {
|
|
|
var buildPath = function buildPath(fontChar) {
|
|
|
if (!font.renderer.hasBuiltPath(fontChar)) {
|
|
|
var path = font.renderer.getPathJs(fontChar);
|