mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Merge pull request #13461 from Snuffleupagus/issue-6605

Browse source 
Improve text-selection for Type3 fonts with empty /FontBBox-entries (issue 6605)
This commit is contained in:
Tim van der Meij 2021-06-06 14:37:52 +02:00 • committed by GitHub
commit 2b63d97b9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/core/evaluator.js
View file

@ -2115,7 +2115,7 @@ class PartialEvaluator {
if (
font.isType3Font &&
textState.fontSize <= 1 &&
(textState.fontSize <= 1 || font.isCharBBox) &&
!isArrayEqual(textState.fontMatrix, FONT_IDENTITY_MATRIX)
) {
const glyphHeight = font.bbox[3] - font.bbox[1];
@ -2251,6 +2251,20 @@ class PartialEvaluator {
function handleSetFont(fontName, fontRef) {
return self
.loadFont(fontName, fontRef, resources)
.then(function (translated) {
if (!translated.font.isType3Font) {
return translated;
}
return translated
.loadType3Data(self, resources, task)
.catch(function () {
// Ignore Type3-parsing errors, since we only use `loadType3Data`
// here to ensure that we'll always obtain a useful /FontBBox.
})
.then(function () {
return translated;
});
})
.then(function (translated) {
textState.font = translated.font;
textState.fontMatrix =
@ -3815,7 +3829,7 @@ class PartialEvaluator {
firstChar,
lastChar,
toUnicode,
bbox: descriptor.getArray("FontBBox"),
bbox: descriptor.getArray("FontBBox") || dict.getArray("FontBBox"),
ascent: descriptor.get("Ascent"),
descent: descriptor.get("Descent"),
xHeight: descriptor.get("XHeight"),
@ -3962,6 +3976,9 @@ class TranslatedFont {
const fontResources = this.dict.get("Resources") || resources;
const charProcOperatorList = Object.create(null);
const isEmptyBBox =
!translatedFont.bbox || isArrayEqual(translatedFont.bbox, [0, 0, 0, 0]);
for (const key of charProcs.getKeys()) {
loadCharProcsPromise = loadCharProcsPromise.then(() => {
const glyphStream = charProcs.get(key);
@ -3981,7 +3998,7 @@ class TranslatedFont {
// colour-related parameters) in the graphics state;
// any use of such operators shall be ignored."
if (operatorList.fnArray[0] === OPS.setCharWidthAndBounds) {
this._removeType3ColorOperators(operatorList);
this._removeType3ColorOperators(operatorList, isEmptyBBox);
}
charProcOperatorList[key] = operatorList.getIR();
@ -3996,8 +4013,12 @@ class TranslatedFont {
});
});
}
this.type3Loaded = loadCharProcsPromise.then(function () {
this.type3Loaded = loadCharProcsPromise.then(() => {
translatedFont.charProcOperatorList = charProcOperatorList;
if (this._bbox) {
translatedFont.isCharBBox = true;
translatedFont.bbox = this._bbox;
}
});
return this.type3Loaded;
}
@ -4005,7 +4026,7 @@ class TranslatedFont {
/**
* @private
*/
_removeType3ColorOperators(operatorList) {
_removeType3ColorOperators(operatorList, isEmptyBBox = false) {
if (
typeof PDFJSDev === "undefined" ||
PDFJSDev.test("!PRODUCTION || TESTING")
@ -4015,6 +4036,17 @@ class TranslatedFont {
"Type3 glyph shall start with the d1 operator."
);
}
if (isEmptyBBox) {
if (!this._bbox) {
this._bbox = [Infinity, Infinity, -Infinity, -Infinity];
}
const charBBox = Util.normalizeRect(operatorList.argsArray[0].slice(2));
this._bbox[0] = Math.min(this._bbox[0], charBBox[0]);
this._bbox[1] = Math.min(this._bbox[1], charBBox[1]);
this._bbox[2] = Math.max(this._bbox[2], charBBox[2]);
this._bbox[3] = Math.max(this._bbox[3], charBBox[3]);
}
let i = 1,
ii = operatorList.length;
while (i < ii) {