Skip to content

Use the CFF program for cid fonts specifying an OT font in fontFile3 #20542

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

Draft
calixteman wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −3
Draft

Use the CFF program for cid fonts specifying an OT font in fontFile3 #20542

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
18 changes: 16 additions & 2 deletions src/core/evaluator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4558,9 +4558,22 @@ class PartialEvaluator {
throw new FormatError("invalid font name");
}

let fontFile, subtype, length1, length2, length3;
let fontFile, fontFileN, subtype, length1, length2, length3;
try {
fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3");
fontFile = descriptor.get("FontFile");
if (fontFile) {
fontFileN = 1;
} else {
fontFile = descriptor.get("FontFile2");
if (fontFile) {
fontFileN = 2;
} else {
fontFile = descriptor.get("FontFile3");
if (fontFile) {
fontFileN = 3;
}
}
}

if (fontFile) {
if (!(fontFile instanceof BaseStream)) {
Expand Down Expand Up @@ -4662,6 +4675,7 @@ class PartialEvaluator {
name: fontName.name,
subtype,
file: fontFile,
fontFileN,
length1,
length2,
length3,
Expand Down
3 changes: 2 additions & 1 deletion src/core/fonts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2642,7 +2642,8 @@ class Font {
if (!isTrueType) {
// OpenType font (skip composite fonts with non-default glyph mapping).
if (
(header.version === "OTTO" && !properties.composite) ||
(header.version === "OTTO" &&
(!properties.composite || properties.fontFileN === 3)) ||
!tables.head ||
!tables.hhea ||
!tables.maxp ||
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 @@ -768,3 +768,4 @@
!issue20513.pdf
!issue20516.pdf
!issue20489.pdf
!Embedded_font.pdf
Binary file added test/pdfs/Embedded_font.pdf
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions test/test_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13131,5 +13131,12 @@
"rounds": 1,
"link": true,
"type": "eq"
},
{
"id": "Embedded_font.pdf",
"file": "pdfs/Embedded_font.pdf",
"md5": "5625dc05630ca728f45b02baf11dc540",
"rounds": 1,
"type": "eq"
}
]