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

[feaLib] Use tuple for dict key

Browse Source 
https://github.com/fonttools/fonttools/pull/1169#discussion_r170218517
This commit is contained in:
Miguel Sousa 2018-02-28 22:57:06 -08:00 committed by Cosimo Lupo
parent 6810f02528
commit ce5cebfef2
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/feaLib/ast.py
View File

@ -1171,7 +1171,7 @@ class CVParametersNameStatement(NameRecord):
if self.block_name == "ParamUILabelNameID":
item = "_{}".format(builder.cv_num_named_params_.get(self.nameID, 0))
builder.add_cv_parameter(self.nameID)
self.nameID = '{}.{}{}'.format(self.nameID, self.block_name, item)
self.nameID = (self.nameID, self.block_name + item)
NameRecord.build(self, builder)
def asFea(self, indent=""):

12
Lib/fontTools/feaLib/builder.py
View File

@ -297,14 +297,14 @@ class Builder(object):
params = otTables.FeatureParamsCharacterVariants()
params.Format = 0
params.FeatUILabelNameID = self.cv_parameters_ids_.get(
'{}.{}'.format(tag, 'FeatUILabelNameID'), 0)
(tag, 'FeatUILabelNameID'), 0)
params.FeatUITooltipTextNameID = self.cv_parameters_ids_.get(
'{}.{}'.format(tag, 'FeatUITooltipTextNameID'), 0)
(tag, 'FeatUITooltipTextNameID'), 0)
params.SampleTextNameID = self.cv_parameters_ids_.get(
'{}.{}'.format(tag, 'SampleTextNameID'), 0)
(tag, 'SampleTextNameID'), 0)
params.NumNamedParameters = self.cv_num_named_params_.get(tag, 0)
params.FirstParamUILabelNameID = self.cv_parameters_ids_.get(
'{}.{}'.format(tag, 'ParamUILabelNameID_0'), 0)
(tag, 'ParamUILabelNameID_0'), 0)
params.CharCount = len(self.cv_characters_[tag])
params.Character = self.cv_characters_[tag]
return params
@ -319,7 +319,7 @@ class Builder(object):
for name in self.names_:
nameID, platformID, platEncID, langID, string = name
# For featureNames block, nameID is 'feature tag'
# For cvParameters blocks, nameID is 'feature tag.block name'
# For cvParameters blocks, nameID is ('feature tag', 'block name')
if not isinstance(nameID, int):
tag = nameID
if tag in self.featureNames_:
@ -327,7 +327,7 @@ class Builder(object):
self.featureNames_ids_[tag] = self.get_user_name_id(table)
assert self.featureNames_ids_[tag] is not None
nameID = self.featureNames_ids_[tag]
elif tag.split('.')[0] in self.cv_parameters_:
elif tag[0] in self.cv_parameters_:
if tag not in self.cv_parameters_ids_:
self.cv_parameters_ids_[tag] = self.get_user_name_id(table)
assert self.cv_parameters_ids_[tag] is not None