Skip to content

Commit 9783d8c

Browse files
khoikhoi
authored
Merge pull request #5 from GoodNotes/paco/marker_parser_ios
[FFA-407] Parse marker in SVG
2 parents 27e2c36 + 34383ab commit 9783d8c

146 files changed

Lines changed: 940 additions & 75 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎SVGView.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
0E068A7C2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */; };
11+
0E068A7D2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */; };
12+
0E068A7E2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */; };
13+
0E068A7F2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */; };
1014
5815294025B6C8F600E8D23A /* SVGPaint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5815293F25B6C8F600E8D23A /* SVGPaint.swift */; };
1115
5815294425B6C90F00E8D23A /* SVGColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5815294325B6C90F00E8D23A /* SVGColor.swift */; };
1216
5815298A25B752E600E8D23A /* SVGPreserveAspectRatio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5815298925B752E600E8D23A /* SVGPreserveAspectRatio.swift */; };
@@ -134,6 +138,8 @@
134138
/* End PBXContainerItemProxy section */
135139

136140
/* Begin PBXFileReference section */
141+
0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGDefs.swift; sourceTree = "<group>"; };
142+
0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGMarker.swift; sourceTree = "<group>"; };
137143
5815293F25B6C8F600E8D23A /* SVGPaint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGPaint.swift; sourceTree = "<group>"; };
138144
5815294325B6C90F00E8D23A /* SVGColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGColor.swift; sourceTree = "<group>"; };
139145
5815298925B752E600E8D23A /* SVGPreserveAspectRatio.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SVGPreserveAspectRatio.swift; sourceTree = "<group>"; };
@@ -372,6 +378,8 @@
372378
5BE3323924E144B200BB0D60 /* SVGText.swift */,
373379
5B1018192536C64700105E9A /* SVGUserSpaceNode.swift */,
374380
5B1017E625358E4400105E9A /* SVGViewport.swift */,
381+
0E068A7A2DE5719900DE4DC9 /* SVGDefs.swift */,
382+
0E068A7B2DE5719900DE4DC9 /* SVGMarker.swift */,
375383
);
376384
path = Nodes;
377385
sourceTree = "<group>";
@@ -601,6 +609,8 @@
601609
58A66522283E9A0100F1F6FD /* MBezierPath+Extension_macOS.swift in Sources */,
602610
5B0BD94224EE66A400F23286 /* SVGView.swift in Sources */,
603611
5BE3327124E144B200BB0D60 /* SVGFont.swift in Sources */,
612+
0E068A7C2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */,
613+
0E068A7D2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */,
604614
5BE3326F24E144B200BB0D60 /* XMLNode.swift in Sources */,
605615
5B1017E725358E4400105E9A /* SVGViewport.swift in Sources */,
606616
582D0C262840189A00F945D8 /* SVGLinker.swift in Sources */,
@@ -617,6 +627,8 @@
617627
582D0C2B28401A5600F945D8 /* SVGScreen.swift in Sources */,
618628
58A66500283E999B00F1F6FD /* SVGGroup.swift in Sources */,
619629
58A664F8283E977600F1F6FD /* SVGParserExtensions.swift in Sources */,
630+
0E068A7E2DE5719A00DE4DC9 /* SVGDefs.swift in Sources */,
631+
0E068A7F2DE5719A00DE4DC9 /* SVGMarker.swift in Sources */,
620632
58A6650E283E99C100F1F6FD /* SVGDataImage.swift in Sources */,
621633
582D0C272840189A00F945D8 /* SVGLinker.swift in Sources */,
622634
585A5C2F25D007B6000E8B88 /* SVG11Tests.swift in Sources */,

‎SVGViewTests/SVG11Tests.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ class SVG11Tests: BaseTestCase {
153153
compareToReference("painting-fill-05-b")
154154
}
155155

156+
func testPaintingMarker01F() {
157+
compareToReference("painting-marker-01-f")
158+
}
159+
156160
func testPaintingStroke01T() {
157161
compareToReference("painting-stroke-01-t")
158162
}

‎SVGViewTests/SVG12Tests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class SVG12Tests: BaseTestCase {
5656
func testPaintFill04T() {
5757
compareToReference("paint-fill-04-t")
5858
}
59-
59+
6060
func testPaintFill06T() {
6161
compareToReference("paint-fill-06-t")
6262
}

‎SVGViewTests/SVGRefGenerator.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class SVGRefGenerator: XCTestCase {
4646
createReference(name: "masking-opacity-01-b", version: v11)
4747
createReference(name: "painting-control-02-f", version: v11)
4848
createReference(name: "painting-control-03-f", version: v11)
49+
createReference(name: "painting-marker-01-f", version: v11)
4950
createReference(name: "painting-fill-01-t", version: v11)
5051
createReference(name: "painting-fill-02-t", version: v11)
5152
createReference(name: "painting-fill-03-t", version: v11)
@@ -129,6 +130,7 @@ class SVGRefGenerator: XCTestCase {
129130
createReference(name: "paint-color-03-t", version: v12)
130131
createReference(name: "paint-color-201-t", version: v12)
131132
createReference(name: "paint-fill-04-t", version: v12)
133+
createReference(name: "paint-fill-06-t", version: v12)
132134
createReference(name: "paint-stroke-01-t", version: v12)
133135
createReference(name: "paths-data-01-t", version: v12)
134136
createReference(name: "paths-data-02-t", version: v12)

‎SVGViewTests/w3c/1.1F2/refs/color-prop-01-b.ref‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
SVGViewport {
22
id: "svg-root",
33
viewBox: { width: 480, height: 360 },
4+
scaling: "none",
45
contents: [
6+
SVGDefs { },
57
SVGGroup {
68
id: "test-body-content",
79
contents: [
10+
SVGDefs { },
811
SVGGroup {
912
contents: [
1013
SVGGroup {

‎SVGViewTests/w3c/1.1F2/refs/color-prop-02-f.ref‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
SVGViewport {
22
id: "svg-root",
33
viewBox: { width: 480, height: 360 },
4+
scaling: "none",
45
contents: [
6+
SVGDefs { },
57
SVGGroup {
68
id: "test-body-content",
79
contents: [

‎SVGViewTests/w3c/1.1F2/refs/color-prop-03-t.ref‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
SVGViewport {
22
id: "svg-root",
33
viewBox: { width: 480, height: 360 },
4+
scaling: "none",
45
contents: [
6+
SVGDefs { },
57
SVGGroup {
68
id: "test-body-content",
79
contents: [

‎SVGViewTests/w3c/1.1F2/refs/color-prop-04-t.ref‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
SVGViewport {
22
id: "svg-root",
33
viewBox: { width: 480, height: 360 },
4+
scaling: "none",
45
contents: [
6+
SVGDefs { },
57
SVGGroup {
68
id: "test-body-content",
79
contents: [

‎SVGViewTests/w3c/1.1F2/refs/color-prop-05-t.ref‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
SVGViewport {
22
id: "svg-root",
33
viewBox: { width: 480, height: 360 },
4+
scaling: "none",
45
contents: [
6+
SVGDefs { },
57
SVGGroup {
68
id: "test-body-content",
79
contents: [

‎SVGViewTests/w3c/1.1F2/refs/coords-coord-01-t.ref‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
SVGViewport {
22
id: "svg-root",
33
viewBox: { width: 480, height: 360 },
4+
scaling: "none",
45
contents: [
6+
SVGDefs { },
57
SVGGroup {
68
id: "test-body-content",
79
contents: [

0 commit comments

Comments
 (0)