Skip to content

Transformation Matrix fix #83

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
connordavenport wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Transformation Matrix fix #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63920fb
Transformation Matrix fix
connordavenport Oct 16, 2024
988bdde
ignore matrix if baseglyph
connordavenport Oct 16, 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
24 changes: 14 additions & 10 deletions Lib/glyphConstruction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ def parsePositions(baseGlyph, markGlyph, font, markTransformMap, advanceWidth, a
xx, xy, yx, yy, x, y = 1, 0, 0, 1, advanceWidth, advanceHeight

baseGlyphX = baseGlyphY = baseGlyph
markFixedX = markFixedY = False
markFixedX = markFixedY = matrix = False

flipX = flipY = False

Expand All @@ -572,7 +572,10 @@ def parsePositions(baseGlyph, markGlyph, font, markTransformMap, advanceWidth, a
if positionXYSplit in position:
positions = position.split(positionXYSplit)
if len(positions) == 6:
matrix = True if not baseGlyph else False
xx, xy, yx, yy, positionX, positionY = positions
x = float(positionX)
y = float(positionY)
xx = float(xx)
xy = float(xy)
yx = float(yx)
Expand Down Expand Up @@ -633,16 +636,17 @@ def parsePositions(baseGlyph, markGlyph, font, markTransformMap, advanceWidth, a
elif (basePoint1, baseAngle1) == (basePoint2, baseAngle2):
baseX, baseY = basePoint1

# calculate the offset
if not markFixedX:
x += baseX - markX
else:
x += markX
if not matrix:
# calculate the offset
if not markFixedX:
x += baseX - markX
else:
x += markX

if not markFixedY:
y += baseY - markY
else:
y += markY
if not markFixedY:
y += baseY - markY
else:
y += markY

if not markFixedX:
baseTransform = markTransformMap.get(baseGlyphX)
Expand Down