fix interaction with skipExportGlyphs and post-build subsetting feature #591
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…yphs' custom param When UFO has both 'public.skipExportGlyphs' and the 'Keep Glyphs' custom parameter, then the final glyph order in the built OTF will not include glyphs from skipExportGlyphs. If we don't prune them when getting the UFO glyphOrder we may hit the assertion later on that checks that the length of UFO and OTF glyphOrders is the same.
…tglyphs I marked glyph B in tests/data/TestSubset.glyphs as 'export = 0;'. The 'Test Subset Regular' instance has a 'Keep Glyphs' custom paramter with: space, A, B and C. The test asserts that, whether --no-write-skipexportglyphs option is used, the resulting subsetted glyphOrder does _not_ contain the glyph 'B' (and we don't hit AssertionError while doing so when skipExportGlyphs list is non-empty)
anthrotype
force-pushed
the
skip-export-glyphs-subset
branch
from
7536d7e
to
919d4dc
Compare
madig
approved these changes
Oct 10, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
when an instance has "Keep Glyphs" custom parameter, fontmake runs the fonttools subsetter on the OTF just built and prunes all glyphs not present in that list. Since the postscript glyph names in OTF may have been renamed using final production uni-names, fontmake needs to match the original glyph names in UFO and the ones in the OTF by their glyph index.
Now that glyphsLib/ufo2ft support the
public.skipExportGlyphsoption, and fontmake enables this feature by default (unless--no-write-skipexportglyphsoption is passed), this means that the built OTF may contain less glyphs than the original UFO (glyphs in public.skipExportGlyphs are not exported) and so we hit as AssertionError as the two glyphOrder have different lengths.This fixes the problem by only considering the actually exported glyphs when extracting the glyphOrder from the UFO in the process of subsetting the OTF.
A test is added to make sure we get the same final subsetted glyphOrder, whether
--no-write-skipexportglyphsoption is used or not.