Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve text-selection for Type3 fonts with empty /FontBBox-entries (issue 6605) #13461

Merged
merged 2 commits into from
Jun 6, 2021
Merged

Improve text-selection for Type3 fonts with empty /FontBBox-entries (issue 6605) #13461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20770cb
Improve text-selection for Type3 fonts with empty /FontBBox-entries (…
Snuffleupagus May 29, 2021
eefc94c
Ensure that we fully load Type3 fonts in `PartialEvaluator.getTextCon…
Snuffleupagus May 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 37 additions & 5 deletions src/core/evaluator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -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);
Expand All @@ -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();

Expand All @@ -3996,16 +4013,20 @@ 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;
}

/**
* @private
*/
_removeType3ColorOperators(operatorList) {
_removeType3ColorOperators(operatorList, isEmptyBBox = false) {
if (
typeof PDFJSDev === "undefined" ||
PDFJSDev.test("!PRODUCTION || TESTING")
Expand All @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions test/pdfs/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@
!quadpoints.pdf
!transparent.pdf
!xobject-image.pdf
!issue6605.pdf
!ccitt_EndOfBlock_false.pdf
!issue9972-1.pdf
!issue9972-2.pdf
Expand Down
Binary file added test/pdfs/issue6605.pdf
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions test/test_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4935,6 +4935,12 @@
"type": "eq",
"annotations": true
},
{ "id": "issue6605",
"file": "pdfs/issue6605.pdf",
"md5": "67158a9c6d0e966ece55f7c433e18cc5",
"rounds": 1,
"type": "text"
},
{ "id": "annotation-choice-widget-forms",
"file": "pdfs/annotation-choice-widget.pdf",
"md5": "7dfb0d743a0da0f4a71b209ab43b0be5",
Expand Down