Update SVGPath to 1.1.5

nicklockwood · nicklockwood · commit 8156bebacdb3 · 2024-07-24T08:50:47.000+01:00
diff --git a/Package.swift b/Package.swift
@@ -23,7 +23,7 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/nicklockwood/SVGPath.git",
-            .upToNextMinor(from: "1.1.4")
+            .upToNextMinor(from: "1.1.5")
         ),
     ],
     targets: [
diff --git a/SVGPath/CHANGELOG.md b/SVGPath/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [1.1.5](https://github.com/nicklockwood/SVGPath/releases/tag/1.1.5) (2024-04-28)
+
+- Fixed incorrect calculation for relative `moveTo` commands
+- Added `+=` and `-=` operators for `SVGPoint`
+
 ## [1.1.4](https://github.com/nicklockwood/SVGPath/releases/tag/1.1.4) (2023-12-09)
 
 - Fixed inverted arc rotation argument
diff --git a/SVGPath/SVGPath.xcodeproj/project.pbxproj b/SVGPath/SVGPath.xcodeproj/project.pbxproj
@@ -162,8 +162,9 @@
 		016FAB2021BFE78100AF60DC /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 1010;
-				LastUpgradeCheck = 1400;
+				BuildIndependentTargetsInParallel = YES;
+				LastSwiftUpdateCheck = 1530;
+				LastUpgradeCheck = 1530;
 				ORGANIZATIONNAME = "Nick Lockwood";
 				TargetAttributes = {
 					016FAB2821BFE78100AF60DC = {
@@ -428,6 +429,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -436,7 +438,8 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=75";
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SVGPath;
 				PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
@@ -465,6 +468,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -473,7 +477,8 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=75";
 				PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.SVGPath;
 				PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
diff --git a/SVGPath/SVGPath.xcodeproj/xcshareddata/xcschemes/SVGPath.xcscheme b/SVGPath/SVGPath.xcodeproj/xcshareddata/xcschemes/SVGPath.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SVGPath/Sources/SVGPath.swift b/SVGPath/Sources/SVGPath.swift
@@ -100,7 +100,7 @@ public struct SVGPath: Hashable {
             }
             var control = lastPoint - lastControl
             if !isRelative {
-                control = control + lastPoint
+                control += lastPoint
             }
             return .quadratic(control, SVGPoint(x: numbers[0], y: -numbers[1]))
         }
@@ -123,7 +123,7 @@ public struct SVGPath: Hashable {
             }
             var control = lastPoint - lastControl
             if !isRelative {
-                control = control + lastPoint
+                control += lastPoint
             }
             return .cubic(
                 control,
@@ -162,7 +162,7 @@ public struct SVGPath: Hashable {
 
         func appendCommand(_ command: SVGCommand) {
             commands.append(
-                isRelative ? command.relative(to: commands.lastPoint) : command
+                isRelative ? command.relative(to: commands) : command
             )
         }
 
@@ -317,6 +317,13 @@ private extension Array where Element == SVGCommand {
         }
         return .zero
     }
+
+    var lastMove: SVGPoint {
+        for case let .moveTo(point) in reversed() {
+            return point
+        }
+        return .zero
+    }
 }
 
 public enum SVGError: Error, Hashable {
@@ -360,6 +367,15 @@ public extension SVGCommand {
         }
     }
 
+    private var startPoint: SVGPoint? {
+        switch self {
+        case let .moveTo(point):
+            return point
+        default:
+            return nil
+        }
+    }
+
     var control1: SVGPoint? {
         switch self {
         case let .cubic(control1, _, _), let .quadratic(control1, _):
@@ -441,18 +457,20 @@ public extension SVGCommand {
         }
     }
 
-    fileprivate func relative(to last: SVGPoint) -> SVGCommand {
+    fileprivate func relative(to commands: [SVGCommand]) -> SVGCommand {
         switch self {
         case let .moveTo(point):
-            return .moveTo(point + last)
+            return .moveTo(point + commands.lastMove)
         case let .lineTo(point):
-            return .lineTo(point + last)
+            return .lineTo(point + commands.lastPoint)
         case let .cubic(control1, control2, point):
+            let last = commands.lastPoint
             return .cubic(control1 + last, control2 + last, point + last)
         case let .quadratic(control, point):
+            let last = commands.lastPoint
             return .quadratic(control + last, point + last)
         case let .arc(arc):
-            return .arc(arc.relative(to: last))
+            return .arc(arc.relative(to: commands.lastPoint))
         case .end:
             return .end
         }
@@ -475,9 +493,17 @@ public extension SVGPoint {
         SVGPoint(x: lhs.x + rhs.x, y: lhs.y + rhs.y)
     }
 
+    static func += (lhs: inout SVGPoint, rhs: SVGPoint) {
+        lhs = lhs + rhs
+    }
+
     static func - (lhs: SVGPoint, rhs: SVGPoint) -> SVGPoint {
         SVGPoint(x: lhs.x - rhs.x, y: lhs.y - rhs.y)
     }
+
+    static func -= (lhs: inout SVGPoint, rhs: SVGPoint) {
+        lhs = lhs - rhs
+    }
 }
 
 public struct SVGArc: Hashable {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public struct SVGPath: Hashable {`
`100`	`100`	`}`
`101`	`101`	`var control = lastPoint - lastControl`
`102`	`102`	`if !isRelative {`
`103`		`- control = control + lastPoint`
	`103`	`+ control += lastPoint`
`104`	`104`	`}`
`105`	`105`	`return .quadratic(control, SVGPoint(x: numbers[0], y: -numbers[1]))`
`106`	`106`	`}`
`@@ -123,7 +123,7 @@ public struct SVGPath: Hashable {`
`123`	`123`	`}`
`124`	`124`	`var control = lastPoint - lastControl`
`125`	`125`	`if !isRelative {`
`126`		`- control = control + lastPoint`
	`126`	`+ control += lastPoint`
`127`	`127`	`}`
`128`	`128`	`return .cubic(`
`129`	`129`	`control,`
`@@ -162,7 +162,7 @@ public struct SVGPath: Hashable {`
`162`	`162`
`163`	`163`	`func appendCommand(_ command: SVGCommand) {`
`164`	`164`	`commands.append(`
`165`		`- isRelative ? command.relative(to: commands.lastPoint) : command`
	`165`	`+ isRelative ? command.relative(to: commands) : command`
`166`	`166`	`)`
`167`	`167`	`}`
`168`	`168`
`@@ -317,6 +317,13 @@ private extension Array where Element == SVGCommand {`
`317`	`317`	`}`
`318`	`318`	`return .zero`
`319`	`319`	`}`
	`320`	`+`
	`321`	`+ var lastMove: SVGPoint {`
	`322`	`+ for case let .moveTo(point) in reversed() {`
	`323`	`+ return point`
	`324`	`+ }`
	`325`	`+ return .zero`
	`326`	`+ }`
`320`	`327`	`}`
`321`	`328`
`322`	`329`	`public enum SVGError: Error, Hashable {`
`@@ -360,6 +367,15 @@ public extension SVGCommand {`
`360`	`367`	`}`
`361`	`368`	`}`
`362`	`369`
	`370`	`+ private var startPoint: SVGPoint? {`
	`371`	`+ switch self {`
	`372`	`+ case let .moveTo(point):`
	`373`	`+ return point`
	`374`	`+ default:`
	`375`	`+ return nil`
	`376`	`+ }`
	`377`	`+ }`
	`378`	`+`
`363`	`379`	`var control1: SVGPoint? {`
`364`	`380`	`switch self {`
`365`	`381`	`case let .cubic(control1, _, _), let .quadratic(control1, _):`
`@@ -441,18 +457,20 @@ public extension SVGCommand {`
`441`	`457`	`}`
`442`	`458`	`}`
`443`	`459`
`444`		`- fileprivate func relative(to last: SVGPoint) -> SVGCommand {`
	`460`	`+ fileprivate func relative(to commands: [SVGCommand]) -> SVGCommand {`
`445`	`461`	`switch self {`
`446`	`462`	`case let .moveTo(point):`
`447`		`- return .moveTo(point + last)`
	`463`	`+ return .moveTo(point + commands.lastMove)`
`448`	`464`	`case let .lineTo(point):`
`449`		`- return .lineTo(point + last)`
	`465`	`+ return .lineTo(point + commands.lastPoint)`
`450`	`466`	`case let .cubic(control1, control2, point):`
	`467`	`+ let last = commands.lastPoint`
`451`	`468`	`return .cubic(control1 + last, control2 + last, point + last)`
`452`	`469`	`case let .quadratic(control, point):`
	`470`	`+ let last = commands.lastPoint`
`453`	`471`	`return .quadratic(control + last, point + last)`
`454`	`472`	`case let .arc(arc):`
`455`		`- return .arc(arc.relative(to: last))`
	`473`	`+ return .arc(arc.relative(to: commands.lastPoint))`
`456`	`474`	`case .end:`
`457`	`475`	`return .end`
`458`	`476`	`}`
`@@ -475,9 +493,17 @@ public extension SVGPoint {`
`475`	`493`	`SVGPoint(x: lhs.x + rhs.x, y: lhs.y + rhs.y)`
`476`	`494`	`}`
`477`	`495`
	`496`	`+ static func += (lhs: inout SVGPoint, rhs: SVGPoint) {`
	`497`	`+ lhs = lhs + rhs`
	`498`	`+ }`
	`499`	`+`
`478`	`500`	`static func - (lhs: SVGPoint, rhs: SVGPoint) -> SVGPoint {`
`479`	`501`	`SVGPoint(x: lhs.x - rhs.x, y: lhs.y - rhs.y)`
`480`	`502`	`}`
	`503`	`+`
	`504`	`+ static func -= (lhs: inout SVGPoint, rhs: SVGPoint) {`
	`505`	`+ lhs = lhs - rhs`
	`506`	`+ }`
`481`	`507`	`}`
`482`	`508`
`483`	`509`	`public struct SVGArc: Hashable {`