emf-converter 4.4.13 → 4.4.14

package/dist/browser.js

@@ -28141,7 +28141,7 @@ function drawVertices(pen, dx, dy) {
 function halfPixel(v) {
   return Math.sign(v) * 8 * Math.floor((Math.abs(v) + 4) / 8);
 }
-function flatVector(width, dx0, dy0) {
+function perpendicularVectors(width, dx0, dy0) {
   let dx = dx0;
   let dy = dy0;
   const flip = dx < 0 || dx === 0 && dy < 0;
@@ -28175,9 +28175,9 @@ function flatVector(width, dx0, dy0) {
   const ox = off ? sgn * off[0] : 0;
   const oy = off ? sgn * off[1] : 0;
   const r = (v) => 8 * Math.floor((v + 4) / 8);
-  const vx = r(D[0] + (B[0] - D[0]) * w + 0.5 * Math.sign(dy) + ox);
-  const vy = r(D[1] + (B[1] - D[1]) * w + 0.5 * Math.sign(dx) + oy);
-  return flip ? [-vx, -vy] : [vx, vy];
+  const x = D[0] + (B[0] - D[0]) * w, y = D[1] + (B[1] - D[1]) * w;
+  const vx = r(x + 0.5 * Math.sign(dy) + ox), vy = r(y + 0.5 * Math.sign(dx) + oy);
+  return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
 function squareExtension(width, dx, dy) {
   const len = Math.hypot(dx, dy);
@@ -28220,7 +28220,8 @@ var Outliner = class {
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
     const perpendicular = this.opts.roundCurveJoins && drawDir ? drawDir : [dx, dy];
-    return { dx, dy, L, R, v: flatVector(this.opts.width, perpendicular[0], perpendicular[1]), e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
+    const vectors = perpendicularVectors(this.opts.width, perpendicular[0], perpendicular[1]);
+    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28316,7 +28317,7 @@ var Outliner = class {
       if (this.rr) {
         this.walk(p, s[from], s[to], false, false);
       } else {
-        const A = this.capSide(s, from);
+        const A = from === "R" ? s.vRaw : [-s.vRaw[0], -s.vRaw[1]];
         this.wedge(p, A, [-A[0], -A[1]], true, false);
       }
       this.push(p, this.capSide(s, to));
@@ -28343,6 +28344,8 @@ var Outliner = class {
     const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
     let sa = this.joinSide(a, side);
     let sb = this.joinSide(b, side);
+    const rayA = side === "R" ? a.vRaw : [-a.vRaw[0], -a.vRaw[1]];
+    const rayB = side === "R" ? b.vRaw : [-b.vRaw[0], -b.vRaw[1]];
     if (this.opts.roundCurveJoins && !this.originalRoundJoinSides && a.curveEnd && b.curveEnd) {
       sa = side === "R" ? a.v : [-a.v[0], -a.v[1]];
       sb = side === "R" ? b.v : [-b.v[0], -b.v[1]];
@@ -28363,10 +28366,10 @@ var Outliner = class {
           this.walk(p, Da, Db, false, incl);
         } else {
           const anti = sa[0] === -sb[0] && sa[1] === -sb[1];
-          this.wedge(p, sa, sb, !anti, !anti);
+          this.wedge(p, rayA, rayB, !anti, !anti);
         }
       } else if (join === "miter") {
-        const m = miterPoint(sa, [a.dx, a.dy], sb, [b.dx, b.dy], width, miterLimit);
+        const m = miterPoint(sa, [a.dx, a.dy], sb, [b.dx, b.dy], width, miterLimit, side);
         if (m) {
           this.push(p, m);
         }
@@ -28380,7 +28383,7 @@ var Outliner = class {
       }
       if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
-        this.wedge(p, sb, sa, false, false);
+        this.wedge(p, rayB, rayA, false, false);
         this.push(p, sa);
         this.pts.push([p[0], p[1]]);
       }
@@ -28599,7 +28602,7 @@ function widenPath(path, opts) {
   }
   return out;
 }
-function miterPoint(sa, da, sb, db, width, limit) {
+function miterPoint(sa, da, sb, db, width, limit, side) {
   const den = da[0] * db[1] - da[1] * db[0];
   if (den === 0) {
     return null;
@@ -28609,10 +28612,13 @@ function miterPoint(sa, da, sb, db, width, limit) {
   const t = (wx * db[1] - wy * db[0]) / den;
   const mx = sa[0] + da[0] * t;
   const my = sa[1] + da[1] * t;
-  if (Math.hypot(mx, my) > limit * width / 2) {
+  const x = Math.sign(mx) * Math.floor(Math.abs(mx) + 0.5);
+  const y = Math.sign(my) * Math.floor(Math.abs(my) + 0.5);
+  const pixel = side === "L" ? Math.ceil : Math.floor;
+  if (Math.hypot(pixel(x / 16), pixel(y / 16)) > limit * width / 32) {
     return null;
   }
-  return [Math.floor(mx + 0.5), Math.floor(my + 0.5)];
+  return [x, y];
 }
 
 // src/emf-gdi-raster-shapes.ts

package/dist/browser.mjs

@@ -28139,7 +28139,7 @@ function drawVertices(pen, dx, dy) {
 function halfPixel(v) {
   return Math.sign(v) * 8 * Math.floor((Math.abs(v) + 4) / 8);
 }
-function flatVector(width, dx0, dy0) {
+function perpendicularVectors(width, dx0, dy0) {
   let dx = dx0;
   let dy = dy0;
   const flip = dx < 0 || dx === 0 && dy < 0;
@@ -28173,9 +28173,9 @@ function flatVector(width, dx0, dy0) {
   const ox = off ? sgn * off[0] : 0;
   const oy = off ? sgn * off[1] : 0;
   const r = (v) => 8 * Math.floor((v + 4) / 8);
-  const vx = r(D[0] + (B[0] - D[0]) * w + 0.5 * Math.sign(dy) + ox);
-  const vy = r(D[1] + (B[1] - D[1]) * w + 0.5 * Math.sign(dx) + oy);
-  return flip ? [-vx, -vy] : [vx, vy];
+  const x = D[0] + (B[0] - D[0]) * w, y = D[1] + (B[1] - D[1]) * w;
+  const vx = r(x + 0.5 * Math.sign(dy) + ox), vy = r(y + 0.5 * Math.sign(dx) + oy);
+  return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
 function squareExtension(width, dx, dy) {
   const len = Math.hypot(dx, dy);
@@ -28218,7 +28218,8 @@ var Outliner = class {
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
     const perpendicular = this.opts.roundCurveJoins && drawDir ? drawDir : [dx, dy];
-    return { dx, dy, L, R, v: flatVector(this.opts.width, perpendicular[0], perpendicular[1]), e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
+    const vectors = perpendicularVectors(this.opts.width, perpendicular[0], perpendicular[1]);
+    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28314,7 +28315,7 @@ var Outliner = class {
       if (this.rr) {
         this.walk(p, s[from], s[to], false, false);
       } else {
-        const A = this.capSide(s, from);
+        const A = from === "R" ? s.vRaw : [-s.vRaw[0], -s.vRaw[1]];
         this.wedge(p, A, [-A[0], -A[1]], true, false);
       }
       this.push(p, this.capSide(s, to));
@@ -28341,6 +28342,8 @@ var Outliner = class {
     const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
     let sa = this.joinSide(a, side);
     let sb = this.joinSide(b, side);
+    const rayA = side === "R" ? a.vRaw : [-a.vRaw[0], -a.vRaw[1]];
+    const rayB = side === "R" ? b.vRaw : [-b.vRaw[0], -b.vRaw[1]];
     if (this.opts.roundCurveJoins && !this.originalRoundJoinSides && a.curveEnd && b.curveEnd) {
       sa = side === "R" ? a.v : [-a.v[0], -a.v[1]];
       sb = side === "R" ? b.v : [-b.v[0], -b.v[1]];
@@ -28361,10 +28364,10 @@ var Outliner = class {
           this.walk(p, Da, Db, false, incl);
         } else {
           const anti = sa[0] === -sb[0] && sa[1] === -sb[1];
-          this.wedge(p, sa, sb, !anti, !anti);
+          this.wedge(p, rayA, rayB, !anti, !anti);
         }
       } else if (join === "miter") {
-        const m = miterPoint(sa, [a.dx, a.dy], sb, [b.dx, b.dy], width, miterLimit);
+        const m = miterPoint(sa, [a.dx, a.dy], sb, [b.dx, b.dy], width, miterLimit, side);
         if (m) {
           this.push(p, m);
         }
@@ -28378,7 +28381,7 @@ var Outliner = class {
       }
       if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
-        this.wedge(p, sb, sa, false, false);
+        this.wedge(p, rayB, rayA, false, false);
         this.push(p, sa);
         this.pts.push([p[0], p[1]]);
       }
@@ -28597,7 +28600,7 @@ function widenPath(path, opts) {
   }
   return out;
 }
-function miterPoint(sa, da, sb, db, width, limit) {
+function miterPoint(sa, da, sb, db, width, limit, side) {
   const den = da[0] * db[1] - da[1] * db[0];
   if (den === 0) {
     return null;
@@ -28607,10 +28610,13 @@ function miterPoint(sa, da, sb, db, width, limit) {
   const t = (wx * db[1] - wy * db[0]) / den;
   const mx = sa[0] + da[0] * t;
   const my = sa[1] + da[1] * t;
-  if (Math.hypot(mx, my) > limit * width / 2) {
+  const x = Math.sign(mx) * Math.floor(Math.abs(mx) + 0.5);
+  const y = Math.sign(my) * Math.floor(Math.abs(my) + 0.5);
+  const pixel = side === "L" ? Math.ceil : Math.floor;
+  if (Math.hypot(pixel(x / 16), pixel(y / 16)) > limit * width / 32) {
     return null;
   }
-  return [Math.floor(mx + 0.5), Math.floor(my + 0.5)];
+  return [x, y];
 }
 
 // src/emf-gdi-raster-shapes.ts

package/dist/index.js

@@ -28142,7 +28142,7 @@ function drawVertices(pen, dx, dy) {
 function halfPixel(v) {
   return Math.sign(v) * 8 * Math.floor((Math.abs(v) + 4) / 8);
 }
-function flatVector(width, dx0, dy0) {
+function perpendicularVectors(width, dx0, dy0) {
   let dx = dx0;
   let dy = dy0;
   const flip = dx < 0 || dx === 0 && dy < 0;
@@ -28176,9 +28176,9 @@ function flatVector(width, dx0, dy0) {
   const ox = off ? sgn * off[0] : 0;
   const oy = off ? sgn * off[1] : 0;
   const r = (v) => 8 * Math.floor((v + 4) / 8);
-  const vx = r(D[0] + (B[0] - D[0]) * w + 0.5 * Math.sign(dy) + ox);
-  const vy = r(D[1] + (B[1] - D[1]) * w + 0.5 * Math.sign(dx) + oy);
-  return flip ? [-vx, -vy] : [vx, vy];
+  const x = D[0] + (B[0] - D[0]) * w, y = D[1] + (B[1] - D[1]) * w;
+  const vx = r(x + 0.5 * Math.sign(dy) + ox), vy = r(y + 0.5 * Math.sign(dx) + oy);
+  return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
 function squareExtension(width, dx, dy) {
   const len = Math.hypot(dx, dy);
@@ -28221,7 +28221,8 @@ var Outliner = class {
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
     const perpendicular = this.opts.roundCurveJoins && drawDir ? drawDir : [dx, dy];
-    return { dx, dy, L, R, v: flatVector(this.opts.width, perpendicular[0], perpendicular[1]), e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
+    const vectors = perpendicularVectors(this.opts.width, perpendicular[0], perpendicular[1]);
+    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28317,7 +28318,7 @@ var Outliner = class {
       if (this.rr) {
         this.walk(p, s[from], s[to], false, false);
       } else {
-        const A = this.capSide(s, from);
+        const A = from === "R" ? s.vRaw : [-s.vRaw[0], -s.vRaw[1]];
         this.wedge(p, A, [-A[0], -A[1]], true, false);
       }
       this.push(p, this.capSide(s, to));
@@ -28344,6 +28345,8 @@ var Outliner = class {
     const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
     let sa = this.joinSide(a, side);
     let sb = this.joinSide(b, side);
+    const rayA = side === "R" ? a.vRaw : [-a.vRaw[0], -a.vRaw[1]];
+    const rayB = side === "R" ? b.vRaw : [-b.vRaw[0], -b.vRaw[1]];
     if (this.opts.roundCurveJoins && !this.originalRoundJoinSides && a.curveEnd && b.curveEnd) {
       sa = side === "R" ? a.v : [-a.v[0], -a.v[1]];
       sb = side === "R" ? b.v : [-b.v[0], -b.v[1]];
@@ -28364,10 +28367,10 @@ var Outliner = class {
           this.walk(p, Da, Db, false, incl);
         } else {
           const anti = sa[0] === -sb[0] && sa[1] === -sb[1];
-          this.wedge(p, sa, sb, !anti, !anti);
+          this.wedge(p, rayA, rayB, !anti, !anti);
         }
       } else if (join === "miter") {
-        const m = miterPoint(sa, [a.dx, a.dy], sb, [b.dx, b.dy], width, miterLimit);
+        const m = miterPoint(sa, [a.dx, a.dy], sb, [b.dx, b.dy], width, miterLimit, side);
         if (m) {
           this.push(p, m);
         }
@@ -28381,7 +28384,7 @@ var Outliner = class {
       }
       if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
-        this.wedge(p, sb, sa, false, false);
+        this.wedge(p, rayB, rayA, false, false);
         this.push(p, sa);
         this.pts.push([p[0], p[1]]);
       }
@@ -28600,7 +28603,7 @@ function widenPath(path, opts) {
   }
   return out;
 }
-function miterPoint(sa, da, sb, db, width, limit) {
+function miterPoint(sa, da, sb, db, width, limit, side) {
   const den = da[0] * db[1] - da[1] * db[0];
   if (den === 0) {
     return null;
@@ -28610,10 +28613,13 @@ function miterPoint(sa, da, sb, db, width, limit) {
   const t = (wx * db[1] - wy * db[0]) / den;
   const mx = sa[0] + da[0] * t;
   const my = sa[1] + da[1] * t;
-  if (Math.hypot(mx, my) > limit * width / 2) {
+  const x = Math.sign(mx) * Math.floor(Math.abs(mx) + 0.5);
+  const y = Math.sign(my) * Math.floor(Math.abs(my) + 0.5);
+  const pixel = side === "L" ? Math.ceil : Math.floor;
+  if (Math.hypot(pixel(x / 16), pixel(y / 16)) > limit * width / 32) {
     return null;
   }
-  return [Math.floor(mx + 0.5), Math.floor(my + 0.5)];
+  return [x, y];
 }
 
 // src/emf-gdi-raster-shapes.ts

package/dist/index.mjs

@@ -28140,7 +28140,7 @@ function drawVertices(pen, dx, dy) {
 function halfPixel(v) {
   return Math.sign(v) * 8 * Math.floor((Math.abs(v) + 4) / 8);
 }
-function flatVector(width, dx0, dy0) {
+function perpendicularVectors(width, dx0, dy0) {
   let dx = dx0;
   let dy = dy0;
   const flip = dx < 0 || dx === 0 && dy < 0;
@@ -28174,9 +28174,9 @@ function flatVector(width, dx0, dy0) {
   const ox = off ? sgn * off[0] : 0;
   const oy = off ? sgn * off[1] : 0;
   const r = (v) => 8 * Math.floor((v + 4) / 8);
-  const vx = r(D[0] + (B[0] - D[0]) * w + 0.5 * Math.sign(dy) + ox);
-  const vy = r(D[1] + (B[1] - D[1]) * w + 0.5 * Math.sign(dx) + oy);
-  return flip ? [-vx, -vy] : [vx, vy];
+  const x = D[0] + (B[0] - D[0]) * w, y = D[1] + (B[1] - D[1]) * w;
+  const vx = r(x + 0.5 * Math.sign(dy) + ox), vy = r(y + 0.5 * Math.sign(dx) + oy);
+  return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
 function squareExtension(width, dx, dy) {
   const len = Math.hypot(dx, dy);
@@ -28219,7 +28219,8 @@ var Outliner = class {
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
     const perpendicular = this.opts.roundCurveJoins && drawDir ? drawDir : [dx, dy];
-    return { dx, dy, L, R, v: flatVector(this.opts.width, perpendicular[0], perpendicular[1]), e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
+    const vectors = perpendicularVectors(this.opts.width, perpendicular[0], perpendicular[1]);
+    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, dx, dy), curveEnd: !!drawDir };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28315,7 +28316,7 @@ var Outliner = class {
       if (this.rr) {
         this.walk(p, s[from], s[to], false, false);
       } else {
-        const A = this.capSide(s, from);
+        const A = from === "R" ? s.vRaw : [-s.vRaw[0], -s.vRaw[1]];
         this.wedge(p, A, [-A[0], -A[1]], true, false);
       }
       this.push(p, this.capSide(s, to));
@@ -28342,6 +28343,8 @@ var Outliner = class {
     const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
     let sa = this.joinSide(a, side);
     let sb = this.joinSide(b, side);
+    const rayA = side === "R" ? a.vRaw : [-a.vRaw[0], -a.vRaw[1]];
+    const rayB = side === "R" ? b.vRaw : [-b.vRaw[0], -b.vRaw[1]];
     if (this.opts.roundCurveJoins && !this.originalRoundJoinSides && a.curveEnd && b.curveEnd) {
       sa = side === "R" ? a.v : [-a.v[0], -a.v[1]];
       sb = side === "R" ? b.v : [-b.v[0], -b.v[1]];
@@ -28362,10 +28365,10 @@ var Outliner = class {
           this.walk(p, Da, Db, false, incl);
         } else {
           const anti = sa[0] === -sb[0] && sa[1] === -sb[1];
-          this.wedge(p, sa, sb, !anti, !anti);
+          this.wedge(p, rayA, rayB, !anti, !anti);
         }
       } else if (join === "miter") {
-        const m = miterPoint(sa, [a.dx, a.dy], sb, [b.dx, b.dy], width, miterLimit);
+        const m = miterPoint(sa, [a.dx, a.dy], sb, [b.dx, b.dy], width, miterLimit, side);
         if (m) {
           this.push(p, m);
         }
@@ -28379,7 +28382,7 @@ var Outliner = class {
       }
       if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
-        this.wedge(p, sb, sa, false, false);
+        this.wedge(p, rayB, rayA, false, false);
         this.push(p, sa);
         this.pts.push([p[0], p[1]]);
       }
@@ -28598,7 +28601,7 @@ function widenPath(path, opts) {
   }
   return out;
 }
-function miterPoint(sa, da, sb, db, width, limit) {
+function miterPoint(sa, da, sb, db, width, limit, side) {
   const den = da[0] * db[1] - da[1] * db[0];
   if (den === 0) {
     return null;
@@ -28608,10 +28611,13 @@ function miterPoint(sa, da, sb, db, width, limit) {
   const t = (wx * db[1] - wy * db[0]) / den;
   const mx = sa[0] + da[0] * t;
   const my = sa[1] + da[1] * t;
-  if (Math.hypot(mx, my) > limit * width / 2) {
+  const x = Math.sign(mx) * Math.floor(Math.abs(mx) + 0.5);
+  const y = Math.sign(my) * Math.floor(Math.abs(my) + 0.5);
+  const pixel = side === "L" ? Math.ceil : Math.floor;
+  if (Math.hypot(pixel(x / 16), pixel(y / 16)) > limit * width / 32) {
     return null;
   }
-  return [Math.floor(mx + 0.5), Math.floor(my + 0.5)];
+  return [x, y];
 }
 
 // src/emf-gdi-raster-shapes.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "emf-converter",
-	"version": "4.4.13",
+	"version": "4.4.14",
 	"description": "Convert EMF/WMF metafile binaries to PNG data URLs or SVG (markup, data URL, React/JSX)",
 	"keywords": [
 		"canvas",