Skip to content

[FFA-407] Parse marker in SVG #5

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

Merged
khoi merged 25 commits into from
May 28, 2025
Merged

[FFA-407] Parse marker in SVG #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7ce2379
Add SVGDefs
pacowong May 26, 2025
d134c83
Add parameter related to marker element
pacowong May 26, 2025
135c4ff
Add members to store marker start and marker end in SVGShape
pacowong May 26, 2025
17265e2
Add new parser
pacowong May 26, 2025
d70adb7
Generate tests
pacowong May 27, 2025
e52b39f
Update SVGMarker
pacowong May 27, 2025
e5dea6c
Add SVGViewTests/w3c/1.1F2/refs/painting-marker-01-f.ref
pacowong May 27, 2025
dcdbfb5
Update SVG/SVGParser.swift
pacowong May 27, 2025
9c7c0a7
Parse marker-start, marker-mid and marker-end
pacowong May 27, 2025
6853713
Parse marker attribute
pacowong May 27, 2025
f3485be
SVGShape supports markers
pacowong May 27, 2025
6215fe1
Update parser to set default
pacowong May 27, 2025
7f9ba69
Add .zero
pacowong May 27, 2025
7b86c18
Add new files
pacowong May 27, 2025
78a7b44
Update coverage
pacowong May 27, 2025
a1cffee
Move code to SVGHelper
pacowong May 27, 2025
14fad59
Remove PolyfillTests.swift
pacowong May 27, 2025
bec2668
Update test fixtures
pacowong May 27, 2025
ada46ea
Restore the original logic of serialization
khoi May 27, 2025
0f8fd8f
Update test fixtures
khoi May 27, 2025
6337352
Fix decimal separator in CGAffineTransform serialization
khoi May 27, 2025
35b2c73
Update Source/Model/Nodes/SVGMarker.swift
pacowong May 27, 2025
a285e11
Remove .zero
pacowong May 27, 2025
42e1a3c
SVGMarker is a subclass of SVGGroup
pacowong May 27, 2025
34383ab
Fix XP code
pacowong May 27, 2025
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
12 changes: 12 additions & 0 deletions SVGView.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
0E068A7C2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */; };
0E068A7D2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */; };
0E068A7E2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */; };
0E068A7F2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */; };
5815294025B6C8F600E8D23A /* SVGPaint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5815293F25B6C8F600E8D23A /* SVGPaint.swift */; };
5815294425B6C90F00E8D23A /* SVGColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5815294325B6C90F00E8D23A /* SVGColor.swift */; };
5815298A25B752E600E8D23A /* SVGPreserveAspectRatio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5815298925B752E600E8D23A /* SVGPreserveAspectRatio.swift */; };
Expand Down Expand Up @@ -134,6 +138,8 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGDefs.swift; sourceTree = "<group>"; };
0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGMarker.swift; sourceTree = "<group>"; };
5815293F25B6C8F600E8D23A /* SVGPaint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGPaint.swift; sourceTree = "<group>"; };
5815294325B6C90F00E8D23A /* SVGColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGColor.swift; sourceTree = "<group>"; };
5815298925B752E600E8D23A /* SVGPreserveAspectRatio.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGPreserveAspectRatio.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -372,6 +378,8 @@
5BE3323924E144B200BB0D60 /* SVGText.swift */,
5B1018192536C64700105E9A /* SVGUserSpaceNode.swift */,
5B1017E625358E4400105E9A /* SVGViewport.swift */,
0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */,
0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */,
);
path = Nodes;
sourceTree = "<group>";
Expand Down Expand Up @@ -601,6 +609,8 @@
58A66522283E9A0100F1F6FD /* MBezierPath+Extension_macOS.swift in Sources */,
5B0BD94224EE66A400F23286 /* SVGView.swift in Sources */,
5BE3327124E144B200BB0D60 /* SVGFont.swift in Sources */,
0E068A7C2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */,
0E068A7D2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */,
5BE3326F24E144B200BB0D60 /* XMLNode.swift in Sources */,
5B1017E725358E4400105E9A /* SVGViewport.swift in Sources */,
582D0C262840189A00F945D8 /* SVGLinker.swift in Sources */,
Expand All @@ -617,6 +627,8 @@
582D0C2B28401A5600F945D8 /* SVGScreen.swift in Sources */,
58A66500283E999B00F1F6FD /* SVGGroup.swift in Sources */,
58A664F8283E977600F1F6FD /* SVGParserExtensions.swift in Sources */,
0E068A7E2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */,
0E068A7F2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */,
58A6650E283E99C100F1F6FD /* SVGDataImage.swift in Sources */,
582D0C272840189A00F945D8 /* SVGLinker.swift in Sources */,
585A5C2F25D007B6000E8B88 /* SVG11Tests.swift in Sources */,
Expand Down
4 changes: 4 additions & 0 deletions SVGViewTests/SVG11Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ class SVG11Tests: BaseTestCase {
compareToReference("painting-fill-05-b")
}

func testPaintingMarker01F() {
compareToReference("painting-marker-01-f")
}

func testPaintingStroke01T() {
compareToReference("painting-stroke-01-t")
}
Expand Down
2 changes: 1 addition & 1 deletion SVGViewTests/SVG12Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class SVG12Tests: BaseTestCase {
func testPaintFill04T() {
compareToReference("paint-fill-04-t")
}

func testPaintFill06T() {
compareToReference("paint-fill-06-t")
}
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/SVGRefGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class SVGRefGenerator: XCTestCase {
createReference(name: "masking-opacity-01-b", version: v11)
createReference(name: "painting-control-02-f", version: v11)
createReference(name: "painting-control-03-f", version: v11)
createReference(name: "painting-marker-01-f", version: v11)
createReference(name: "painting-fill-01-t", version: v11)
createReference(name: "painting-fill-02-t", version: v11)
createReference(name: "painting-fill-03-t", version: v11)
Expand Down Expand Up @@ -129,6 +130,7 @@ class SVGRefGenerator: XCTestCase {
createReference(name: "paint-color-03-t", version: v12)
createReference(name: "paint-color-201-t", version: v12)
createReference(name: "paint-fill-04-t", version: v12)
createReference(name: "paint-fill-06-t", version: v12)
Copy link
Collaborator

@khoi khoi May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's in this?

Copy link
Author

@pacowong pacowong May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test is present in the orginally repo. We need this line to regenerate the ref file.

createReference(name: "paint-stroke-01-t", version: v12)
createReference(name: "paths-data-01-t", version: v12)
createReference(name: "paths-data-02-t", version: v12)
Expand Down
3 changes: 3 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
SVGDefs { },
SVGGroup {
contents: [
SVGGroup {
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-coord-02-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-01-b.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-02-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-03-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-04-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-05-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-06-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-07-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-08-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-09-t.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-10-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-11-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-12-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-13-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-trans-14-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-transformattr-01-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-transformattr-02-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-transformattr-03-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-transformattr-04-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-transformattr-05-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-units-02-b.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/coords-units-03-b.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/masking-opacity-01-b.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/painting-control-02-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
2 changes: 2 additions & 0 deletions SVGViewTests/w3c/1.1F2/refs/painting-control-03-f.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SVGViewport {
id: "svg-root",
viewBox: { width: 480, height: 360 },
scaling: "none",
contents: [
SVGDefs { },
SVGGroup {
id: "test-body-content",
contents: [
Expand Down
Loading