Skip to content
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

Jump to bottom

Normalize the order of glyf contours #1108

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Normalize the order of glyf contours #1108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion resources/scripts/ttx_diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,22 @@ def stat_like_fontmake(ttx):
ver.attrib["value"] = "0x00010001"


# https://github.com/googlefonts/fontc/issues/1107
def normalize_glyf_contours(ttx):
for glyph in ttx.xpath("//glyf/TTGlyph"):
contours = glyph.xpath("./contour")
if len(contours) < 2:
continue
normalized = sorted(contours, key=lambda c: etree.tostring(c))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we even need to tostring? not sure how expensive it is, but all we need is some total order, can we get that from c itself?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't entirely clear to me what that would do whereas tostring is simple to reason about

if normalized == contours:
continue
for contour in contours:
glyph.remove(contour)
for contour in normalized:
glyph.append(contour)



def allow_some_off_by_ones(fontc, fontmake, container, name_attr, coord_holder):
fontmake_num_coords = len(fontmake.xpath(f"//{container}/{coord_holder}"))
off_by_one_budget = int(FLAGS.off_by_one_budget / 100.0 * fontmake_num_coords)
Expand Down Expand Up @@ -481,6 +497,8 @@ def reduce_diff_noise(fontc: etree.ElementTree, fontmake: etree.ElementTree):
stat_like_fontmake(ttx)
remove_mark_and_kern_lookups(ttx)

normalize_glyf_contours(ttx)

allow_some_off_by_ones(fontc, fontmake, "glyf/TTGlyph", "name", "/contour/pt")
allow_some_off_by_ones(
fontc, fontmake, "gvar/glyphVariations", "glyph", "/tuple/delta"
Expand Down Expand Up @@ -755,7 +773,7 @@ def main(argv):
root = Path(".").resolve()
if root.name != "fontc":
sys.exit("Expected to be at the root of fontc")

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noise?

fontc_bin_path = get_crate_path(FLAGS.fontc_path, root, "fontc")
otl_bin_path = get_crate_path(FLAGS.normalizer_path, root, "otl-normalizer")

Expand Down
Loading