shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[interpolatable] Fix drawing of reversed contour point start

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-11-18 15:46:53 -07:00
parent b57150b12f
commit eddcb1ff52
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/fontTools/varLib/interpolatable.py
View File

@ -201,10 +201,16 @@ def _points_complex_vector(points):
return vector return vector
def _add_isomorphisms(points, reference_bits, isomorphisms, reverse): def _add_isomorphisms(points, isomorphisms, reverse):
reference_bits = _points_characteristic_bits(points)
n = len(points) n = len(points)
if reverse:
points = points[::-1]
bits = _points_characteristic_bits(points) bits = _points_characteristic_bits(points)
else:
bits = reference_bits
vector = _points_complex_vector(points) vector = _points_complex_vector(points)
assert len(vector) % n == 0 assert len(vector) % n == 0
@ -214,7 +220,7 @@ def _add_isomorphisms(points, reference_bits, isomorphisms, reverse):
for i in range(n): for i in range(n):
b = ((bits << i) & mask) | ((bits >> (n - i))) b = ((bits << i) & mask) | ((bits >> (n - i)))
if b == reference_bits: if b == reference_bits:
isomorphisms.append((_rot_list(vector, i * mult), i, reverse)) isomorphisms.append((_rot_list(vector, i * mult), n - 1 - i if reverse else i, reverse))
def _find_parents_and_order(glyphsets, locations): def _find_parents_and_order(glyphsets, locations):
@ -362,12 +368,10 @@ def test_gen(
isomorphisms = [] isomorphisms = []
contourIsomorphisms.append(isomorphisms) contourIsomorphisms.append(isomorphisms)
reference_bits = _points_characteristic_bits(points.value)
# Add rotations # Add rotations
_add_isomorphisms(points.value, reference_bits, isomorphisms, False) _add_isomorphisms(points.value, isomorphisms, False)
# Add mirrored rotations # Add mirrored rotations
_add_isomorphisms( _add_isomorphisms(points.value, isomorphisms, True
list(reversed(points.value)), reference_bits, isomorphisms, True
) )
for m1idx in order: for m1idx in order: