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

[api-minor] Change the format of the fontName-property, in defaultAppearanceData, on Annotation-instances (PR 12831 follow-up) #13169

Merged
merged 1 commit into from
Apr 2, 2021
Merged

[api-minor] Change the format of the fontName-property, in defaultAppearanceData, on Annotation-instances (PR 12831 follow-up) #13169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/core/annotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ class WidgetAnnotation extends Annotation {
const { fontName, fontSize } = this.data.defaultAppearanceData;
await evaluator.handleSetFont(
this._fieldResources.mergedResources,
[fontName, fontSize],
[fontName && Name.get(fontName), fontSize],
/* fontRef = */ null,
operatorList,
task,
Expand Down Expand Up @@ -1565,26 +1565,26 @@ class WidgetAnnotation extends Annotation {
acroFormResources,
} = this._fieldResources;

const fontNameStr =
const fontName =
this.data.defaultAppearanceData &&
this.data.defaultAppearanceData.fontName.name;
if (!fontNameStr) {
this.data.defaultAppearanceData.fontName;
if (!fontName) {
return localResources || Dict.empty;
}

for (const resources of [localResources, appearanceResources]) {
if (resources instanceof Dict) {
const localFont = resources.get("Font");
if (localFont instanceof Dict && localFont.has(fontNameStr)) {
if (localFont instanceof Dict && localFont.has(fontName)) {
return resources;
}
}
}
if (acroFormResources instanceof Dict) {
const acroFormFont = acroFormResources.get("Font");
if (acroFormFont instanceof Dict && acroFormFont.has(fontNameStr)) {
if (acroFormFont instanceof Dict && acroFormFont.has(fontName)) {
const subFontDict = new Dict(xref);
subFontDict.set(fontNameStr, acroFormFont.getRaw(fontNameStr));
subFontDict.set(fontName, acroFormFont.getRaw(fontName));

const subResourcesDict = new Dict(xref);
subResourcesDict.set("Font", subFontDict);
Expand Down
12 changes: 6 additions & 6 deletions src/core/default_appearance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
* limitations under the License.
*/

import { isName, Name } from "./primitives.js";
import { OPS, warn } from "../shared/util.js";
import { ColorSpace } from "./colorspace.js";
import { escapePDFName } from "./core_utils.js";
import { EvaluatorPreprocessor } from "./evaluator.js";
import { Name } from "./primitives.js";
import { StringStream } from "./stream.js";

class DefaultAppearanceEvaluator extends EvaluatorPreprocessor {
Expand All @@ -32,8 +32,8 @@ class DefaultAppearanceEvaluator extends EvaluatorPreprocessor {
};
const result = {
fontSize: 0,
fontName: Name.get(""),
fontColor: new Uint8ClampedArray([0, 0, 0]) /* black */,
fontName: "",
fontColor: /* black = */ new Uint8ClampedArray(3),
};

try {
Expand All @@ -51,8 +51,8 @@ class DefaultAppearanceEvaluator extends EvaluatorPreprocessor {
switch (fn | 0) {
case OPS.setFont:
const [fontName, fontSize] = args;
if (isName(fontName)) {
result.fontName = fontName;
if (fontName instanceof Name) {
result.fontName = fontName.name;
}
if (typeof fontSize === "number" && fontSize > 0) {
result.fontSize = fontSize;
Expand Down Expand Up @@ -93,7 +93,7 @@ function createDefaultAppearance({ fontSize, fontName, fontColor }) {
.map(c => (c / 255).toFixed(2))
.join(" ") + " rg";
}
return `/${escapePDFName(fontName.name)} ${fontSize} Tf ${colorCmd}`;
return `/${escapePDFName(fontName)} ${fontSize} Tf ${colorCmd}`;
}

export { createDefaultAppearance, parseDefaultAppearance };
8 changes: 2 additions & 6 deletions src/core/evaluator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,12 +794,8 @@ class PartialEvaluator {
state,
fallbackFontDict = null
) {
// TODO(mack): Not needed?
var fontName;
if (fontArgs) {
fontArgs = fontArgs.slice();
fontName = fontArgs[0].name;
}
const fontName =
fontArgs && fontArgs[0] instanceof Name ? fontArgs[0].name : null;

return this.loadFont(fontName, fontRef, resources, fallbackFontDict)
.then(translated => {
Expand Down
7 changes: 3 additions & 4 deletions test/unit/default_appearance_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ import {
createDefaultAppearance,
parseDefaultAppearance,
} from "../../src/core/default_appearance.js";
import { Name } from "../../src/core/primitives.js";

describe("Default appearance", function () {
describe("parseDefaultAppearance and createDefaultAppearance", function () {
it("should parse and create default appearance", function () {
const da = "/F1 12 Tf 0.10 0.20 0.30 rg";
const result = {
fontSize: 12,
fontName: Name.get("F1"),
fontName: "F1",
fontColor: new Uint8ClampedArray([26, 51, 76]),
};
expect(parseDefaultAppearance(da)).toEqual(result);
Expand All @@ -37,7 +36,7 @@ describe("Default appearance", function () {
)
).toEqual({
fontSize: 13,
fontName: Name.get("F2"),
fontName: "F2",
fontColor: new Uint8ClampedArray([76, 51, 26]),
});
});
Expand All @@ -47,7 +46,7 @@ describe("Default appearance", function () {
"q Q 0.10 0.20 0.30 rg /F1 12 Tf q 0.30 0.20 0.10 rg /F2 13 Tf Q";
expect(parseDefaultAppearance(da)).toEqual({
fontSize: 12,
fontName: Name.get("F1"),
fontName: "F1",
fontColor: new Uint8ClampedArray([26, 51, 76]),
});
});
Expand Down