npm - emf-converter - Versions diffs - 4.4.6 → 4.4.7 - Mend

emf-converter 4.4.6 → 4.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/browser.js CHANGED Viewed

@@ -11333,7 +11333,7 @@ var GdiRasterPath = class {
   /** Appends every figure of `other`. */
   append(other) {
     for (const f of other.figures) {
-      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
+      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents), roundWiden: f.roundWiden });
     }
     for (let i = 0; i < other.getPath.types.length; i++) {
       this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
@@ -28073,7 +28073,8 @@ var Outliner = class {
     this.pen = penPolygon(opts.width);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
-    this.roundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.roundJoinSides = !!opts.roundCurveJoins || this.originalRoundJoinSides;
     this.maxX = Math.max(...this.pen.map((q) => Math.abs(q[0])));
   }
   /**
@@ -28086,7 +28087,8 @@ var Outliner = class {
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
-    return { dx, dy, L, R, v: flatVector(this.opts.width, dx, dy), e: squareExtension(this.opts.width, dx, dy) };
+    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 };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28205,12 +28207,17 @@ var Outliner = class {
    * segment).
    */
   join(p, a, b, side, outer) {
-    const { join, cap, width, miterLimit } = this.opts;
-    const sa = this.joinSide(a, side);
-    const sb = this.joinSide(b, side);
+    const { cap, width, miterLimit } = this.opts;
+    const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
+    let sa = this.joinSide(a, side);
+    let sb = this.joinSide(b, side);
+    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]];
+    }
     const Da = side === "R" ? a.R : a.L;
     const Db = side === "R" ? b.R : b.L;
-    if (this.roundJoinSides && Da === Db) {
+    if (this.roundJoinSides && (Da === Db || this.opts.roundCurveJoins && sa[0] === sb[0] && sa[1] === sb[1])) {
       this.push(p, sa);
       return;
     }
@@ -28234,7 +28241,12 @@ var Outliner = class {
       }
     } else {
       this.pts.push([p[0], p[1]]);
-      if (join === "round" && cap === "flat") {
+      if (this.opts.roundCurveJoins && !this.originalRoundJoinSides) {
+        this.push(p, sb);
+        this.push(p, sa);
+        this.pts.push([p[0], p[1]]);
+      }
+      if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
         this.wedge(p, sb, sa, false, false);
         this.push(p, sa);
@@ -28404,9 +28416,9 @@ function dashPieces(P, tangents, pattern, shorten) {
 }
 function widenPath(path, opts) {
   const out = [];
-  const outliner = new Outliner(opts, out);
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
+    const outliner = new Outliner(fig.roundWiden ? { ...opts, roundCurveJoins: true } : opts, out);
     let P = [];
     const dirs = [];
     for (let i = 0; i + 1 < fig.pts.length; i += 2) {
@@ -28518,6 +28530,7 @@ function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
   path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
+  path.figures[0].roundWiden = true;
   return path;
 }
 function frameMapper(box, l, t, w, h) {
@@ -28637,7 +28650,7 @@ function penWidenOptions(rCtx, opts = {}) {
   const { state } = rCtx;
   const flags = state.penFlags ?? state.penStyle;
   const matrix = gdiDeviceMatrix(rCtx);
-  const widthPx = opts.rectangle && rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
+  const widthPx = rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const dashes = state.penExtended ? geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
@@ -33507,6 +33520,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37534,19 +37548,12 @@ function compatBox(p, l, t, r, b, opts = {}) {
     if (w > 1) {
       const matrix = gdiDeviceMatrix(p.rCtx);
       const rawWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) / p.kx;
-      if (!opts.curved) {
-        box.x1 += Math.round(ux);
-        box.y1 += Math.round(uy);
-        box.x0 += Math.round(rawWidth * ux / 2);
-        box.y0 += Math.round(rawWidth * uy / 2);
-        box.x1 -= Math.round(rawWidth * ux / 2);
-        box.y1 -= Math.round(rawWidth * uy / 2);
-        return box;
-      }
-      box.x0 += Math.round(Math.floor(w / 2) * ux);
-      box.y0 += Math.round(Math.floor(w / 2) * uy);
-      box.x1 -= Math.round(Math.floor((w - 1) / 2) * ux);
-      box.y1 -= Math.round(Math.floor((w - 1) / 2) * uy);
+      box.x1 += Math.round(ux);
+      box.y1 += Math.round(uy);
+      box.x0 += Math.round(rawWidth * ux / 2);
+      box.y0 += Math.round(rawWidth * uy / 2);
+      box.x1 -= Math.round(rawWidth * ux / 2);
+      box.y1 -= Math.round(rawWidth * uy / 2);
     }
   }
   return box;
@@ -37610,6 +37617,11 @@ function compatCorner(p, w, h, box) {
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
+    const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+  }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
     return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];

package/dist/browser.mjs CHANGED Viewed

@@ -11331,7 +11331,7 @@ var GdiRasterPath = class {
   /** Appends every figure of `other`. */
   append(other) {
     for (const f of other.figures) {
-      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
+      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents), roundWiden: f.roundWiden });
     }
     for (let i = 0; i < other.getPath.types.length; i++) {
       this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
@@ -28071,7 +28071,8 @@ var Outliner = class {
     this.pen = penPolygon(opts.width);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
-    this.roundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.roundJoinSides = !!opts.roundCurveJoins || this.originalRoundJoinSides;
     this.maxX = Math.max(...this.pen.map((q) => Math.abs(q[0])));
   }
   /**
@@ -28084,7 +28085,8 @@ var Outliner = class {
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
-    return { dx, dy, L, R, v: flatVector(this.opts.width, dx, dy), e: squareExtension(this.opts.width, dx, dy) };
+    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 };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28203,12 +28205,17 @@ var Outliner = class {
    * segment).
    */
   join(p, a, b, side, outer) {
-    const { join, cap, width, miterLimit } = this.opts;
-    const sa = this.joinSide(a, side);
-    const sb = this.joinSide(b, side);
+    const { cap, width, miterLimit } = this.opts;
+    const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
+    let sa = this.joinSide(a, side);
+    let sb = this.joinSide(b, side);
+    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]];
+    }
     const Da = side === "R" ? a.R : a.L;
     const Db = side === "R" ? b.R : b.L;
-    if (this.roundJoinSides && Da === Db) {
+    if (this.roundJoinSides && (Da === Db || this.opts.roundCurveJoins && sa[0] === sb[0] && sa[1] === sb[1])) {
       this.push(p, sa);
       return;
     }
@@ -28232,7 +28239,12 @@ var Outliner = class {
       }
     } else {
       this.pts.push([p[0], p[1]]);
-      if (join === "round" && cap === "flat") {
+      if (this.opts.roundCurveJoins && !this.originalRoundJoinSides) {
+        this.push(p, sb);
+        this.push(p, sa);
+        this.pts.push([p[0], p[1]]);
+      }
+      if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
         this.wedge(p, sb, sa, false, false);
         this.push(p, sa);
@@ -28402,9 +28414,9 @@ function dashPieces(P, tangents, pattern, shorten) {
 }
 function widenPath(path, opts) {
   const out = [];
-  const outliner = new Outliner(opts, out);
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
+    const outliner = new Outliner(fig.roundWiden ? { ...opts, roundCurveJoins: true } : opts, out);
     let P = [];
     const dirs = [];
     for (let i = 0; i + 1 < fig.pts.length; i += 2) {
@@ -28516,6 +28528,7 @@ function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
   path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
+  path.figures[0].roundWiden = true;
   return path;
 }
 function frameMapper(box, l, t, w, h) {
@@ -28635,7 +28648,7 @@ function penWidenOptions(rCtx, opts = {}) {
   const { state } = rCtx;
   const flags = state.penFlags ?? state.penStyle;
   const matrix = gdiDeviceMatrix(rCtx);
-  const widthPx = opts.rectangle && rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
+  const widthPx = rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const dashes = state.penExtended ? geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
@@ -33505,6 +33518,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37532,19 +37546,12 @@ function compatBox(p, l, t, r, b, opts = {}) {
     if (w > 1) {
       const matrix = gdiDeviceMatrix(p.rCtx);
       const rawWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) / p.kx;
-      if (!opts.curved) {
-        box.x1 += Math.round(ux);
-        box.y1 += Math.round(uy);
-        box.x0 += Math.round(rawWidth * ux / 2);
-        box.y0 += Math.round(rawWidth * uy / 2);
-        box.x1 -= Math.round(rawWidth * ux / 2);
-        box.y1 -= Math.round(rawWidth * uy / 2);
-        return box;
-      }
-      box.x0 += Math.round(Math.floor(w / 2) * ux);
-      box.y0 += Math.round(Math.floor(w / 2) * uy);
-      box.x1 -= Math.round(Math.floor((w - 1) / 2) * ux);
-      box.y1 -= Math.round(Math.floor((w - 1) / 2) * uy);
+      box.x1 += Math.round(ux);
+      box.y1 += Math.round(uy);
+      box.x0 += Math.round(rawWidth * ux / 2);
+      box.y0 += Math.round(rawWidth * uy / 2);
+      box.x1 -= Math.round(rawWidth * ux / 2);
+      box.y1 -= Math.round(rawWidth * uy / 2);
     }
   }
   return box;
@@ -37608,6 +37615,11 @@ function compatCorner(p, w, h, box) {
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
+    const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+  }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
     return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];

package/dist/index.js CHANGED Viewed

@@ -11334,7 +11334,7 @@ var GdiRasterPath = class {
   /** Appends every figure of `other`. */
   append(other) {
     for (const f of other.figures) {
-      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
+      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents), roundWiden: f.roundWiden });
     }
     for (let i = 0; i < other.getPath.types.length; i++) {
       this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
@@ -28074,7 +28074,8 @@ var Outliner = class {
     this.pen = penPolygon(opts.width);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
-    this.roundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.roundJoinSides = !!opts.roundCurveJoins || this.originalRoundJoinSides;
     this.maxX = Math.max(...this.pen.map((q) => Math.abs(q[0])));
   }
   /**
@@ -28087,7 +28088,8 @@ var Outliner = class {
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
-    return { dx, dy, L, R, v: flatVector(this.opts.width, dx, dy), e: squareExtension(this.opts.width, dx, dy) };
+    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 };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28206,12 +28208,17 @@ var Outliner = class {
    * segment).
    */
   join(p, a, b, side, outer) {
-    const { join, cap, width, miterLimit } = this.opts;
-    const sa = this.joinSide(a, side);
-    const sb = this.joinSide(b, side);
+    const { cap, width, miterLimit } = this.opts;
+    const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
+    let sa = this.joinSide(a, side);
+    let sb = this.joinSide(b, side);
+    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]];
+    }
     const Da = side === "R" ? a.R : a.L;
     const Db = side === "R" ? b.R : b.L;
-    if (this.roundJoinSides && Da === Db) {
+    if (this.roundJoinSides && (Da === Db || this.opts.roundCurveJoins && sa[0] === sb[0] && sa[1] === sb[1])) {
       this.push(p, sa);
       return;
     }
@@ -28235,7 +28242,12 @@ var Outliner = class {
       }
     } else {
       this.pts.push([p[0], p[1]]);
-      if (join === "round" && cap === "flat") {
+      if (this.opts.roundCurveJoins && !this.originalRoundJoinSides) {
+        this.push(p, sb);
+        this.push(p, sa);
+        this.pts.push([p[0], p[1]]);
+      }
+      if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
         this.wedge(p, sb, sa, false, false);
         this.push(p, sa);
@@ -28405,9 +28417,9 @@ function dashPieces(P, tangents, pattern, shorten) {
 }
 function widenPath(path, opts) {
   const out = [];
-  const outliner = new Outliner(opts, out);
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
+    const outliner = new Outliner(fig.roundWiden ? { ...opts, roundCurveJoins: true } : opts, out);
     let P = [];
     const dirs = [];
     for (let i = 0; i + 1 < fig.pts.length; i += 2) {
@@ -28519,6 +28531,7 @@ function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
   path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
+  path.figures[0].roundWiden = true;
   return path;
 }
 function frameMapper(box, l, t, w, h) {
@@ -28638,7 +28651,7 @@ function penWidenOptions(rCtx, opts = {}) {
   const { state } = rCtx;
   const flags = state.penFlags ?? state.penStyle;
   const matrix = gdiDeviceMatrix(rCtx);
-  const widthPx = opts.rectangle && rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
+  const widthPx = rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const dashes = state.penExtended ? geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
@@ -33508,6 +33521,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37535,19 +37549,12 @@ function compatBox(p, l, t, r, b, opts = {}) {
     if (w > 1) {
       const matrix = gdiDeviceMatrix(p.rCtx);
       const rawWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) / p.kx;
-      if (!opts.curved) {
-        box.x1 += Math.round(ux);
-        box.y1 += Math.round(uy);
-        box.x0 += Math.round(rawWidth * ux / 2);
-        box.y0 += Math.round(rawWidth * uy / 2);
-        box.x1 -= Math.round(rawWidth * ux / 2);
-        box.y1 -= Math.round(rawWidth * uy / 2);
-        return box;
-      }
-      box.x0 += Math.round(Math.floor(w / 2) * ux);
-      box.y0 += Math.round(Math.floor(w / 2) * uy);
-      box.x1 -= Math.round(Math.floor((w - 1) / 2) * ux);
-      box.y1 -= Math.round(Math.floor((w - 1) / 2) * uy);
+      box.x1 += Math.round(ux);
+      box.y1 += Math.round(uy);
+      box.x0 += Math.round(rawWidth * ux / 2);
+      box.y0 += Math.round(rawWidth * uy / 2);
+      box.x1 -= Math.round(rawWidth * ux / 2);
+      box.y1 -= Math.round(rawWidth * uy / 2);
     }
   }
   return box;
@@ -37611,6 +37618,11 @@ function compatCorner(p, w, h, box) {
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
+    const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+  }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
     return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];

package/dist/index.mjs CHANGED Viewed

@@ -11332,7 +11332,7 @@ var GdiRasterPath = class {
   /** Appends every figure of `other`. */
   append(other) {
     for (const f of other.figures) {
-      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
+      this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents), roundWiden: f.roundWiden });
     }
     for (let i = 0; i < other.getPath.types.length; i++) {
       this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
@@ -28072,7 +28072,8 @@ var Outliner = class {
     this.pen = penPolygon(opts.width);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
-    this.roundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
+    this.roundJoinSides = !!opts.roundCurveJoins || this.originalRoundJoinSides;
     this.maxX = Math.max(...this.pen.map((q) => Math.abs(q[0])));
   }
   /**
@@ -28085,7 +28086,8 @@ var Outliner = class {
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
     const [L, R] = drawVertices(this.pen, d[0], d[1]);
-    return { dx, dy, L, R, v: flatVector(this.opts.width, dx, dy), e: squareExtension(this.opts.width, dx, dy) };
+    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 };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -28204,12 +28206,17 @@ var Outliner = class {
    * segment).
    */
   join(p, a, b, side, outer) {
-    const { join, cap, width, miterLimit } = this.opts;
-    const sa = this.joinSide(a, side);
-    const sb = this.joinSide(b, side);
+    const { cap, width, miterLimit } = this.opts;
+    const join = this.opts.roundCurveJoins ? "round" : this.opts.join;
+    let sa = this.joinSide(a, side);
+    let sb = this.joinSide(b, side);
+    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]];
+    }
     const Da = side === "R" ? a.R : a.L;
     const Db = side === "R" ? b.R : b.L;
-    if (this.roundJoinSides && Da === Db) {
+    if (this.roundJoinSides && (Da === Db || this.opts.roundCurveJoins && sa[0] === sb[0] && sa[1] === sb[1])) {
       this.push(p, sa);
       return;
     }
@@ -28233,7 +28240,12 @@ var Outliner = class {
       }
     } else {
       this.pts.push([p[0], p[1]]);
-      if (join === "round" && cap === "flat") {
+      if (this.opts.roundCurveJoins && !this.originalRoundJoinSides) {
+        this.push(p, sb);
+        this.push(p, sa);
+        this.pts.push([p[0], p[1]]);
+      }
+      if (join === "round" && cap === "flat" && !this.opts.roundCurveJoins) {
         this.push(p, sb);
         this.wedge(p, sb, sa, false, false);
         this.push(p, sa);
@@ -28403,9 +28415,9 @@ function dashPieces(P, tangents, pattern, shorten) {
 }
 function widenPath(path, opts) {
   const out = [];
-  const outliner = new Outliner(opts, out);
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
+    const outliner = new Outliner(fig.roundWiden ? { ...opts, roundCurveJoins: true } : opts, out);
     let P = [];
     const dirs = [];
     for (let i = 0; i + 1 < fig.pts.length; i += 2) {
@@ -28517,6 +28529,7 @@ function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
   path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
+  path.figures[0].roundWiden = true;
   return path;
 }
 function frameMapper(box, l, t, w, h) {
@@ -28636,7 +28649,7 @@ function penWidenOptions(rCtx, opts = {}) {
   const { state } = rCtx;
   const flags = state.penFlags ?? state.penStyle;
   const matrix = gdiDeviceMatrix(rCtx);
-  const widthPx = opts.rectangle && rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
+  const widthPx = rCtx.wholeDevicePixels && (flags & 15) === 6 ? state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) : penDeviceWidth(rCtx);
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const dashes = state.penExtended ? geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
@@ -33506,6 +33519,7 @@ function flattenBracketPath(rCtx) {
   }
   for (const f of rCtx.rasterPath.figures) {
     delete f.tangents;
+    delete f.roundWiden;
   }
   syncPathCmds(rCtx);
 }
@@ -37533,19 +37547,12 @@ function compatBox(p, l, t, r, b, opts = {}) {
     if (w > 1) {
       const matrix = gdiDeviceMatrix(p.rCtx);
       const rawWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(matrix[0] * matrix[3] - matrix[1] * matrix[2])) / p.kx;
-      if (!opts.curved) {
-        box.x1 += Math.round(ux);
-        box.y1 += Math.round(uy);
-        box.x0 += Math.round(rawWidth * ux / 2);
-        box.y0 += Math.round(rawWidth * uy / 2);
-        box.x1 -= Math.round(rawWidth * ux / 2);
-        box.y1 -= Math.round(rawWidth * uy / 2);
-        return box;
-      }
-      box.x0 += Math.round(Math.floor(w / 2) * ux);
-      box.y0 += Math.round(Math.floor(w / 2) * uy);
-      box.x1 -= Math.round(Math.floor((w - 1) / 2) * ux);
-      box.y1 -= Math.round(Math.floor((w - 1) / 2) * uy);
+      box.x1 += Math.round(ux);
+      box.y1 += Math.round(uy);
+      box.x0 += Math.round(rawWidth * ux / 2);
+      box.y0 += Math.round(rawWidth * uy / 2);
+      box.x1 -= Math.round(rawWidth * ux / 2);
+      box.y1 -= Math.round(rawWidth * uy / 2);
     }
   }
   return box;
@@ -37609,6 +37616,11 @@ function compatCorner(p, w, h, box) {
   const ch = Math.round(Math.abs(h * m[3]) * 16);
   const ux = 16 * p.kx;
   const uy = 16 * p.ky;
+  if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
+    const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
+    const width = box.x1 - box.x0, height = box.y1 - box.y0;
+    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+  }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
     return [Math.min(cw, width + ux) * width / (width + ux), Math.min(ch, height + uy) * height / (height + uy)];

package/package.json CHANGED Viewed

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