shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #122 from hoeflerco/fix-convertGroupNames

Browse Source 
When converting kerning group names, remove the older '@MMK' prefixes
This commit is contained in:
Frederik Berlaen 2018-02-07 16:05:58 +01:00 committed by GitHub
commit 6992e0eb1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Lib/ufoLib/converters.py
View File

@ -21,8 +21,10 @@ def convertUFO1OrUFO2KerningToUFO3Kerning(kerning, groups):
for first in firstReferencedGroups: for first in firstReferencedGroups:
# Make a list of existing group names. # Make a list of existing group names.
existingGroupNames = list(groups.keys()) + list(firstRenamedGroups.keys()) existingGroupNames = list(groups.keys()) + list(firstRenamedGroups.keys())
# Add the prefix to the name. # Remove the old prefix from the name
newName = "public.kern1." + first newName = first.replace("@MMK_L_", "")
# Add the new prefix to the name.
newName = "public.kern1." + newName
# Make a unique group name. # Make a unique group name.
newName = makeUniqueGroupName(newName, existingGroupNames) newName = makeUniqueGroupName(newName, existingGroupNames)
# Store for use later. # Store for use later.
@ -31,8 +33,10 @@ def convertUFO1OrUFO2KerningToUFO3Kerning(kerning, groups):
for second in secondReferencedGroups: for second in secondReferencedGroups:
# Make a list of existing group names. # Make a list of existing group names.
existingGroupNames = list(groups.keys()) + list(secondRenamedGroups.keys()) existingGroupNames = list(groups.keys()) + list(secondRenamedGroups.keys())
# Add the prefix to the name. # Remove the old prefix from the name
newName = "public.kern2." + second newName = second.replace("@MMK_R_", "")
# Add the new prefix to the name.
newName = "public.kern2." + newName
# Make a unique group name. # Make a unique group name.
newName = makeUniqueGroupName(newName, existingGroupNames) newName = makeUniqueGroupName(newName, existingGroupNames)
# Store for use later. # Store for use later.
@ -219,20 +223,20 @@ def test():
... "A" : { ... "A" : {
... "A": 1, ... "A": 1,
... "B": 2, ... "B": 2,
... "public.kern2.@MMK_R_CGroup": 3, ... "public.kern2.CGroup": 3,
... "public.kern2.@MMK_R_DGroup": 4 ... "public.kern2.DGroup": 4
... }, ... },
... "public.kern1.@MMK_L_BGroup": { ... "public.kern1.BGroup": {
... "A": 5, ... "A": 5,
... "B": 6, ... "B": 6,
... "public.kern2.@MMK_R_CGroup": 7, ... "public.kern2.CGroup": 7,
... "public.kern2.@MMK_R_DGroup": 8 ... "public.kern2.DGroup": 8
... }, ... },
... "public.kern1.@MMK_L_CGroup": { ... "public.kern1.CGroup": {
... "A": 9, ... "A": 9,
... "B": 10, ... "B": 10,
... "public.kern2.@MMK_R_CGroup": 11, ... "public.kern2.CGroup": 11,
... "public.kern2.@MMK_R_DGroup": 12 ... "public.kern2.DGroup": 12
... } ... }
... } ... }
>>> kerning == expected >>> kerning == expected
@ -244,12 +248,12 @@ def test():
... "@MMK_R_CGroup": ["C"], ... "@MMK_R_CGroup": ["C"],
... "@MMK_R_DGroup": ["D"], ... "@MMK_R_DGroup": ["D"],
... "@MMK_R_XGroup": ["X"], ... "@MMK_R_XGroup": ["X"],
... "public.kern1.@MMK_L_BGroup": ["B"], ... "public.kern1.BGroup": ["B"],
... "public.kern1.@MMK_L_CGroup": ["C"], ... "public.kern1.CGroup": ["C"],
... "public.kern1.@MMK_L_XGroup": ["X"], ... "public.kern1.XGroup": ["X"],
... "public.kern2.@MMK_R_CGroup": ["C"], ... "public.kern2.CGroup": ["C"],
... "public.kern2.@MMK_R_DGroup": ["D"], ... "public.kern2.DGroup": ["D"],
... "public.kern2.@MMK_R_XGroup": ["X"], ... "public.kern2.XGroup": ["X"],
... } ... }
>>> groups == expected >>> groups == expected
True True
@ -292,19 +296,19 @@ def test():
... "A" : { ... "A" : {
... "A": 1, ... "A": 1,
... "B": 2, ... "B": 2,
... "public.kern2.@MMK_R_CGroup": 3, ... "public.kern2.CGroup": 3,
... "public.kern2.DGroup": 4 ... "public.kern2.DGroup": 4
... }, ... },
... "public.kern1.BGroup": { ... "public.kern1.BGroup": {
... "A": 5, ... "A": 5,
... "B": 6, ... "B": 6,
... "public.kern2.@MMK_R_CGroup": 7, ... "public.kern2.CGroup": 7,
... "public.kern2.DGroup": 8 ... "public.kern2.DGroup": 8
... }, ... },
... "public.kern1.@MMK_L_CGroup": { ... "public.kern1.CGroup": {
... "A": 9, ... "A": 9,
... "B": 10, ... "B": 10,
... "public.kern2.@MMK_R_CGroup": 11, ... "public.kern2.CGroup": 11,
... "public.kern2.DGroup": 12 ... "public.kern2.DGroup": 12
... } ... }
... } ... }
@ -316,8 +320,8 @@ def test():
... "@MMK_R_CGroup": ["C"], ... "@MMK_R_CGroup": ["C"],
... "DGroup": ["D"], ... "DGroup": ["D"],
... "public.kern1.BGroup": ["B"], ... "public.kern1.BGroup": ["B"],
... "public.kern1.@MMK_L_CGroup": ["C"], ... "public.kern1.CGroup": ["C"],
... "public.kern2.@MMK_R_CGroup": ["C"], ... "public.kern2.CGroup": ["C"],
... "public.kern2.DGroup": ["D"], ... "public.kern2.DGroup": ["D"],
... } ... }
>>> groups == expected >>> groups == expected