+
Skip to content

relax guideline validation to follow the updated spec #3553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

relax guideline validation to follow the updated spec #3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions Lib/fontTools/ufoLib/validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,19 +606,8 @@ def guidelineValidator(value):
"""
if not genericDictValidator(value, _guidelineDictPrototype):
return False
x = value.get("x")
y = value.get("y")

angle = value.get("angle")
# x or y must be present
if x is None and y is None:
return False
# if x or y are None, angle must not be present
if x is None or y is None:
if angle is not None:
return False
# if x and y are defined, angle must be defined
if x is not None and y is not None and angle is None:
return False
# angle must be between 0 and 360
if angle is not None:
if angle < 0:
Expand Down
30 changes: 21 additions & 9 deletions Tests/ufoLib/GLIF2_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ def testGuidelines_illegal_angle(self):
self.assertRaises(GlifLibError, self.pyToGLIF, py)
self.assertRaises(GlifLibError, self.glifToPy, glif)

def testGuidelines_illegal_x_missing(self):
def testGuidelines_x_missing(self):
# x missing
glif = """
<glyph name="a" format="2">
Expand All @@ -442,10 +442,14 @@ def testGuidelines_illegal_x_missing(self):
glyph.name = "a"
glyph.guidelines = [{"angle" : 45, "y" : 1}]
"""
self.assertRaises(GlifLibError, self.pyToGLIF, py)
self.assertRaises(GlifLibError, self.glifToPy, glif)
result = self.pyToGLIF(py)
expected = '<glyph name="a" format="2">\n <guideline y="1" angle="45"/>\n <outline>\n </outline>\n</glyph>'
self.assertEqual(result, expected)
result = self.glifToPy(glif)
expected = 'glyph.name = "a"\nglyph.guidelines = [{"angle" : 45, "y" : 1}]'
self.assertEqual(result, expected)

def testGuidelines_illegal_y_missing(self):
def testGuidelines_y_missing(self):
# y missing
glif = """
<glyph name="a" format="2">
Expand All @@ -458,10 +462,14 @@ def testGuidelines_illegal_y_missing(self):
glyph.name = "a"
glyph.guidelines = [{"angle" : 45, "x" : 1}]
"""
self.assertRaises(GlifLibError, self.pyToGLIF, py)
self.assertRaises(GlifLibError, self.glifToPy, glif)
result = self.pyToGLIF(py)
expected = '<glyph name="a" format="2">\n <guideline x="1" angle="45"/>\n <outline>\n </outline>\n</glyph>'
self.assertEqual(result, expected)
result = self.glifToPy(glif)
expected = 'glyph.name = "a"\nglyph.guidelines = [{"angle" : 45, "x" : 1}]'
self.assertEqual(result, expected)

def testGuidelines_illegal_angle_missing(self):
def testGuidelines_angle_missing(self):
# angle missing
glif = """
<glyph name="a" format="2">
Expand All @@ -474,8 +482,12 @@ def testGuidelines_illegal_angle_missing(self):
glyph.name = "a"
glyph.guidelines = [{"x" : 1, "y" : 1}]
"""
self.assertRaises(GlifLibError, self.pyToGLIF, py)
self.assertRaises(GlifLibError, self.glifToPy, glif)
result = self.pyToGLIF(py)
expected = '<glyph name="a" format="2">\n <guideline x="1" y="1"/>\n <outline>\n </outline>\n</glyph>'
self.assertEqual(result, expected)
result = self.glifToPy(glif)
expected = 'glyph.name = "a"\nglyph.guidelines = [{"x" : 1, "y" : 1}]'
self.assertEqual(result, expected)

def testGuidelines_illegal_angle_out_of_range(self):
# angle out of range
Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载