[ufo2fontir] Fix for optional designspace names #376
Merged
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
anthrotype
reviewed
Aug 8, 2023
| @@ -696,9 +708,14 @@ impl Work<Context, WorkId, WorkError> for StaticMetadataWork { | |||
| .instances | |||
| .iter() | |||
| .map(|inst| NamedInstance { | |||
| name: match inst.name.strip_prefix(family_prefix.as_str()) { | |||
| name: match inst | |||
| .name | |||
There was a problem hiding this comment.
I just noticed that we are using the instance name attribute to set the fvar's NamedInstance's subfamilyNameID names, but this is wrong, varLib uses the stylename attribute of an instance, not its name for that purpose. The latter is similar to source.name and only meant to uniquely identify a given DS source/instance element for cross referencing within the doc (should have been called id perhaps but it's too late).
If we use stylename here we no longer need to do inst.name.strip_prefix(family_prefix).
There was a problem hiding this comment.
Good catch, will open an issue to do that as followup.
The upstream API has changed to make the 'name' fields on instance/source types optional. This patch is the minimal fix, where we check all names on load and insert placeholders if they are missing. An alternative solution might be to use something other than the name to uniquely identify these objects.
cmyr
force-pushed
the
no-designspace-names
branch
from
c3c635c
to
964da48
Compare
anthrotype
approved these changes
Aug 8, 2023
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.
The upstream API has changed to make the 'name' fields on instance/source types optional. This patch is the minimal fix, where we check all names on load and insert placeholders if they are missing.
An alternative solution might be to use something other than the name to uniquely identify these objects.
This is a draft as the upstream PR (linebender/norad#313) has not yet been merged.