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

[t1Lib] Fix several Type 1 issues #3240

Merged
merged 2 commits into from
Aug 4, 2023
Merged

[t1Lib] Fix several Type 1 issues #3240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2808d99
Fix several issues exposed by the fonts posted in #3238
justvanrossum Aug 3, 2023
b00c50b
Remove false Python 2 remark
justvanrossum Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 21 additions & 11 deletions Lib/fontTools/t1Lib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""fontTools.t1Lib.py -- Tools for PostScript Type 1 fonts (Python2 only)
"""fontTools.t1Lib.py -- Tools for PostScript Type 1 fonts.

Functions for reading and writing raw Type 1 data:

Expand Down Expand Up @@ -170,8 +170,13 @@

# '-|', '|-', '|'
RD_key, ND_key, NP_key = None, None, None
lenIV = 4
subrs = std_subrs

for key, value in eexec_dict.items():
# Ensure we look at Private first, because we need RD_key, ND_key, NP_key and lenIV
sortedItems = sorted(eexec_dict.items(), key=lambda item: item[0] != "Private")

for key, value in sortedItems:
if key == "Private":
pr = eexec_dict["Private"]
# follow t1write.c:writePrivateDict
Expand All @@ -183,20 +188,25 @@
for subkey, subvalue in pr.items():
if not RD_key and subvalue == RD_value:
RD_key = subkey
elif not ND_key and subvalue == ND_value:
elif not ND_key and subvalue in ND_values:
ND_key = subkey
elif not NP_key and subvalue == PD_value:
elif not NP_key and subvalue in PD_values:
NP_key = subkey

if subkey == "lenIV":
lenIV = subvalue

Check warning on line 197 in Lib/fontTools/t1Lib/__init__.py

View check run for this annotation

Codecov / codecov/patch

Lib/fontTools/t1Lib/__init__.py#L197 

Added line #L197 was not covered by tests

if subkey == "OtherSubrs":
# XXX: assert that no flex hint is used
lines.append(self._tobytes(hintothers))
elif subkey == "Subrs":
# XXX: standard Subrs only
lines.append(b"/Subrs 5 array")
for i, subr_bin in enumerate(std_subrs):
for subr_bin in subvalue:
subr_bin.compile()
subrs = [subr_bin.bytecode for subr_bin in subvalue]
lines.append(f"/Subrs {len(subrs)} array".encode("ascii"))
for i, subr_bin in enumerate(subrs):
encrypted_subr, R = eexec.encrypt(
bytesjoin([char_IV, subr_bin]), 4330
bytesjoin([char_IV[:lenIV], subr_bin]), 4330
)
lines.append(
bytesjoin(
Expand All @@ -222,7 +232,7 @@
for glyph_name, char_bin in eexec_dict["CharStrings"].items():
char_bin.compile()
encrypted_char, R = eexec.encrypt(
bytesjoin([char_IV, char_bin.bytecode]), 4330
bytesjoin([char_IV[:lenIV], char_bin.bytecode]), 4330
)
lines.append(
bytesjoin(
Expand Down Expand Up @@ -634,5 +644,5 @@
eexec_IV = b"cccc"
char_IV = b"\x0c\x0c\x0c\x0c"
RD_value = ("string", "currentfile", "exch", "readstring", "pop")
ND_value = ("def",)
PD_value = ("put",)
ND_values = [("def",), ("noaccess", "def")]
PD_values = [("put",), ("noaccess", "put")]