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

feaLib: handle singleton class as a single glyph in multiple subst

Browse Source 
This how GlyphsApp handles it and how it is handled in single
substitution.
This commit is contained in:
Khaled Hosny 2023-05-09 17:31:15 +03:00
parent b6209e0510
commit 88885ba9fc
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/fontTools/feaLib/parser.py
View File

@ -935,9 +935,9 @@ class Parser(object):
for n in new: for n in new:
if not list(n.glyphSet()): if not list(n.glyphSet()):
raise FeatureLibError("Empty class in replacement", location) raise FeatureLibError("Empty class in replacement", location)
if not isinstance(n, self.ast.GlyphName) and len(n.glyphSet()) != count: if len(n.glyphSet()) != 1 and len(n.glyphSet()) != count:
raise FeatureLibError( raise FeatureLibError(
f'Expected a glyph class with {count} elements after "by", ' f'Expected a glyph class with 1 or {count} elements after "by", '
f"but found a glyph class with {len(n.glyphSet())} elements", f"but found a glyph class with {len(n.glyphSet())} elements",
location, location,
) )

13
Tests/feaLib/parser_test.py
View File

@ -1642,13 +1642,20 @@ class ParserTest(unittest.TestCase):
self.assertEqual(glyphstr([sub.glyph]), "[f_i f_l]") self.assertEqual(glyphstr([sub.glyph]), "[f_i f_l]")
self.assertEqual(glyphstr(sub.replacement), "f [i l]") self.assertEqual(glyphstr(sub.replacement), "f [i l]")
def test_substitute_multiple_classes_mixed_singleton(self):
doc = self.parse("lookup Look {substitute [f_i f_l] by [f] [i l];} Look;")
sub = doc.statements[0].statements[0]
self.assertIsInstance(sub, ast.MultipleSubstStatement)
self.assertEqual(glyphstr([sub.glyph]), "[f_i f_l]")
self.assertEqual(glyphstr(sub.replacement), "f [i l]")
def test_substitute_multiple_classes_mismatch(self): def test_substitute_multiple_classes_mismatch(self):
self.assertRaisesRegex( self.assertRaisesRegex(
FeatureLibError, FeatureLibError,
'Expected a glyph class with 2 elements after "by", ' 'Expected a glyph class with 1 or 3 elements after "by", '
"but found a glyph class with 1 elements", "but found a glyph class with 2 elements",
self.parse, self.parse,
"lookup Look {substitute [f_i f_l] by [f] [i l];} Look;", "lookup Look {substitute [f_i f_l f_f_i] by [f f_f] [i l i];} Look;",
) )
def test_substitute_multiple_by_mutliple(self): def test_substitute_multiple_by_mutliple(self):