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

Merge pull request #1467 from khaledhosny/voltlib-glyph-type

Browse Source 
[voltLib] Accept COMPONENT glyph type
This commit is contained in:
Denis Moyogo Jacquerye 2019-01-24 14:24:18 +00:00 committed by GitHub
commit 18ac453781
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ class Parser(object):
if self.next_token_ == "TYPE": if self.next_token_ == "TYPE":
self.expect_keyword_("TYPE") self.expect_keyword_("TYPE")
gtype = self.expect_name_() gtype = self.expect_name_()
assert gtype in ("BASE", "LIGATURE", "MARK") assert gtype in ("BASE", "LIGATURE", "MARK", "COMPONENT")
components = None components = None
if self.next_token_ == "COMPONENTS": if self.next_token_ == "COMPONENTS":
self.expect_keyword_("COMPONENTS") self.expect_keyword_("COMPONENTS")

16
Tests/voltLib/parser_test.py
View File

@ -77,6 +77,22 @@ class ParserTest(unittest.TestCase):
def_glyph.type, def_glyph.components), def_glyph.type, def_glyph.components),
("f_f", 320, None, "LIGATURE", 2)) ("f_f", 320, None, "LIGATURE", 2))
def test_def_glyph_mark(self):
[def_glyph] = self.parse(
'DEF_GLYPH "brevecomb" ID 320 TYPE MARK END_GLYPH'
).statements
self.assertEqual((def_glyph.name, def_glyph.id, def_glyph.unicode,
def_glyph.type, def_glyph.components),
("brevecomb", 320, None, "MARK", None))
def test_def_glyph_component(self):
[def_glyph] = self.parse(
'DEF_GLYPH "f.f_f" ID 320 TYPE COMPONENT END_GLYPH'
).statements
self.assertEqual((def_glyph.name, def_glyph.id, def_glyph.unicode,
def_glyph.type, def_glyph.components),
("f.f_f", 320, None, "COMPONENT", None))
def test_def_glyph_no_type(self): def test_def_glyph_no_type(self):
[def_glyph] = self.parse( [def_glyph] = self.parse(
'DEF_GLYPH "glyph20" ID 20 END_GLYPH' 'DEF_GLYPH "glyph20" ID 20 END_GLYPH'