@leafer/path 2.1.2 → 2.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/path",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "@leafer/path",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/data": "2.1.2",
-    "@leafer/math": "2.1.2",
-    "@leafer/debug": "2.1.2"
+    "@leafer/data": "2.1.4",
+    "@leafer/math": "2.1.4",
+    "@leafer/debug": "2.1.4"
   },
   "devDependencies": {
-    "@leafer/interface": "2.1.2"
+    "@leafer/interface": "2.1.4"
   }
 }

package/src/PathConvert.ts

@@ -79,6 +79,10 @@ export const PathConvert = {
                 current.index = 0
                 pushData(data, current.name)
 
+                // m/M命令连续数据需转成l/L: m1 1 2 2m5 5 6 6
+                if (char === 'm') current.name = Command['l']
+                else if (char === 'M') current.name = Command['L']
+
                 if (!needConvert && convertCommand[char]) needConvert = true
 
             } else {
@@ -122,12 +126,9 @@ export const PathConvert = {
                     old[i + 1] += x
                     old[i + 2] += y
                 case M:
-                    x = old[i + 1]
-                    y = old[i + 2]
-
-                    if (lastCommand === command) data.push(L, x, y) // M command followed by multiple coordinates
-                    else data.push(M, x, y), startX = x, startY = y
-
+                    x = startX = old[i + 1]
+                    y = startY = old[i + 2]
+                    data.push(M, x, y)
                     i += 3
                     break
 
@@ -169,8 +170,8 @@ export const PathConvert = {
                     command = S
                 case S:
                     smooth = (lastCommand === C) || (lastCommand === S)
-                    x1 = smooth ? (x * 2 - controlX) : old[i + 1]
-                    y1 = smooth ? (y * 2 - controlY) : old[i + 2]
+                    x1 = smooth ? (x * 2 - controlX) : x
+                    y1 = smooth ? (y * 2 - controlY) : y
                     controlX = old[i + 1]
                     controlY = old[i + 2]
                     x = old[i + 3]
@@ -204,8 +205,8 @@ export const PathConvert = {
                     command = T
                 case T:  //smooth
                     smooth = (lastCommand === Q) || (lastCommand === T)
-                    controlX = smooth ? (x * 2 - controlX) : old[i + 1]
-                    controlY = smooth ? (y * 2 - controlY) : old[i + 2]
+                    controlX = smooth ? (x * 2 - controlX) : x
+                    controlY = smooth ? (y * 2 - controlY) : y
                     curveMode ? quadraticCurveTo(data, x, y, controlX, controlY, old[i + 1], old[i + 2]) : data.push(Q, controlX, controlY, old[i + 1], old[i + 2])
                     x = old[i + 1]
                     y = old[i + 2]