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

[voltLib] 'adjust_pair' instead of just 'adjust'

Browse Source
This commit is contained in:
moyogo 2016-01-15 05:21:08 +00:00
parent a4d38b11e1
commit 6caba42cc2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/fontTools/voltLib/ast.py
View File

@ -98,11 +98,11 @@ class PositionAttachCursiveDefinition(ast.Statement):
class PositionAdjustPairDefinition(ast.Statement): class PositionAdjustPairDefinition(ast.Statement):
def __init__(self, location, coverages_1, coverages_2, adjust): def __init__(self, location, coverages_1, coverages_2, adjust_pair):
ast.Statement.__init__(self, location) ast.Statement.__init__(self, location)
self.coverages_1 = coverages_1 self.coverages_1 = coverages_1
self.coverages_2 = coverages_2 self.coverages_2 = coverages_2
self.adjust = adjust self.adjust_pair = adjust_pair
class PositionAdjustSingleDefinition(ast.Statement): class PositionAdjustSingleDefinition(ast.Statement):

6
Lib/fontTools/voltLib/parser.py
View File

@ -304,7 +304,7 @@ class Parser(object):
location = self.cur_token_location_ location = self.cur_token_location_
coverages_1 = [] coverages_1 = []
coverages_2 = [] coverages_2 = []
adjust = {} adjust_pair = {}
while self.next_token_ == "FIRST": while self.next_token_ == "FIRST":
self.advance_lexer_() self.advance_lexer_()
coverage_1 = self.parse_coverage_() coverage_1 = self.parse_coverage_()
@ -319,10 +319,10 @@ class Parser(object):
self.expect_keyword_("BY") self.expect_keyword_("BY")
pos_1 = self.parse_pos_() pos_1 = self.parse_pos_()
pos_2 = self.parse_pos_() pos_2 = self.parse_pos_()
adjust[(id_1, id_2)] = (pos_1, pos_2) adjust_pair[(id_1, id_2)] = (pos_1, pos_2)
self.expect_keyword_("END_ADJUST") self.expect_keyword_("END_ADJUST")
position = ast.PositionAdjustPairDefinition( position = ast.PositionAdjustPairDefinition(
location, coverages_1, coverages_2, adjust) location, coverages_1, coverages_2, adjust_pair)
return position return position
def parse_adjust_single_(self): def parse_adjust_single_(self):

2
Lib/fontTools/voltLib/parser_test.py
View File

@ -568,7 +568,7 @@ class ParserTest(unittest.TestCase):
).statements ).statements
self.assertEqual( self.assertEqual(
(lookup.name, lookup.pos.coverages_1, lookup.pos.coverages_2, (lookup.name, lookup.pos.coverages_1, lookup.pos.coverages_2,
lookup.pos.adjust), lookup.pos.adjust_pair),
("kern1", [["A"]], [["V"]], ("kern1", [["A"]], [["V"]],
{(1, 2): ((-30, None, None, {}, {}, {}), {(1, 2): ((-30, None, None, {}, {}, {}),
(None, None, None, {}, {}, {})), (None, None, None, {}, {}, {})),