Merge pull request #69 from unified-font-object/revert-66-normalize-h…

…v-guidelines

Revert "Normalize horizontal and vertical guidelines"

src/ufonormalizer.py

@@ -498,12 +498,7 @@ def _normalizeDictGuideline(guideline):
     if y is not None:
         normalized["y"] = y
     if angle is not None:
-        if angle == 0:
-            del normalized["x"]
-        elif angle == 90 or angle == 270:
-            del normalized["y"]
-        else:
-            normalized["angle"] = angle
+        normalized["angle"] = angle
     if name is not None:
         normalized["name"] = name
     if color is not None:

tests/test_ufonormalizer.py

@@ -413,23 +413,6 @@ def test_normalizeFontInfoPlist_guidelines_no_angle(self):
         result = _normalizeDictGuideline(guideline)
         self.assertEqual(result, expected)
 
-    def test_normalizeFontInfoPlist_guidelines_angle_horizontal(self):
-        guideline = dict(x=1, y=2, angle=0)
-        expected = dict(y=2)
-        result = _normalizeDictGuideline(guideline)
-        self.assertEqual(result, expected)
-
-    def test_normalizeFontInfoPlist_guidelines_angle_vertical(self):
-        guideline = dict(x=1, y=2, angle=90)
-        expected = dict(x=1)
-        result = _normalizeDictGuideline(guideline)
-        self.assertEqual(result, expected)
-
-        guideline = dict(x=1, y=2, angle=270)
-        expected = dict(x=1)
-        result = _normalizeDictGuideline(guideline)
-        self.assertEqual(result, expected)
-
     def test_normalizeFontInfoPlist_guidelines_invalid_angle(self):
         guideline = dict(x=1, y=3, angle="invalid", name="test",
                          color="1,0,0,.5", identifier="TEST")
@@ -459,7 +442,7 @@ def test_normalizeFontInfoPlist_guidelines_no_identifier(self):
 
     def test_normalizeFontInfoPlist_guidelines_zero_is_not_None(self):
         guideline = dict(x=0, y=0, angle=0)
-        expected = dict(y=0)
+        expected = dict(x=0, y=0, angle=0)
         result = _normalizeDictGuideline(guideline)
         self.assertEqual(result, expected)