This commit is contained in:
Simon Cozens 2020-07-07 13:28:44 +01:00
parent 7db13c9872
commit bc0f69884e
2 changed files with 5 additions and 5 deletions

View File

@ -276,7 +276,7 @@ class ChainContextualRuleset():
return True return True
return False return False
def format1Classdefs(self): def format2Classdefs(self):
PREFIX, GLYPHS, SUFFIX = 0,1,2 PREFIX, GLYPHS, SUFFIX = 0,1,2
classdefbuilders = [] classdefbuilders = []
for ix in [PREFIX, GLYPHS, SUFFIX]: for ix in [PREFIX, GLYPHS, SUFFIX]:

View File

@ -1431,19 +1431,19 @@ class ChainContextualRulesetTest(object):
assert len(rulesets) == 3 assert len(rulesets) == 3
assert rulesets[0].hasPrefixOrSuffix assert rulesets[0].hasPrefixOrSuffix
assert not rulesets[0].hasAnyGlyphClasses assert not rulesets[0].hasAnyGlyphClasses
cd = rulesets[0].format1Classdefs() cd = rulesets[0].format2Classdefs()
assert set(cd[0].classes()[1:]) == set([("d",),("b",),("a",)]) assert set(cd[0].classes()[1:]) == set([("d",),("b",),("a",)])
assert set(cd[1].classes()[1:]) == set([("c",)]) assert set(cd[1].classes()[1:]) == set([("c",)])
assert set(cd[2].classes()[1:]) == set() assert set(cd[2].classes()[1:]) == set()
assert rulesets[1].hasPrefixOrSuffix assert rulesets[1].hasPrefixOrSuffix
assert rulesets[1].hasAnyGlyphClasses assert rulesets[1].hasAnyGlyphClasses
assert not rulesets[1].format1Classdefs() assert not rulesets[1].format2Classdefs()
assert not rulesets[2].hasPrefixOrSuffix assert not rulesets[2].hasPrefixOrSuffix
assert rulesets[2].hasAnyGlyphClasses assert rulesets[2].hasAnyGlyphClasses
assert rulesets[2].format1Classdefs() assert rulesets[2].format2Classdefs()
cd = rulesets[2].format1Classdefs() cd = rulesets[2].format2Classdefs()
assert set(cd[0].classes()[1:]) == set() assert set(cd[0].classes()[1:]) == set()
assert set(cd[1].classes()[1:]) == set([("C","D"), ("E",)]) assert set(cd[1].classes()[1:]) == set([("C","D"), ("E",)])
assert set(cd[2].classes()[1:]) == set() assert set(cd[2].classes()[1:]) == set()