Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In a text widget, Font resources can be in the appearance

Browse Source
This commit is contained in:
Calixte Denizet 2020-09-19 17:11:04 +02:00
parent 35845d1bbb
commit 83119b9000
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/annotation.js
View File

@ -998,12 +998,16 @@ class WidgetAnnotation extends Annotation {
const localResources = getInheritableProperty({ dict, key: "DR" }); const localResources = getInheritableProperty({ dict, key: "DR" });
const acroFormResources = params.acroForm.get("DR"); const acroFormResources = params.acroForm.get("DR");
const appearanceResources =
this.appearance && this.appearance.dict.get("Resources");
this._fieldResources = { this._fieldResources = {
localResources, localResources,
acroFormResources, acroFormResources,
appearanceResources,
mergedResources: Dict.merge({ mergedResources: Dict.merge({
xref: params.xref, xref: params.xref,
dictArray: [localResources, acroFormResources], dictArray: [localResources, appearanceResources, acroFormResources],
mergeSubDicts: true, mergeSubDicts: true,
}), }),
}; };
@ -1450,17 +1454,25 @@ class WidgetAnnotation extends Annotation {
"Expected `_getAppearance()` to have been called." "Expected `_getAppearance()` to have been called."
); );
} }
const { localResources, acroFormResources } = this._fieldResources; const {
localResources,
acroFormResources,
appearanceResources,
} = this._fieldResources;
if (!this._fontName) { if (!this._fontName) {
return localResources || Dict.empty; return localResources || Dict.empty;
} }
if (localResources instanceof Dict) {
const localFont = localResources.get("Font"); for (const resources of [localResources, appearanceResources]) {
if (localFont instanceof Dict && localFont.has(this._fontName)) { if (resources instanceof Dict) {
return localResources; const localFont = resources.get("Font");
if (localFont instanceof Dict && localFont.has(this._fontName)) {
return resources;
}
} }
} }
if (acroFormResources instanceof Dict) { if (acroFormResources instanceof Dict) {
const acroFormFont = acroFormResources.get("Font"); const acroFormFont = acroFormResources.get("Font");
if (acroFormFont instanceof Dict && acroFormFont.has(this._fontName)) { if (acroFormFont instanceof Dict && acroFormFont.has(this._fontName)) {

12
test/test_manifest.json
View File

@ -4410,6 +4410,18 @@
"lastPage": 1, "lastPage": 1,
"type": "eq" "type": "eq"
}, },
{ "id": "issue12394",
"file": "pdfs/issue12392.pdf",
"md5": "76c3a34c6520940c45c66c92f7df2de5",
"rounds": 1,
"link": true,
"lastPage": 1,
"type": "eq",
"print": "true",
"annotationStorage": {
"35R": "收文"
}
},
{ "id": "issue4883", { "id": "issue4883",
"file": "pdfs/issue4883.pdf", "file": "pdfs/issue4883.pdf",
"md5": "2fac0d9a189ca5fcef8626153d050be8", "md5": "2fac0d9a189ca5fcef8626153d050be8",