fix Path.prototype.split for relative subpaths

ppvg · Nov 30, 2013 · af0aa90 · af0aa90
1 parent 517070f
commit af0aa90
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/lib/Path.js b/lib/Path.js
@@ -75,7 +75,7 @@ Path.prototype.copy = function () {
   return new Path(newContent)
 }
 
-Path.prototype.split = function() {
+Path.prototype.split = function () {
   var subpaths = [[]]
   var start
   function currentPath() { return subpaths[subpaths.length - 1] }
@@ -93,11 +93,20 @@ Path.prototype.split = function() {
       start = command
     } else {
       if (command.type === 'M') {
-        start = command
+        if (command.relative) {
+          start = { type: 'M', relative: false,
+                   x: command.x + start.x,
+                   y: command.y + start.y }
+        } else {
+          start = clone(command)
+        }
+        push(start)
       } else if (currentPath().length === 0) {
         push({ type: 'M', relative: false, x: start.x, y: start.y })
+        push(clone(command))
+      } else {
+        push(clone(command))
       }
-      push(clone(command))
     }
   })
   if (currentPath().length === 0) subpaths.pop()

diff --git a/test/split.js b/test/split.js
@@ -42,6 +42,30 @@ test('explicit subpath', function (t) {
   t.end()
 })
 
+test('relative subpath', function (t) {
+  var path = new Path([
+    { type: 'M', relative:false, x:50, y:50 },
+    { type: 'L', relative:false, x:100, y:100 },
+    { type: 'Z' },
+    { type: 'M', relative:true, x:50, y:50 },
+    { type: 'L', relative:false, x:200, y:200 }
+  ])
+  var subpaths = path.split()
+  t.same(subpaths.length, 2)
+  t.same(subpaths[0].content,
+    [
+      { type: 'M', relative:false, x:50, y:50 },
+      { type: 'L', relative:false, x:100, y:100 },
+      { type: 'Z' }
+    ])
+  t.same(subpaths[1].content,
+    [
+      { type: 'M', relative:false, x:100, y:100 },
+      { type: 'L', relative:false, x:200, y:200 }
+    ])
+  t.end()
+})
+
 test('subpath without closepath', function (t) {
   var path = new Path([
     { type: 'M', relative:false, x:0, y:0 },