Fix #376: Parsing of a path should stop after unsupported symbols

exyte · May 29, 2018 · ff474ab · ff474ab
1 parent 8b24c69
commit ff474ab
Show file tree

Hide file tree

Showing 6 changed files with 607 additions and 3 deletions.
diff --git a/Macaw.xcodeproj/project.pbxproj b/Macaw.xcodeproj/project.pbxproj
@@ -456,6 +456,8 @@
 		5BAE204C208E1EF4006BF277 /* SVGCanvas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BAE201E208E1211006BF277 /* SVGCanvas.swift */; };
 		5BAE2058208F24DE006BF277 /* SceneSerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BAE2057208F24DE006BF277 /* SceneSerialization.swift */; };
 		5BAEA9C9206CEAA20049AAAE /* viewBox.svg in Resources */ = {isa = PBXBuildFile; fileRef = 5BAEA9C8206CEAA20049AAAE /* viewBox.svg */; };
+		5BFEF5D620BC1C1F008DAC11 /* paths-data-18-f-manual.svg in Resources */ = {isa = PBXBuildFile; fileRef = 5BFEF5D420BC1C1E008DAC11 /* paths-data-18-f-manual.svg */; };
+		5BFEF5D720BC1C1F008DAC11 /* paths-data-18-f-manual.reference in Resources */ = {isa = PBXBuildFile; fileRef = 5BFEF5D520BC1C1F008DAC11 /* paths-data-18-f-manual.reference */; };
 		A718CD441F45C28200966E06 /* Common_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = A718CD431F45C28200966E06 /* Common_iOS.swift */; };
 		A718CD471F45C28700966E06 /* Graphics_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = A718CD451F45C28700966E06 /* Graphics_iOS.swift */; };
 		A718CD481F45C28700966E06 /* MView_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = A718CD461F45C28700966E06 /* MView_iOS.swift */; };
@@ -841,6 +843,8 @@
 		5BAE2035208E163C006BF277 /* clip.reference */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = clip.reference; sourceTree = "<group>"; };
 		5BAE2057208F24DE006BF277 /* SceneSerialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneSerialization.swift; sourceTree = "<group>"; };
 		5BAEA9C8206CEAA20049AAAE /* viewBox.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = viewBox.svg; sourceTree = "<group>"; };
+		5BFEF5D420BC1C1E008DAC11 /* paths-data-18-f-manual.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "paths-data-18-f-manual.svg"; sourceTree = "<group>"; };
+		5BFEF5D520BC1C1F008DAC11 /* paths-data-18-f-manual.reference */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "paths-data-18-f-manual.reference"; sourceTree = "<group>"; };
 		A718CD431F45C28200966E06 /* Common_iOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Common_iOS.swift; path = Source/platform/iOS/Common_iOS.swift; sourceTree = SOURCE_ROOT; };
 		A718CD451F45C28700966E06 /* Graphics_iOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Graphics_iOS.swift; path = Source/platform/iOS/Graphics_iOS.swift; sourceTree = SOURCE_ROOT; };
 		A718CD461F45C28700966E06 /* MView_iOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MView_iOS.swift; path = Source/platform/iOS/MView_iOS.swift; sourceTree = SOURCE_ROOT; };
@@ -1387,6 +1391,8 @@
 				5B1AE20220B6A669007EECCB /* paths-data-16-t-manual.svg */,
 				5B1AE1B020B6A669007EECCB /* paths-data-17-f-manual.reference */,
 				5B1AE1C520B6A669007EECCB /* paths-data-17-f-manual.svg */,
+				5BFEF5D520BC1C1F008DAC11 /* paths-data-18-f-manual.reference */,
+				5BFEF5D420BC1C1E008DAC11 /* paths-data-18-f-manual.svg */,
 				5B1AE1D720B6A669007EECCB /* paths-data-19-f-manual.reference */,
 				5B1AE21A20B6A669007EECCB /* paths-data-19-f-manual.svg */,
 				5B1AE1F020B6A669007EECCB /* pservers-grad-stops-01-f-manual.reference */,
@@ -1652,6 +1658,7 @@
 				5BAE2048208E163D006BF277 /* line.reference in Resources */,
 				5B1AE2A420B6A669007EECCB /* paths-data-12-t-manual.reference in Resources */,
 				57CAB1361D7832E000FD8E47 /* triangle.svg in Resources */,
+				5BFEF5D620BC1C1F008DAC11 /* paths-data-18-f-manual.svg in Resources */,
 				5B1AE23620B6A669007EECCB /* paths-data-07-t-manual.svg in Resources */,
 				C43B06691F99FC2300787A35 /* pathbounds4.svg in Resources */,
 				5B1AE27720B6A669007EECCB /* coords-trans-03-t-manual.reference in Resources */,
@@ -1776,6 +1783,7 @@
 				5BAE2045208E163D006BF277 /* arcsgroup.reference in Resources */,
 				5B1AE25920B6A669007EECCB /* coords-trans-01-b-manual.svg in Resources */,
 				5B1AE28C20B6A669007EECCB /* shapes-polygon-01-t-manual.svg in Resources */,
+				5BFEF5D720BC1C1F008DAC11 /* paths-data-18-f-manual.reference in Resources */,
 				5BAE203F208E163D006BF277 /* transform.reference in Resources */,
 				5B1AE24920B6A669007EECCB /* painting-control-06-f-manual.svg in Resources */,
 				5B1AE2B320B6A669007EECCB /* coords-trans-04-t-manual.reference in Resources */,

diff --git a/MacawTests/MacawSVGTests.swift b/MacawTests/MacawSVGTests.swift
@@ -258,6 +258,9 @@ class MacawSVGTests: XCTestCase {
         validateJSON("painting-stroke-07-t-manual")
     }
 
+    func testPathsData18() {
+        createJSON("paths-data-18-f-manual")
+    }
 
     func testPathsData01() {
         validateJSON("paths-data-01-t-manual")

diff --git a/MacawTests/w3c-test-suite.md b/MacawTests/w3c-test-suite.md
@@ -10,8 +10,8 @@ There are 521 SVG tests in total. 212 files uses features that are not covered b
 * [switch/object](https://www.w3.org/TR/SVG11/backward.html) (7)
 
 The rest 309 tests can be split into following categories:
-* 27.5% passed (85)
-* 21% not yet covered (65)
+* 28.4% passed (88)
+* 20% not yet covered (62)
 * 14% filters (43)
 * 7.8% images (24)
 * 2.6% markers (8)
@@ -185,7 +185,7 @@ Status of each test:
 |[paths-data-15-t-manual](w3cSVGTests/paths-data-15-t-manual.svg)       | ✅                                                 |
 |[paths-data-16-t-manual](w3cSVGTests/paths-data-16-t-manual.svg)       | ✅                                                 |
 |[paths-data-17-f-manual](w3cSVGTests/paths-data-17-f-manual.svg)       | ✅                                                 |
-|[paths-data-18-f-manual](w3cSVGTests/paths-data-18-f-manual.svg)       | ❌                                                 |
+|[paths-data-18-f-manual](w3cSVGTests/paths-data-18-f-manual.svg)       | ✅                                                 |
 |[paths-data-19-f-manual](w3cSVGTests/paths-data-19-f-manual.svg)       | ✅                                                 |
 |[paths-data-20-f-manual](w3cSVGTests/paths-data-20-f-manual.svg)       | ❌                                                 |
 |[pservers-grad-01-b-manual](w3cSVGTests/pservers-grad-01-b-manual.svg)       | ❌                                                 |