From 1dcbf6c73e48c178ca2173d6db8f9e59cc2bf8a2 Mon Sep 17 00:00:00 2001 From: Tal Leming Date: Tue, 14 Feb 2012 03:34:28 +0000 Subject: [PATCH] The last table is no longer required to be 0xFFFF. git-svn-id: http://svn.robofab.com/branches/ufo3k@550 b5fa9d6c-a76f-4ffd-b3cb-f825fc41095c --- Lib/ufoLib/test/test_UFO3.py | 12 ++++++------ Lib/ufoLib/validators.py | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Lib/ufoLib/test/test_UFO3.py b/Lib/ufoLib/test/test_UFO3.py index 03b5eeda7..304b61165 100644 --- a/Lib/ufoLib/test/test_UFO3.py +++ b/Lib/ufoLib/test/test_UFO3.py @@ -206,16 +206,16 @@ class ReadFontInfoVersion3TestCase(unittest.TestCase): self.assertRaises(UFOLibError, reader.readInfo, info=TestInfoObject()) # not sorted info = dict(fontInfoVersion3) - info["openTypeGaspRangeRecords"] = [dict(rangeMaxPPEM=0xFFFF, rangeGaspBehavior=[0]), dict(rangeMaxPPEM=10, rangeGaspBehavior=[-1])] + info["openTypeGaspRangeRecords"] = [dict(rangeMaxPPEM=0xFFFF, rangeGaspBehavior=[0]), dict(rangeMaxPPEM=10, rangeGaspBehavior=[0])] self._writeInfoToPlist(info) reader = UFOReader(self.dstDir) self.assertRaises(UFOLibError, reader.readInfo, info=TestInfoObject()) # no 0xFFFF info = dict(fontInfoVersion3) - info["openTypeGaspRangeRecords"] = [dict(rangeMaxPPEM=10, rangeGaspBehavior=[0]), dict(rangeMaxPPEM=20, rangeGaspBehavior=[-1])] + info["openTypeGaspRangeRecords"] = [dict(rangeMaxPPEM=10, rangeGaspBehavior=[0]), dict(rangeMaxPPEM=20, rangeGaspBehavior=[0])] self._writeInfoToPlist(info) reader = UFOReader(self.dstDir) - self.assertRaises(UFOLibError, reader.readInfo, info=TestInfoObject()) + reader.readInfo(TestInfoObject()) def testHeadRead(self): # openTypeHeadCreated @@ -1868,15 +1868,15 @@ class WriteFontInfoVersion3TestCase(unittest.TestCase): self.tearDownUFO() # not sorted infoObject = self.makeInfoObject() - infoObject.openTypeGaspRangeRecords = [dict(rangeMaxPPEM=0xFFFF, rangeGaspBehavior=[0]), dict(rangeMaxPPEM=10, rangeGaspBehavior=[-1])] + infoObject.openTypeGaspRangeRecords = [dict(rangeMaxPPEM=0xFFFF, rangeGaspBehavior=[0]), dict(rangeMaxPPEM=10, rangeGaspBehavior=[0])] writer = UFOWriter(self.dstDir, formatVersion=3) self.assertRaises(UFOLibError, writer.writeInfo, info=infoObject) self.tearDownUFO() # no 0xFFFF infoObject = self.makeInfoObject() - infoObject.openTypeGaspRangeRecords = [dict(rangeMaxPPEM=10, rangeGaspBehavior=[0]), dict(rangeMaxPPEM=20, rangeGaspBehavior=[-1])] + infoObject.openTypeGaspRangeRecords = [dict(rangeMaxPPEM=10, rangeGaspBehavior=[0]), dict(rangeMaxPPEM=20, rangeGaspBehavior=[0])] writer = UFOWriter(self.dstDir, formatVersion=3) - self.assertRaises(UFOLibError, writer.writeInfo, info=infoObject) + writer.writeInfo(infoObject) self.tearDownUFO() def testHeadWrite(self): diff --git a/Lib/ufoLib/validators.py b/Lib/ufoLib/validators.py index d1594fa13..9eea2f057 100644 --- a/Lib/ufoLib/validators.py +++ b/Lib/ufoLib/validators.py @@ -125,8 +125,6 @@ def fontInfoOpenTypeGaspRangeRecordsValidator(value): ppemOrder.append(ppem) if ppemOrder != sorted(ppemOrder): return False - if ppemOrder[-1] != 0xFFFF: - return False return True def fontInfoOpenTypeHeadCreatedValidator(value):