Conversation
|
Actually, the test updates are unrelated to this. They were failing before I made any change. So maybe those should be updated separately? |
|
| normalizeLocation({**defaultLocation, **source.location}, axisDict) | ||
| for source in glyphSources | ||
| ] | ||
| def prepareLocations(glyphSources, defaultLocation, axisDict, fontSources=None): |
There was a problem hiding this comment.
| def prepareLocations(glyphSources, defaultLocation, axisDict, fontSources=None): | |
| def prepareLocations(glyphSources, defaultLocation, axisDict, fontSources): |
This function isn't likely being used elsewhere, so I'm fine with not making this backwards compatible.
| # stores axes that differ from that master's position (e.g. a brace | ||
| # layer adds one extra axis value). Merge the master's full location | ||
| # first so the glyph source's explicit values can override it. | ||
| if source.locationBase and fontSources and source.locationBase in fontSources: |
There was a problem hiding this comment.
Suggest to add a helper function (untested):
def getGlyphSourceLocation(glyphSource, fontSources):
return (
glyphSource.location
if glyphSource.locationBase is None
or glyphSource.locationBase not in fontSources
else {**fontSources[glyphSource.locationBase].location, **glyphSource.location}
)Then the main for source in glyphSources loop can become a list comprehension again.
Sorry, I totally forgot to setup pre-commit first. |
|
Ah ok, I made a fresh venv, and I indeed see the failures. I'll try to see which dependency caused this. |
|
It's booleanOperations: it's a slight difference in remove overlap in the G glyph. Yeah, ideally this would be a separate fix. I can do that tomorrow. |
Done in #95. |
2 participants
This makes it possible to build a VARC font from the sources used in fontra/fontra-glyphs#134
This fixes #76.