archive/inter-font
Archived
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tooling: fix decomposition detection by looking at all glyphs in all masters, not just one, since a cn might have a non-trivial transformation in just one design

Browse source
This commit is contained in:
Rasmus Andersson 2023-04-15 10:48:24 -07:00
parent 07edda4259
commit ebf599d51d
1 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

50
misc/tools/postprocess-designspace.py
View file

@ -47,28 +47,35 @@ def fix_wght_range(designspace):
def should_decompose_glyph(g): def should_decompose_glyph(g):
# A trivial glyph is one that does not use components or where component transformation
# does not include mirroring (i.e. "flipped").
if g.components and len(g.components) > 0: if g.components and len(g.components) > 0:
for c in g.components: for c in g.components:
# has non-trivial transformation? (i.e. scaled) # Does the component have non-trivial transformation? (i.e. scaled or skewed)
# Example of optimally trivial transformation: # Example of no transformation: (identity matrix)
# (1, 0, 0, 1, 0, 0) no scale or offset # (1, 0, 0, 1, 0, 0) no scale or offset
# Example of simple offset transformation matrix:
# (1, 0, 0, 1, 20, 30) 20 x offset, 30 y offset
# Example of scaled transformation matrix: # Example of scaled transformation matrix:
# (-1.0, 0, 0.3311, 1, 1464.0, 0) flipped x axis, sheered and offset # (-1.0, 0, 0.3311, 1, 1464.0, 0) flipped x axis, sheered and offset
xScale = c.transformation[0] # Matrix order:
yScale = c.transformation[3] # (x_scale, x_skew, y_skew, y_scale, x_pos, y_pos)
# If glyph is reflected along x or y axes, it won't slant well.
if xScale < 0 or yScale < 0: # if g.name == 'dotmacron.lc':
# print(f"{g.name} cn {c.baseGlyph}", c.transformation)
# Check if transformation is not identity (ignoring x & y offset)
m = c.transformation
if m[0] + m[1] + m[2] + m[3] != 2.0:
return True return True
return False return False
def find_glyphs_to_decompose(designspace): def find_glyphs_to_decompose(designspace_source):
source = designspace.sources[int(len(designspace.sources)/2)] glyph_names = set()
print("find_glyphs_to_decompose sourcing from %r" % source.name) # print("find_glyphs_to_decompose inspecting %r" % designspace_source.name)
ufo = defcon.Font(source.path) ufo = defcon.Font(designspace_source.path)
return sorted([g.name for g in ufo if should_decompose_glyph(g)]) for g in ufo:
if should_decompose_glyph(g):
glyph_names.add(g.name)
return list(glyph_names)
def set_ufo_filter(ufo, **filter_dict): def set_ufo_filter(ufo, **filter_dict):
@ -90,12 +97,15 @@ def update_source_ufo(ufo_file, glyphs_to_decompose):
def update_sources(designspace): def update_sources(designspace):
glyphs_to_decompose = find_glyphs_to_decompose(designspace) with Pool() as p:
#print("glyphs marked to be decomposed: %s" % ', '.join(glyphs_to_decompose)) sources = [source for source in designspace.sources]
sources = [source for source in designspace.sources] # sources = [s for s in sources if s.name == "Inter Thin"] # DEBUG
# sources = [s for s in sources if s.name == "Inter Thin"] # DEBUG glyphs_to_decompose = set()
source_files = list(set([s.path for s in sources])) for glyph_names in p.map(find_glyphs_to_decompose, sources):
with Pool(len(source_files)) as p: glyphs_to_decompose.update(glyph_names)
glyphs_to_decompose = list(glyphs_to_decompose)
# print("glyphs marked to be decomposed: %s" % ', '.join(glyphs_to_decompose))
source_files = list(set([s.path for s in sources]))
p.starmap(update_source_ufo, [(path, glyphs_to_decompose) for path in source_files]) p.starmap(update_source_ufo, [(path, glyphs_to_decompose) for path in source_files])
return designspace return designspace