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

[varLib] Try a set of used points instead of all points (#1090)

Browse Source 
* Try a set of used points instead of all points when testing whether to share points.
* Amend comment, remove unused variable
This commit is contained in:
Jens Kutilek 2017-11-06 11:49:26 +01:00 committed by GitHub
parent d91faeaf1a
commit b9bca702f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/fontTools/ttLib/tables/TupleVariation.py
View File

@ -502,25 +502,30 @@ def compileTupleVariationStore(variations, pointCount,
# For the time being, we try two variants and then pick the better one:
# (a) each tuple supplies its own private set of points;
# (b) all tuples refer to a shared set of points, which consists of
# "every control point in the glyph".
allPoints = set(range(pointCount))
# "every control point in the glyph that has explicit deltas".
usedPoints = set()
for v in variations:
usedPoints |= v.getUsedPoints()
tuples = []
data = []
someTuplesSharePoints = False
sharedPointVariation = None # To keep track of a variation that uses shared points
for v in variations:
privateTuple, privateData, usesSharedPoints = v.compile(
privateTuple, privateData, _ = v.compile(
axisTags, sharedTupleIndices, sharedPoints=None)
sharedTuple, sharedData, usesSharedPoints = v.compile(
axisTags, sharedTupleIndices, sharedPoints=allPoints)
axisTags, sharedTupleIndices, sharedPoints=usedPoints)
if (len(sharedTuple) + len(sharedData)) < (len(privateTuple) + len(privateData)):
tuples.append(sharedTuple)
data.append(sharedData)
someTuplesSharePoints |= usesSharedPoints
sharedPointVariation = v
else:
tuples.append(privateTuple)
data.append(privateData)
if someTuplesSharePoints:
data = bytechr(0) + bytesjoin(data) # 0x00 = "all points in glyph"
# Use the last of the variations that share points for compiling the packed point data
data = sharedPointVariation.compilePoints(usedPoints, len(sharedPointVariation.coordinates)) + bytesjoin(data)
tupleVariationCount = TUPLES_SHARE_POINT_NUMBERS | len(tuples)
else:
data = bytesjoin(data)