Skip to content

Commit

Permalink
Merge branch 'master' into explain/release-1.0.3
Browse files Browse the repository at this point in the history 
* master:
  Clean up source code
  Add all standard web colors
  Add compact API for geometry classes and Color
  update w3c-svg-test-suite
  add svg test for shapes-rect 2/3/6/7
  Fix exyte#395: improvements readSegments for A,a
  add svg test for shapes-rect
  exyte#347 add svg tests for coords-trans
  Fix exyte#395: add type == .A
  Fix exyte#395: update w3c-svg-test-suite
  Fix exyte#395: add svg test for paths-data-20-f-manual
  Fix exyte#395: improvements for SVGParser for readData, flags for 'a' path segment type may not be separated properly
  • Loading branch information
@lukaszkrystek
lukaszkrystek committed May 29, 2019
2 parents b5c7e71 + 1fbc6f3 commit c84ef7e
Show file tree
Hide file tree
Showing 38 changed files with 7,499 additions and 110 deletions.
84 changes: 82 additions & 2 deletions Macaw.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

112 changes: 76 additions & 36 deletions MacawTests/MacawSVGTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,62 @@ class MacawSVGTests: XCTestCase {
validateJSON("paths-data-12-t-manual")
}

func testCoordsTrans01() {
validateJSON("coords-trans-01-b-manual")
}

func testCoordsTrans02() {
validateJSON("coords-trans-02-t-manual")
}

func testCoordsTrans03() {
validateJSON("coords-trans-03-t-manual")
}

func testCoordsTrans04() {
validateJSON("coords-trans-04-t-manual")
}

func testCoordsTrans05() {
validateJSON("coords-trans-05-t-manual")
}

func testCoordsTrans06() {
validateJSON("coords-trans-06-t-manual")
}

func testCoordsTrans07() {
validateJSON("coords-trans-07-t-manual")
}

func testCoordsTrans08() {
validateJSON("coords-trans-08-t-manual")
}

func testCoordsTrans09() {
validateJSON("coords-trans-09-t-manual")
}

func testCoordsTrans10() {
validateJSON("coords-trans-10-f-manual")
}

func testCoordsTrans11() {
validateJSON("coords-trans-11-f-manual")
}

func testCoordsTrans12() {
validateJSON("coords-trans-12-f-manual")
}

func testCoordsTrans13() {
validateJSON("coords-trans-13-f-manual")
}

func testCoordsTrans14() {
validateJSON("coords-trans-14-f-manual")
}

func testCoordsCoord01() {
validateJSON("coords-coord-01-t-manual")
}
Expand Down Expand Up @@ -321,14 +373,6 @@ class MacawSVGTests: XCTestCase {
validateJSON("paths-data-06-t-manual")
}

func testCoordsTrans07() {
validateJSON("coords-trans-07-t-manual")
}

func testCoordsTrans01() {
validateJSON("coords-trans-01-b-manual")
}

func testPaintingStroke01() {
validateJSON("painting-stroke-01-t-manual")
}
Expand All @@ -349,10 +393,30 @@ class MacawSVGTests: XCTestCase {
validateJSON("painting-fill-03-t-manual")
}

func testShapesRect02() {
validateJSON("shapes-rect-02-t-manual")
}

func testShapesRect03() {
validateJSON("shapes-rect-03-t-manual")
}

func testShapesRect04() {
validateJSON("shapes-rect-04-f-manual")
}

func testShapesRect05() {
validateJSON("shapes-rect-05-f-manual")
}

func testShapesRect06() {
validateJSON("shapes-rect-06-f-manual")
}

func testShapesRect07() {
validateJSON("shapes-rect-07-f-manual")
}

func testPaintingFill04() {
validateJSON("painting-fill-04-t-manual")
}
Expand Down Expand Up @@ -393,10 +457,6 @@ class MacawSVGTests: XCTestCase {
validateJSON("painting-fill-02-t-manual")
}

func testShapesRect04() {
validateJSON("shapes-rect-04-f-manual")
}

func testCoordsTransformattr03() {
validateJSON("coords-transformattr-03-f-manual")
}
Expand Down Expand Up @@ -425,10 +485,6 @@ class MacawSVGTests: XCTestCase {
validateJSON("coords-transformattr-01-f-manual")
}

func testCoordsTrans09() {
validateJSON("coords-trans-09-t-manual")
}

func testShapesCircle01() {
validateJSON("shapes-circle-01-t-manual")
}
Expand Down Expand Up @@ -457,10 +513,6 @@ class MacawSVGTests: XCTestCase {
validateJSON("painting-stroke-09-t-manual")
}

func testCoordsTrans08() {
validateJSON("coords-trans-08-t-manual")
}

func testPaintingFill01() {
validateJSON("painting-fill-01-t-manual")
}
Expand Down Expand Up @@ -513,14 +565,6 @@ class MacawSVGTests: XCTestCase {
validateJSON("coords-coord-02-t-manual")
}

func testCoordsTrans05() {
validateJSON("coords-trans-05-t-manual")
}

func testCoordsTrans02() {
validateJSON("coords-trans-02-t-manual")
}

func testPathsData02() {
validateJSON("paths-data-02-t-manual")
}
Expand All @@ -529,6 +573,10 @@ class MacawSVGTests: XCTestCase {
validateJSON("paths-data-19-f-manual")
}

func testPathsData20() {
validateJSON("paths-data-20-f-manual")
}

func testStructGroup01() {
validateJSON("struct-group-01-t-manual")
}
Expand All @@ -537,14 +585,6 @@ class MacawSVGTests: XCTestCase {
validateJSON("painting-stroke-05-t-manual")
}

func testCoordsTrans03() {
validateJSON("coords-trans-03-t-manual")
}

func testCoordsTrans04() {
validateJSON("coords-trans-04-t-manual")
}

func testMetadataExample01() {
validateJSON("metadata-example-01-t-manual")
}
Expand Down
33 changes: 16 additions & 17 deletions MacawTests/w3c-test-suite.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ There are [521 SVG tests](https://github.com/web-platform-tests/wpt/tree/master/
* [switch/object](https://www.w3.org/TR/SVG11/backward.html) (7)

The rest 306 tests can be split into following categories:
* 31.4% passed (96)
* 35.3% passed (108)
* 14.1% filters (43) [#390](https://github.com/exyte/Macaw/issues/390)
* 7.8% images (24) [wpt issue](https://github.com/web-platform-tests/wpt/issues/11178)
* 8.5% images (26) [wpt issue](https://github.com/web-platform-tests/wpt/issues/11178)
* 2.6% markers (8) [#392](https://github.com/exyte/Macaw/issues/392)
* 19.9% text (61) [#391](https://github.com/exyte/Macaw/issues/391)
* 24.5% blocked by issues (75)
* 20.6% text (63) [#391](https://github.com/exyte/Macaw/issues/391)
* 19.0% blocked by issues (58)

Status of each test:

Expand All @@ -25,7 +25,7 @@ Status of each test:
|[color-prop-01-b-manual](w3cSVGTests/color-prop-01-b-manual.svg) | ✅ |
|[color-prop-02-f-manual](w3cSVGTests/color-prop-02-f-manual.svg) | ✅ |
|[color-prop-03-t-manual](w3cSVGTests/color-prop-03-t-manual.svg) | ✅ |
|[color-prop-04-t-manual](w3cSVGTests/color-prop-04-t-manual.svg) | [#387](https://github.com/exyte/Macaw/issues/387) |
|[color-prop-04-t-manual](w3cSVGTests/color-prop-04-t-manual.svg) | ✅ |
|[color-prop-05-t-manual](w3cSVGTests/color-prop-05-t-manual.svg) | ✅ |
|[conform-viewers-02-f-manual](w3cSVGTests/conform-viewers-02-f-manual.svg) | [wpt issue](https://github.com/web-platform-tests/wpt/issues/11178) |
|[conform-viewers-03-f-manual](w3cSVGTests/conform-viewers-03-f-manual.svg) | [wpt issue](https://github.com/web-platform-tests/wpt/issues/11178) |
Expand All @@ -40,11 +40,11 @@ Status of each test:
|[coords-trans-07-t-manual](w3cSVGTests/coords-trans-07-t-manual.svg) | ✅ |
|[coords-trans-08-t-manual](w3cSVGTests/coords-trans-08-t-manual.svg) | ✅ |
|[coords-trans-09-t-manual](w3cSVGTests/coords-trans-09-t-manual.svg) | ✅ |
|[coords-trans-10-f-manual](w3cSVGTests/coords-trans-10-f-manual.svg) | [#347](https://github.com/exyte/Macaw/issues/347) |
|[coords-trans-11-f-manual](w3cSVGTests/coords-trans-11-f-manual.svg) | [#347](https://github.com/exyte/Macaw/issues/347) |
|[coords-trans-12-f-manual](w3cSVGTests/coords-trans-12-f-manual.svg) | [#347](https://github.com/exyte/Macaw/issues/347) |
|[coords-trans-13-f-manual](w3cSVGTests/coords-trans-13-f-manual.svg) | [#347](https://github.com/exyte/Macaw/issues/347) |
|[coords-trans-14-f-manual](w3cSVGTests/coords-trans-14-f-manual.svg) | [#347](https://github.com/exyte/Macaw/issues/347) |
|[coords-trans-10-f-manual](w3cSVGTests/coords-trans-10-f-manual.svg) | ✅ |
|[coords-trans-11-f-manual](w3cSVGTests/coords-trans-11-f-manual.svg) | ✅ |
|[coords-trans-12-f-manual](w3cSVGTests/coords-trans-12-f-manual.svg) | ✅ |
|[coords-trans-13-f-manual](w3cSVGTests/coords-trans-13-f-manual.svg) | ✅ |
|[coords-trans-14-f-manual](w3cSVGTests/coords-trans-14-f-manual.svg) | ✅ |
|[coords-transformattr-01-f-manual](w3cSVGTests/coords-transformattr-01-f-manual.svg) | ✅ |
|[coords-transformattr-02-f-manual](w3cSVGTests/coords-transformattr-02-f-manual.svg) | ✅ |
|[coords-transformattr-03-f-manual](w3cSVGTests/coords-transformattr-03-f-manual.svg) | ✅ |
Expand Down Expand Up @@ -183,7 +183,7 @@ Status of each test:
|[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-19-f-manual](w3cSVGTests/paths-data-19-f-manual.svg) | ✅ |
|[paths-data-20-f-manual](w3cSVGTests/paths-data-20-f-manual.svg) | [#395](https://github.com/exyte/Macaw/issues/395) |
|[paths-data-20-f-manual](w3cSVGTests/paths-data-20-f-manual.svg) | ✅ |
|[pservers-grad-01-b-manual](w3cSVGTests/pservers-grad-01-b-manual.svg) | ✅ |
|[pservers-grad-02-b-manual](w3cSVGTests/pservers-grad-02-b-manual.svg) | ✅ |
|[pservers-grad-03-b-manual](w3cSVGTests/pservers-grad-03-b-manual.svg) | ✅ |
Expand Down Expand Up @@ -237,12 +237,12 @@ Status of each test:
|[shapes-polygon-03-t-manual](w3cSVGTests/shapes-polygon-03-t-manual.svg) | ✅ |
|[shapes-polyline-01-t-manual](w3cSVGTests/shapes-polyline-01-t-manual.svg) | ✅ |
|[shapes-polyline-02-t-manual](w3cSVGTests/shapes-polyline-02-t-manual.svg) | ✅ |
|[shapes-rect-02-t-manual](w3cSVGTests/shapes-rect-02-t-manual.svg) | [ios bug](https://stackoverflow.com/q/18880919)|
|[shapes-rect-03-t-manual](w3cSVGTests/shapes-rect-03-t-manual.svg) | [ios bug](https://stackoverflow.com/q/18880919)|
|[shapes-rect-02-t-manual](w3cSVGTests/shapes-rect-02-t-manual.svg) | ✅ |
|[shapes-rect-03-t-manual](w3cSVGTests/shapes-rect-03-t-manual.svg) | ✅ |
|[shapes-rect-04-f-manual](w3cSVGTests/shapes-rect-04-f-manual.svg) | ✅ |
|[shapes-rect-05-f-manual](w3cSVGTests/shapes-rect-05-f-manual.svg) | ✅ |
|[shapes-rect-06-f-manual](w3cSVGTests/shapes-rect-06-f-manual.svg) | [ios bug](https://stackoverflow.com/q/18880919) |
|[shapes-rect-07-f-manual](w3cSVGTests/shapes-rect-07-f-manual.svg) | [ios bug](https://stackoverflow.com/q/18880919) |
|[shapes-rect-06-f-manual](w3cSVGTests/shapes-rect-06-f-manual.svg) | ✅ |
|[shapes-rect-07-f-manual](w3cSVGTests/shapes-rect-07-f-manual.svg) | ✅ |
|[struct-defs-01-t-manual](w3cSVGTests/struct-defs-01-t-manual.svg) | ✅ |
|[struct-frag-01-t-manual](w3cSVGTests/struct-frag-01-t-manual.svg) | ✅ |
|[struct-frag-02-t-manual](w3cSVGTests/struct-frag-02-t-manual.svg) | ✅ |
Expand Down Expand Up @@ -274,8 +274,7 @@ Status of each test:
|[struct-image-19-f-manual](w3cSVGTests/struct-image-19-f-manual.svg) | [wpt issue](https://github.com/web-platform-tests/wpt/issues/11178) |
|[struct-svg-03-f-manual](w3cSVGTests/struct-svg-03-f-manual.svg) | [#344](https://github.com/exyte/Macaw/issues/344) |
|[struct-symbol-01-b-manual](w3cSVGTests/struct-symbol-01-b-manual.svg) | [#398](https://github.com/exyte/Macaw/issues/398) |
|[struct-use-01-t-manual](w3cSVGTests/struct-use-01-t-manual.svg) |
✅ |
|[struct-use-01-t-manual](w3cSVGTests/struct-use-01-t-manual.svg) | ✅ |
|[struct-use-03-t-manual](w3cSVGTests/struct-use-03-t-manual.svg) | ✅ |
|[struct-use-09-b-manual](w3cSVGTests/struct-use-09-b-manual.svg) | [#398](https://github.com/exyte/Macaw/issues/398) |
|[struct-use-12-f-manual](w3cSVGTests/struct-use-12-f-manual.svg) | ✅ |
Expand Down
Loading

0 comments on commit c84ef7e

Please sign in to comment.