8000 [VARC] Special-case hidden axes when applying RESET_UNSPECIFIED_AXES to pen.addVarComponent() by justvanrossum · Pull Request #3549 · fonttools/fonttools · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[VAR 8000 C] Special-case hidden axes when applying RESET_UNSPECIFIED_AXES to pen.addVarComponent() #3549

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[VARC] Special-case hidden axes when applying RESET_UNSPECIFIED_AXES to pen.addVarComponent() #3549

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f6fe09
Use original location to reflect updated meaning of RESET_UNSPECIFIED…
justvanrossum May 30, 2024
99b9af3
Make 'reset' reset to default for hidden axes, but to original locati…
justvanrossum May 30, 2024
97c8117
Add comment
justvanrossum May 30, 2024
1630d17
Rename attribute for clarity
justvanrossum May 30, 2024
f0fc7ed
Fix breakage
justvanrossum May 30, 2024
61a3b59
Fix logic so variable name makes sense
justvanrossum May 30, 2024
3ef25f1
Cleanup with a variable
justvanrossum May 30, 2024
6145adb
Simplify, and avoid dict | dict syntax, which is Python >= 3.9
justvanrossum May 30, 2024
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
36 changes: 23 additions & 13 deletions Lib/fontTools/ttLib/ttGlyphSet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,25 @@ class _TTGlyphSet(Mapping):
def __init__(self, font, location, glyphsMapping, *, recalcBounds=True):
self.recalcBounds = recalcBounds
self.font = font
self.defaultLocationNormalized = (
{axis.axisTag: 0 for axis in self.font["fvar"].axes}
if "fvar" in self.font
else {}
)

axes = self.font["fvar"].axes if "fvar" in self.font else []
hiddenAxisTags = {
axis.axisTag for axis in axes if axis.flags & 0x0001 # HIDDEN_AXIS
}

self.location = location if location is not None else {}
self.rawLocation = {} # VarComponent-only location
# For VarComponents and addVarComponent() we need to maintain a sparse
# location, so the addVarComponent() client can know which axes are set,
# and which to infer from the current global font location
self.sparseVarComponentLocation = {} # VarComponent-only location
self.originalLocation = location if location is not None else {}
self.originalLocationNonHidden = {
k: 0 if k in hiddenAxisTags else v for k, v in self.originalLocation.items()
}

self.depth = 0
self.locationStack = []
self.rawLocationStack = []
self.sparseVarComponentLocationStack = []
self.glyphsMapping = glyphsMapping
self.hMetrics = font["hmtx"].metrics
self.vMetrics = getattr(font.get("vmtx"), "metrics", None)
Expand All @@ -53,21 +61,21 @@ def __init__(self, font, location, glyphsMapping, *, recalcBounds=True):
@contextmanager
def pushLocation(self, location, reset: bool):
self.locationStack.append(self.location)
self.rawLocationStack.append(self.rawLocation)
self.sparseVarComponentLocationStack.append(self.sparseVarComponentLocation)
if reset:
self.location = self.originalLocation.copy()
self.rawLocation = self.defaultLocationNormalized.copy()
self.sparseVarComponentLocation = self.originalLocationNonHidden.copy()
else:
self.location = self.location.copy()
self.rawLocation = {}
self.sparseVarComponentLocation = {}
self.location.update(location)
self.rawLocation.update(location)
self.sparseVarComponentLocation.update(location)

try:
yield None
finally:
self.location = self.locationStack.pop()
self.rawLocation = self.rawLocationStack.pop()
self.sparseVarComponentLocation = self.sparseVarComponentLocationStack.pop()

@contextmanager
def pushDepth(self):
Expand Down Expand Up @@ -371,7 +379,9 @@ def _draw(self, pen, isPointPen):
if not shouldDecompose:
try:
pen.addVarComponent(
comp.glyphName, transform, self.glyphSet.rawLocation
comp.glyphName,
transform,
self.glyphSet.sparseVarComponentLocation,
)
except AttributeError:
shouldDecompose = True
Expand Down
0