Skip to content

truetype.instructions formatVersion as string, controlValue as dict #51

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

Merged
typemytype merged 2 commits into from
Oct 7, 2022
Merged

truetype.instructions formatVersion as string, controlValue as dict #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e14033
instructions formatVersion as string, controlValue as dict
moyogo Aug 26, 2022
0aa3594
unused variable
moyogo Aug 26, 2022
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
7 changes: 2 additions & 5 deletions Lib/extractor/formats/opentype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def extractInstructions(source, destination):
return

lib = destination.lib[TRUETYPE_INSTRUCTIONS_KEY] = {
"formatVersion": 1,
"formatVersion": "1",
"maxFunctionDefs": 0,
"maxInstructionDefs": 0,
"maxStackElements": 0,
Expand All @@ -123,9 +123,7 @@ def extractControlValues(source, lib):
if "cvt " not in source:
return
cvt = source["cvt "]
lib["controlValue"] = [
{"id": str(i), "value": val} for i, val in enumerate(cvt.values)
]
lib["controlValue"] = {str(i): val for i, val in enumerate(cvt.values)}


def extractFontProgram(source, lib):
Expand Down Expand Up @@ -366,7 +364,6 @@ def _extracInfoOS2(source, info):
info.openTypeOS2VendorID = "".join(r)
# openTypeOS2Panose
if hasattr(os2, "panose"):
panose = os2.panose
info.openTypeOS2Panose = [
os2.panose.bFamilyType,
os2.panose.bSerifStyle,
Expand Down