Merge pull request #535 from exyte/fix/387

Fix #387: add "system" color support for SVG parser
exyte · Apr 8, 2019 · 9a1abcc · 9a1abcc
2 parents 251b651 + 6f1d0b1
commit 9a1abcc
Show file tree

Hide file tree

Showing 6 changed files with 798 additions and 2 deletions.
diff --git a/Macaw.xcodeproj/project.pbxproj b/Macaw.xcodeproj/project.pbxproj
@@ -19,6 +19,8 @@
 		30FF496D215CF27E00FF653C /* MCAShapeLayerLineCap_macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FF496C215CF27E00FF653C /* MCAShapeLayerLineCap_macOS.swift */; };
 		30FF496F215CF3B000FF653C /* MCAMediaTimingFunctionName_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FF496E215CF3B000FF653C /* MCAMediaTimingFunctionName_iOS.swift */; };
 		30FF4971215CF4CE00FF653C /* MCAMediaTimingFunctionName_macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FF4970215CF4CE00FF653C /* MCAMediaTimingFunctionName_macOS.swift */; };
+		421C66502225196900DD73F5 /* color-prop-04-t-manual.svg in Resources */ = {isa = PBXBuildFile; fileRef = 421C664F2225196900DD73F5 /* color-prop-04-t-manual.svg */; };
+		4269F43E2257265800D91393 /* color-prop-04-t-manual.reference in Resources */ = {isa = PBXBuildFile; fileRef = 4269F43D2257265700D91393 /* color-prop-04-t-manual.reference */; };
 		5713C4E21E51EC8F00BBA4D9 /* TouchEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5713C4E11E51EC8F00BBA4D9 /* TouchEvent.swift */; };
 		5713C4F31E5AD46800BBA4D9 /* ControlStatesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5713C4F21E5AD46800BBA4D9 /* ControlStatesTests.swift */; };
 		5713C4F51E5AE2C300BBA4D9 /* CombineAnimationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5713C4F41E5AE2C300BBA4D9 /* CombineAnimationTests.swift */; };
@@ -555,6 +557,8 @@
 		30FF496C215CF27E00FF653C /* MCAShapeLayerLineCap_macOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCAShapeLayerLineCap_macOS.swift; sourceTree = "<group>"; };
 		30FF496E215CF3B000FF653C /* MCAMediaTimingFunctionName_iOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCAMediaTimingFunctionName_iOS.swift; sourceTree = "<group>"; };
 		30FF4970215CF4CE00FF653C /* MCAMediaTimingFunctionName_macOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCAMediaTimingFunctionName_macOS.swift; sourceTree = "<group>"; };
+		421C664F2225196900DD73F5 /* color-prop-04-t-manual.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "color-prop-04-t-manual.svg"; sourceTree = "<group>"; };
+		4269F43D2257265700D91393 /* color-prop-04-t-manual.reference */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "color-prop-04-t-manual.reference"; sourceTree = "<group>"; };
 		5713C4E11E51EC8F00BBA4D9 /* TouchEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TouchEvent.swift; sourceTree = "<group>"; };
 		5713C4F21E5AD46800BBA4D9 /* ControlStatesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlStatesTests.swift; sourceTree = "<group>"; };
 		5713C4F41E5AE2C300BBA4D9 /* CombineAnimationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombineAnimationTests.swift; sourceTree = "<group>"; };
@@ -1356,6 +1360,8 @@
 		5B1AE18320B6A669007EECCB /* w3cSVGTests */ = {
 			isa = PBXGroup;
 			children = (
+				421C664F2225196900DD73F5 /* color-prop-04-t-manual.svg */,
+				4269F43D2257265700D91393 /* color-prop-04-t-manual.reference */,
 				5B1AE22D20B6A669007EECCB /* color-prop-01-b-manual.reference */,
 				5B1AE18A20B6A669007EECCB /* color-prop-01-b-manual.svg */,
 				5B1AE22C20B6A669007EECCB /* color-prop-02-f-manual.reference */,
@@ -1765,6 +1771,7 @@
 				5B1AE26920B6A669007EECCB /* struct-use-03-t-manual.reference in Resources */,
 				5B1AE27820B6A669007EECCB /* struct-group-01-t-manual.reference in Resources */,
 				5B1AE2B820B6A669007EECCB /* painting-stroke-03-t-manual.reference in Resources */,
+				4269F43E2257265800D91393 /* color-prop-04-t-manual.reference in Resources */,
 				5B1AE2C720B6A669007EECCB /* paths-data-02-t-manual.svg in Resources */,
 				5B1AE27120B6A669007EECCB /* painting-stroke-04-t-manual.reference in Resources */,
 				5B1AE2C220B6A669007EECCB /* coords-trans-05-t-manual.svg in Resources */,
@@ -1851,6 +1858,7 @@
 				5B1AE23C20B6A669007EECCB /* paths-data-15-t-manual.svg in Resources */,
 				5BAE2039208E163D006BF277 /* polygon.reference in Resources */,
 				5B1AE27220B6A669007EECCB /* struct-frag-06-t-manual.svg in Resources */,
+				421C66502225196900DD73F5 /* color-prop-04-t-manual.svg in Resources */,
 				5B1AE2A020B6A669007EECCB /* coords-trans-08-t-manual.svg in Resources */,
 				5B1AE23A20B6A669007EECCB /* painting-fill-03-t-manual.reference in Resources */,
 				5BAE2043208E163D006BF277 /* textBasicTransform.reference in Resources */,

diff --git a/MacawTests/MacawSVGTests.swift b/MacawTests/MacawSVGTests.swift
@@ -485,6 +485,10 @@ class MacawSVGTests: XCTestCase {
         validateJSON("color-prop-03-t-manual")
     }
 
+    func testColorProp04() {
+        validateJSON("color-prop-04-t-manual")
+    }
+
     func testTypesBasic01() {
         validateJSON("types-basic-01-f-manual")
     }