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

Fix glyph swap #1043

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Fix glyph swap #1043

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
31fa0fa
Two test files
yanone Sep 26, 2023
7fe977f
Removed some metadata, renamed family name
yanone Sep 26, 2023
231d466
Renamed family name
yanone Sep 26, 2023
7cc6c8d
Check for existing swap to not add twice
yanone Sep 26, 2023
10af377
Removing test fonts again; not intending to write a test
yanone Sep 26, 2023
fdc9643
Check for existing swap by oldName instead of checking for the pair
yanone Sep 26, 2023
748ed47
Log warning if previous rule was found
yanone Sep 26, 2023
81d528f
Check for tuple instead of just oldName
yanone Sep 26, 2023
998c4db
Formatting
yanone Sep 26, 2023
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
11 changes: 9 additions & 2 deletions Lib/fontmake/instantiator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,15 @@ def process_rules_swaps(rules, location, glyphNames):
# I guess it should be, so that we can swap, and if it isn't,
# then it's better to error out later when we try to swap,
# instead of silently ignoring the rule here.
if oldName in glyphNames:
swaps.append((oldName, newName))
# Also checking for duplication of rules here:
pair = (oldName, newName)
swap_exists = pair in swaps
if swap_exists:
logging.warning(
"Duplicate rule for %s in location %s", pair, location
)
if oldName in glyphNames and not swap_exists:
swaps.append(pair)
return swaps


Expand Down
Loading