emf-converter 4.13.0 → 4.14.0

package/dist/browser.js

@@ -29941,23 +29941,35 @@ function perpendicularVectors(width, dx0, dy0, height = width, matrixPen) {
   const vx = rounded[0], vy = rounded[1];
   return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
-function squareExtension(width, dx, dy, scale = 1, height = width, matrix, wholePixelNorm = false, symmetric = wholePixelNorm) {
+function norm(x, y) {
+  return Math.sqrt(x * x + y * y);
+}
+function squareExtension(width, dx, dy, scale = 1, height = width, matrix, wholePixelNorm = false, symmetric = wholePixelNorm, logicalScale = 1) {
+  const slack = 8;
   if (matrix) {
     const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
     const lx = (matrix[3] * dx - matrix[2] * dy) / det;
     const ly = (-matrix[1] * dx + matrix[0] * dy) / det;
-    const l = Math.hypot(lx, ly);
+    let l = Math.hypot(lx, ly);
+    if (wholePixelNorm) {
+      l = norm(Math.floor((lx + slack) / 16) * 16, Math.floor((ly + slack) / 16) * 16);
+      if (l === 0) return [0, 0];
+    }
     const q = width / 2 * scale / l;
     return [Math.floor((matrix[0] * lx + matrix[2] * ly) * q + 0.5), Math.floor((matrix[1] * lx + matrix[3] * ly) * q + 0.5)];
   }
-  let len = width === height ? Math.hypot(dx, dy) : Math.hypot(dx, dy * width / height);
-  if (wholePixelNorm && width === height) {
-    const whole = Math.hypot(Math.floor(dx / 16), Math.floor(dy / 16)) * 16;
-    if (whole === 0) return [0, 0];
-    len = whole;
-  }
+  const [ax, ay] = typeof logicalScale === "number" ? [logicalScale, logicalScale] : logicalScale;
   const r = width / 2 * scale;
   const round = symmetric ? (v) => Math.sign(v) * Math.floor(Math.abs(v) + 0.5) : (v) => Math.floor(v + 0.5);
+  if (wholePixelNorm && (width === height || ax !== ay)) {
+    const lx = dx / ax;
+    const ly = dy / ay;
+    const cut = ax === 1 && ay === 1 ? 0 : slack;
+    const whole = norm(Math.floor((lx + cut) / 16) * 16, Math.floor((ly + cut) / 16) * 16);
+    if (whole === 0) return [0, 0];
+    return [round(lx / whole * r), round(ly * ay / ax / whole * r)];
+  }
+  const len = width === height ? norm(dx, dy) : norm(dx, dy * width / height);
   return [round(dx / len * r), round(dy / len * r)];
 }
 function turnSign(ax, ay, bx, by) {
@@ -29997,7 +30009,7 @@ var Outliner = class {
     const [L, R] = drawVertices(this.pen, d[0], d[1], this.opts.width, this.opts.height, nibMatrix);
     const perpendicular = curve && drawDir ? drawDir : [dx, dy];
     const vectors = perpendicularVectors(this.opts.width, perpendicular[0], perpendicular[1], this.opts.height, nibMatrix ? this.pen : void 0);
-    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height, nibMatrix, !!this.opts.wholePixelDashVectors), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, role: drawDir?.[2] ?? 3, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
+    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.capWidth ?? this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height ?? this.opts.capWidth, nibMatrix, !!(this.opts.wholePixelDashVectors || this.opts.cutToLogicalUnits), void 0, this.opts.logicalScale), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, role: drawDir?.[2] ?? 3, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -30315,8 +30327,8 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
     const [x1, y1] = P[i + 1];
     const dir = [x1 - x0, y1 - y0];
     const det = matrix ? matrix[0] * matrix[3] - matrix[1] * matrix[2] : 1;
-    const real = matrix ? Math.hypot((matrix[3] * dir[0] - matrix[2] * dir[1]) / det, (-matrix[1] * dir[0] + matrix[0] * dir[1]) / det) : metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : Math.hypot(dir[0], dir[1]);
-    const len = metric || matrix ? real : wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    const real = matrix ? Math.hypot((matrix[3] * dir[0] - matrix[2] * dir[1]) / det, (-matrix[1] * dir[0] + matrix[0] * dir[1]) / det) : metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : norm(dir[0], dir[1]);
+    const len = metric || matrix ? real : wholePixelVectors ? norm(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : norm(dir[0], dir[1]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -30424,26 +30436,16 @@ function widenPath(path, opts) {
       const runTangents = closed ? [...dirs, void 0] : dirs;
       const runCurves = closed ? [...curves, !!fig.roundWiden] : curves;
       for (const piece of dashPieces(run, runTangents, runCurves, opts.dashes, shorten, !!opts.wholePixelDashVectors, opts.dashMetric, opts.deviceNib ? opts.matrix : void 0)) {
-        const pts = [piece.pts[0]];
-        const pdirs = [];
-        const pdraws = [];
-        const pcurves = [];
-        for (let i = 1; i < piece.pts.length; i++) {
-          const q = piece.pts[i];
-          const last = pts[pts.length - 1];
-          if (q[0] !== last[0] || q[1] !== last[1]) {
-            pts.push(q);
-            pdirs.push(piece.dirs[i - 1]);
-            pdraws.push(piece.draws[i - 1]);
-            pcurves.push(piece.curves[i - 1]);
-          }
-        }
+        const pts = piece.pts;
+        const pdirs = piece.dirs;
+        const pdraws = piece.draws;
+        const pcurves = piece.curves;
         outliner.open(pts, pdirs.length > 0 ? pdirs : [piece.dirs[0]], pdirs.length > 0 ? pdraws : [piece.draws[0]], pdirs.length > 0 ? pcurves : [piece.curves[0]], piece.startScale, piece.endScale);
       }
     } else if (closed && P.length >= 3) {
       outliner.closed(P, dirs, curves);
     } else if (closed && P.length === 2) {
-      outliner.open([P[0], P[1], P[0]]);
+      outliner.closed(P, dirs, curves);
     } else {
       outliner.open(P, void 0, dirs, curves);
     }
@@ -30706,11 +30708,17 @@ function penWidenOptions(rCtx, opts = {}) {
       join: opts.roundPen ? "round" : opts.rectangle && !state.penExtended ? "miter" : !state.penExtended || joinBits === 0 ? "round" : joinBits === 4096 ? "bevel" : "miter",
       miterLimit: state.miterLimit ?? 10,
       dashes: dashes ? dashes.map((v) => v * 16) : null,
-      shortenDashes: (flags & 15) !== 7
+      shortenDashes: (flags & 15) !== 7,
+      // Under a rotation the device vector is converted back to logical units for a square cap's extension.
+      cutToLogicalUnits: !dashes
     };
   }
+  const unrotated = Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6;
+  const scaled2 = !rCtx.wholeDevicePixels && unrotated && (Math.abs(Math.abs(matrix[0]) - 1) > 1e-6 || Math.abs(Math.abs(matrix[3]) - 1) > 1e-6);
+  const uniform = scaled2 && !ellipse && state.penExtended && (flags & 15) !== 6;
+  const nibWidth = uniform ? Math.max(1, Math.floor(widthPx + 0.5)) : widthPx;
   return {
-    width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : widthPx) * 16),
+    width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : nibWidth) * 16),
     ...ellipse ? { height: Math.round(state.penWidth * Math.abs(matrix[3]) * 16) } : {},
     cap: opts.roundPen || !state.penExtended || capBits === 0 ? "round" : capBits === 256 ? "square" : "flat",
     join: opts.roundPen ? "round" : opts.rectangle && !state.penExtended ? "miter" : !state.penExtended || joinBits === 0 ? "round" : joinBits === 4096 ? "bevel" : "miter",
@@ -30720,7 +30728,13 @@ function penWidenOptions(rCtx, opts = {}) {
     shortenDashes: (flags & 15) !== 7,
     // One logical unit per device pixel, unrotated: GDI measures dash
     // segments in whole pixels.
-    wholePixelDashVectors: Math.abs(matrix[0] - 1) < 1e-6 && Math.abs(matrix[3] - 1) < 1e-6 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6
+    wholePixelDashVectors: Math.abs(matrix[0] - 1) < 1e-6 && Math.abs(matrix[3] - 1) < 1e-6 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6,
+    ...scaled2 && !dashes ? {
+      cutToLogicalUnits: true,
+      logicalScale: ellipse ? [Math.abs(matrix[0]), Math.abs(matrix[3])] : Math.abs(matrix[0]),
+      // The pen rounds to whole pixels, but a square cap extends by half the unrounded width.
+      ...uniform ? { capWidth: state.penWidth * Math.abs(matrix[0]) * 16 } : {}
+    } : {}
   };
 }
 function hatchBackgroundMask(hatch) {
@@ -32012,8 +32026,14 @@ function handleRoundRect(rCtx, dataOff, recSize) {
     const cornerFixW = inset ? Math.abs(cornerW * devM[0]) * 16 : fixExtent(rCtx, cornerW, 0);
     const cornerFixH = inset ? Math.abs(cornerH * devM[3]) * 16 : fixExtent(rCtx, cornerH, 1);
     const cornerOnFrame = (fix, size, framedSize) => inset && size !== 0 ? Math.floor(Math.min(fix, size) * framedSize / size) : fix;
-    const cw = cornerOnFrame(cornerFixW, Math.abs((r - l) * devM[0]) * 16, Math.abs(framed.exx));
-    const ch = cornerOnFrame(cornerFixH, Math.abs((b - t) * devM[3]) * 16, Math.abs(framed.eyy));
+    let cw = cornerOnFrame(cornerFixW, Math.abs((r - l) * devM[0]) * 16, Math.abs(framed.exx));
+    let ch = cornerOnFrame(cornerFixH, Math.abs((b - t) * devM[3]) * 16, Math.abs(framed.eyy));
+    if (!inset && rCtx.state.penStyle !== 6 && cornerW !== 0 && cornerH !== 0 && Math.abs(devM[1]) < 1e-9 && Math.abs(devM[2]) < 1e-9 && rCtx.state.penStyle !== 5 && !penIsCosmetic(rCtx) && rCtx.state.worldTransform.every((v, i) => v === [1, 0, 0, 1, 0, 0][i])) {
+      const fullW = (Math.abs(r - l) + 1) * Math.abs(devM[0]) * 16;
+      const fullH = (Math.abs(b - t) + 1) * Math.abs(devM[3]) * 16;
+      cw = Math.floor(Math.min(cornerFixW, fullW) * Math.abs(framed.exx) / fullW);
+      ch = Math.floor(Math.min(cornerFixH, fullH) * Math.abs(framed.eyy) / fullH);
+    }
     const drawRoundRect = inset ? (c) => appendRoundRectPath(
       c,
       Math.min(framed.ax, framed.ax + framed.exx) / 16,

package/dist/browser.mjs

@@ -29939,23 +29939,35 @@ function perpendicularVectors(width, dx0, dy0, height = width, matrixPen) {
   const vx = rounded[0], vy = rounded[1];
   return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
-function squareExtension(width, dx, dy, scale = 1, height = width, matrix, wholePixelNorm = false, symmetric = wholePixelNorm) {
+function norm(x, y) {
+  return Math.sqrt(x * x + y * y);
+}
+function squareExtension(width, dx, dy, scale = 1, height = width, matrix, wholePixelNorm = false, symmetric = wholePixelNorm, logicalScale = 1) {
+  const slack = 8;
   if (matrix) {
     const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
     const lx = (matrix[3] * dx - matrix[2] * dy) / det;
     const ly = (-matrix[1] * dx + matrix[0] * dy) / det;
-    const l = Math.hypot(lx, ly);
+    let l = Math.hypot(lx, ly);
+    if (wholePixelNorm) {
+      l = norm(Math.floor((lx + slack) / 16) * 16, Math.floor((ly + slack) / 16) * 16);
+      if (l === 0) return [0, 0];
+    }
     const q = width / 2 * scale / l;
     return [Math.floor((matrix[0] * lx + matrix[2] * ly) * q + 0.5), Math.floor((matrix[1] * lx + matrix[3] * ly) * q + 0.5)];
   }
-  let len = width === height ? Math.hypot(dx, dy) : Math.hypot(dx, dy * width / height);
-  if (wholePixelNorm && width === height) {
-    const whole = Math.hypot(Math.floor(dx / 16), Math.floor(dy / 16)) * 16;
-    if (whole === 0) return [0, 0];
-    len = whole;
-  }
+  const [ax, ay] = typeof logicalScale === "number" ? [logicalScale, logicalScale] : logicalScale;
   const r = width / 2 * scale;
   const round = symmetric ? (v) => Math.sign(v) * Math.floor(Math.abs(v) + 0.5) : (v) => Math.floor(v + 0.5);
+  if (wholePixelNorm && (width === height || ax !== ay)) {
+    const lx = dx / ax;
+    const ly = dy / ay;
+    const cut = ax === 1 && ay === 1 ? 0 : slack;
+    const whole = norm(Math.floor((lx + cut) / 16) * 16, Math.floor((ly + cut) / 16) * 16);
+    if (whole === 0) return [0, 0];
+    return [round(lx / whole * r), round(ly * ay / ax / whole * r)];
+  }
+  const len = width === height ? norm(dx, dy) : norm(dx, dy * width / height);
   return [round(dx / len * r), round(dy / len * r)];
 }
 function turnSign(ax, ay, bx, by) {
@@ -29995,7 +30007,7 @@ var Outliner = class {
     const [L, R] = drawVertices(this.pen, d[0], d[1], this.opts.width, this.opts.height, nibMatrix);
     const perpendicular = curve && drawDir ? drawDir : [dx, dy];
     const vectors = perpendicularVectors(this.opts.width, perpendicular[0], perpendicular[1], this.opts.height, nibMatrix ? this.pen : void 0);
-    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height, nibMatrix, !!this.opts.wholePixelDashVectors), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, role: drawDir?.[2] ?? 3, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
+    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.capWidth ?? this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height ?? this.opts.capWidth, nibMatrix, !!(this.opts.wholePixelDashVectors || this.opts.cutToLogicalUnits), void 0, this.opts.logicalScale), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, role: drawDir?.[2] ?? 3, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -30313,8 +30325,8 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
     const [x1, y1] = P[i + 1];
     const dir = [x1 - x0, y1 - y0];
     const det = matrix ? matrix[0] * matrix[3] - matrix[1] * matrix[2] : 1;
-    const real = matrix ? Math.hypot((matrix[3] * dir[0] - matrix[2] * dir[1]) / det, (-matrix[1] * dir[0] + matrix[0] * dir[1]) / det) : metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : Math.hypot(dir[0], dir[1]);
-    const len = metric || matrix ? real : wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    const real = matrix ? Math.hypot((matrix[3] * dir[0] - matrix[2] * dir[1]) / det, (-matrix[1] * dir[0] + matrix[0] * dir[1]) / det) : metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : norm(dir[0], dir[1]);
+    const len = metric || matrix ? real : wholePixelVectors ? norm(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : norm(dir[0], dir[1]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -30422,26 +30434,16 @@ function widenPath(path, opts) {
       const runTangents = closed ? [...dirs, void 0] : dirs;
       const runCurves = closed ? [...curves, !!fig.roundWiden] : curves;
       for (const piece of dashPieces(run, runTangents, runCurves, opts.dashes, shorten, !!opts.wholePixelDashVectors, opts.dashMetric, opts.deviceNib ? opts.matrix : void 0)) {
-        const pts = [piece.pts[0]];
-        const pdirs = [];
-        const pdraws = [];
-        const pcurves = [];
-        for (let i = 1; i < piece.pts.length; i++) {
-          const q = piece.pts[i];
-          const last = pts[pts.length - 1];
-          if (q[0] !== last[0] || q[1] !== last[1]) {
-            pts.push(q);
-            pdirs.push(piece.dirs[i - 1]);
-            pdraws.push(piece.draws[i - 1]);
-            pcurves.push(piece.curves[i - 1]);
-          }
-        }
+        const pts = piece.pts;
+        const pdirs = piece.dirs;
+        const pdraws = piece.draws;
+        const pcurves = piece.curves;
         outliner.open(pts, pdirs.length > 0 ? pdirs : [piece.dirs[0]], pdirs.length > 0 ? pdraws : [piece.draws[0]], pdirs.length > 0 ? pcurves : [piece.curves[0]], piece.startScale, piece.endScale);
       }
     } else if (closed && P.length >= 3) {
       outliner.closed(P, dirs, curves);
     } else if (closed && P.length === 2) {
-      outliner.open([P[0], P[1], P[0]]);
+      outliner.closed(P, dirs, curves);
     } else {
       outliner.open(P, void 0, dirs, curves);
     }
@@ -30704,11 +30706,17 @@ function penWidenOptions(rCtx, opts = {}) {
       join: opts.roundPen ? "round" : opts.rectangle && !state.penExtended ? "miter" : !state.penExtended || joinBits === 0 ? "round" : joinBits === 4096 ? "bevel" : "miter",
       miterLimit: state.miterLimit ?? 10,
       dashes: dashes ? dashes.map((v) => v * 16) : null,
-      shortenDashes: (flags & 15) !== 7
+      shortenDashes: (flags & 15) !== 7,
+      // Under a rotation the device vector is converted back to logical units for a square cap's extension.
+      cutToLogicalUnits: !dashes
     };
   }
+  const unrotated = Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6;
+  const scaled2 = !rCtx.wholeDevicePixels && unrotated && (Math.abs(Math.abs(matrix[0]) - 1) > 1e-6 || Math.abs(Math.abs(matrix[3]) - 1) > 1e-6);
+  const uniform = scaled2 && !ellipse && state.penExtended && (flags & 15) !== 6;
+  const nibWidth = uniform ? Math.max(1, Math.floor(widthPx + 0.5)) : widthPx;
   return {
-    width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : widthPx) * 16),
+    width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : nibWidth) * 16),
     ...ellipse ? { height: Math.round(state.penWidth * Math.abs(matrix[3]) * 16) } : {},
     cap: opts.roundPen || !state.penExtended || capBits === 0 ? "round" : capBits === 256 ? "square" : "flat",
     join: opts.roundPen ? "round" : opts.rectangle && !state.penExtended ? "miter" : !state.penExtended || joinBits === 0 ? "round" : joinBits === 4096 ? "bevel" : "miter",
@@ -30718,7 +30726,13 @@ function penWidenOptions(rCtx, opts = {}) {
     shortenDashes: (flags & 15) !== 7,
     // One logical unit per device pixel, unrotated: GDI measures dash
     // segments in whole pixels.
-    wholePixelDashVectors: Math.abs(matrix[0] - 1) < 1e-6 && Math.abs(matrix[3] - 1) < 1e-6 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6
+    wholePixelDashVectors: Math.abs(matrix[0] - 1) < 1e-6 && Math.abs(matrix[3] - 1) < 1e-6 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6,
+    ...scaled2 && !dashes ? {
+      cutToLogicalUnits: true,
+      logicalScale: ellipse ? [Math.abs(matrix[0]), Math.abs(matrix[3])] : Math.abs(matrix[0]),
+      // The pen rounds to whole pixels, but a square cap extends by half the unrounded width.
+      ...uniform ? { capWidth: state.penWidth * Math.abs(matrix[0]) * 16 } : {}
+    } : {}
   };
 }
 function hatchBackgroundMask(hatch) {
@@ -32010,8 +32024,14 @@ function handleRoundRect(rCtx, dataOff, recSize) {
     const cornerFixW = inset ? Math.abs(cornerW * devM[0]) * 16 : fixExtent(rCtx, cornerW, 0);
     const cornerFixH = inset ? Math.abs(cornerH * devM[3]) * 16 : fixExtent(rCtx, cornerH, 1);
     const cornerOnFrame = (fix, size, framedSize) => inset && size !== 0 ? Math.floor(Math.min(fix, size) * framedSize / size) : fix;
-    const cw = cornerOnFrame(cornerFixW, Math.abs((r - l) * devM[0]) * 16, Math.abs(framed.exx));
-    const ch = cornerOnFrame(cornerFixH, Math.abs((b - t) * devM[3]) * 16, Math.abs(framed.eyy));
+    let cw = cornerOnFrame(cornerFixW, Math.abs((r - l) * devM[0]) * 16, Math.abs(framed.exx));
+    let ch = cornerOnFrame(cornerFixH, Math.abs((b - t) * devM[3]) * 16, Math.abs(framed.eyy));
+    if (!inset && rCtx.state.penStyle !== 6 && cornerW !== 0 && cornerH !== 0 && Math.abs(devM[1]) < 1e-9 && Math.abs(devM[2]) < 1e-9 && rCtx.state.penStyle !== 5 && !penIsCosmetic(rCtx) && rCtx.state.worldTransform.every((v, i) => v === [1, 0, 0, 1, 0, 0][i])) {
+      const fullW = (Math.abs(r - l) + 1) * Math.abs(devM[0]) * 16;
+      const fullH = (Math.abs(b - t) + 1) * Math.abs(devM[3]) * 16;
+      cw = Math.floor(Math.min(cornerFixW, fullW) * Math.abs(framed.exx) / fullW);
+      ch = Math.floor(Math.min(cornerFixH, fullH) * Math.abs(framed.eyy) / fullH);
+    }
     const drawRoundRect = inset ? (c) => appendRoundRectPath(
       c,
       Math.min(framed.ax, framed.ax + framed.exx) / 16,

package/dist/index.js

@@ -29942,23 +29942,35 @@ function perpendicularVectors(width, dx0, dy0, height = width, matrixPen) {
   const vx = rounded[0], vy = rounded[1];
   return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
-function squareExtension(width, dx, dy, scale = 1, height = width, matrix, wholePixelNorm = false, symmetric = wholePixelNorm) {
+function norm(x, y) {
+  return Math.sqrt(x * x + y * y);
+}
+function squareExtension(width, dx, dy, scale = 1, height = width, matrix, wholePixelNorm = false, symmetric = wholePixelNorm, logicalScale = 1) {
+  const slack = 8;
   if (matrix) {
     const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
     const lx = (matrix[3] * dx - matrix[2] * dy) / det;
     const ly = (-matrix[1] * dx + matrix[0] * dy) / det;
-    const l = Math.hypot(lx, ly);
+    let l = Math.hypot(lx, ly);
+    if (wholePixelNorm) {
+      l = norm(Math.floor((lx + slack) / 16) * 16, Math.floor((ly + slack) / 16) * 16);
+      if (l === 0) return [0, 0];
+    }
     const q = width / 2 * scale / l;
     return [Math.floor((matrix[0] * lx + matrix[2] * ly) * q + 0.5), Math.floor((matrix[1] * lx + matrix[3] * ly) * q + 0.5)];
   }
-  let len = width === height ? Math.hypot(dx, dy) : Math.hypot(dx, dy * width / height);
-  if (wholePixelNorm && width === height) {
-    const whole = Math.hypot(Math.floor(dx / 16), Math.floor(dy / 16)) * 16;
-    if (whole === 0) return [0, 0];
-    len = whole;
-  }
+  const [ax, ay] = typeof logicalScale === "number" ? [logicalScale, logicalScale] : logicalScale;
   const r = width / 2 * scale;
   const round = symmetric ? (v) => Math.sign(v) * Math.floor(Math.abs(v) + 0.5) : (v) => Math.floor(v + 0.5);
+  if (wholePixelNorm && (width === height || ax !== ay)) {
+    const lx = dx / ax;
+    const ly = dy / ay;
+    const cut = ax === 1 && ay === 1 ? 0 : slack;
+    const whole = norm(Math.floor((lx + cut) / 16) * 16, Math.floor((ly + cut) / 16) * 16);
+    if (whole === 0) return [0, 0];
+    return [round(lx / whole * r), round(ly * ay / ax / whole * r)];
+  }
+  const len = width === height ? norm(dx, dy) : norm(dx, dy * width / height);
   return [round(dx / len * r), round(dy / len * r)];
 }
 function turnSign(ax, ay, bx, by) {
@@ -29998,7 +30010,7 @@ var Outliner = class {
     const [L, R] = drawVertices(this.pen, d[0], d[1], this.opts.width, this.opts.height, nibMatrix);
     const perpendicular = curve && drawDir ? drawDir : [dx, dy];
     const vectors = perpendicularVectors(this.opts.width, perpendicular[0], perpendicular[1], this.opts.height, nibMatrix ? this.pen : void 0);
-    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height, nibMatrix, !!this.opts.wholePixelDashVectors), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, role: drawDir?.[2] ?? 3, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
+    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.capWidth ?? this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height ?? this.opts.capWidth, nibMatrix, !!(this.opts.wholePixelDashVectors || this.opts.cutToLogicalUnits), void 0, this.opts.logicalScale), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, role: drawDir?.[2] ?? 3, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -30316,8 +30328,8 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
     const [x1, y1] = P[i + 1];
     const dir = [x1 - x0, y1 - y0];
     const det = matrix ? matrix[0] * matrix[3] - matrix[1] * matrix[2] : 1;
-    const real = matrix ? Math.hypot((matrix[3] * dir[0] - matrix[2] * dir[1]) / det, (-matrix[1] * dir[0] + matrix[0] * dir[1]) / det) : metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : Math.hypot(dir[0], dir[1]);
-    const len = metric || matrix ? real : wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    const real = matrix ? Math.hypot((matrix[3] * dir[0] - matrix[2] * dir[1]) / det, (-matrix[1] * dir[0] + matrix[0] * dir[1]) / det) : metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : norm(dir[0], dir[1]);
+    const len = metric || matrix ? real : wholePixelVectors ? norm(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : norm(dir[0], dir[1]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -30425,26 +30437,16 @@ function widenPath(path, opts) {
       const runTangents = closed ? [...dirs, void 0] : dirs;
       const runCurves = closed ? [...curves, !!fig.roundWiden] : curves;
       for (const piece of dashPieces(run, runTangents, runCurves, opts.dashes, shorten, !!opts.wholePixelDashVectors, opts.dashMetric, opts.deviceNib ? opts.matrix : void 0)) {
-        const pts = [piece.pts[0]];
-        const pdirs = [];
-        const pdraws = [];
-        const pcurves = [];
-        for (let i = 1; i < piece.pts.length; i++) {
-          const q = piece.pts[i];
-          const last = pts[pts.length - 1];
-          if (q[0] !== last[0] || q[1] !== last[1]) {
-            pts.push(q);
-            pdirs.push(piece.dirs[i - 1]);
-            pdraws.push(piece.draws[i - 1]);
-            pcurves.push(piece.curves[i - 1]);
-          }
-        }
+        const pts = piece.pts;
+        const pdirs = piece.dirs;
+        const pdraws = piece.draws;
+        const pcurves = piece.curves;
         outliner.open(pts, pdirs.length > 0 ? pdirs : [piece.dirs[0]], pdirs.length > 0 ? pdraws : [piece.draws[0]], pdirs.length > 0 ? pcurves : [piece.curves[0]], piece.startScale, piece.endScale);
       }
     } else if (closed && P.length >= 3) {
       outliner.closed(P, dirs, curves);
     } else if (closed && P.length === 2) {
-      outliner.open([P[0], P[1], P[0]]);
+      outliner.closed(P, dirs, curves);
     } else {
       outliner.open(P, void 0, dirs, curves);
     }
@@ -30707,11 +30709,17 @@ function penWidenOptions(rCtx, opts = {}) {
       join: opts.roundPen ? "round" : opts.rectangle && !state.penExtended ? "miter" : !state.penExtended || joinBits === 0 ? "round" : joinBits === 4096 ? "bevel" : "miter",
       miterLimit: state.miterLimit ?? 10,
       dashes: dashes ? dashes.map((v) => v * 16) : null,
-      shortenDashes: (flags & 15) !== 7
+      shortenDashes: (flags & 15) !== 7,
+      // Under a rotation the device vector is converted back to logical units for a square cap's extension.
+      cutToLogicalUnits: !dashes
     };
   }
+  const unrotated = Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6;
+  const scaled2 = !rCtx.wholeDevicePixels && unrotated && (Math.abs(Math.abs(matrix[0]) - 1) > 1e-6 || Math.abs(Math.abs(matrix[3]) - 1) > 1e-6);
+  const uniform = scaled2 && !ellipse && state.penExtended && (flags & 15) !== 6;
+  const nibWidth = uniform ? Math.max(1, Math.floor(widthPx + 0.5)) : widthPx;
   return {
-    width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : widthPx) * 16),
+    width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : nibWidth) * 16),
     ...ellipse ? { height: Math.round(state.penWidth * Math.abs(matrix[3]) * 16) } : {},
     cap: opts.roundPen || !state.penExtended || capBits === 0 ? "round" : capBits === 256 ? "square" : "flat",
     join: opts.roundPen ? "round" : opts.rectangle && !state.penExtended ? "miter" : !state.penExtended || joinBits === 0 ? "round" : joinBits === 4096 ? "bevel" : "miter",
@@ -30721,7 +30729,13 @@ function penWidenOptions(rCtx, opts = {}) {
     shortenDashes: (flags & 15) !== 7,
     // One logical unit per device pixel, unrotated: GDI measures dash
     // segments in whole pixels.
-    wholePixelDashVectors: Math.abs(matrix[0] - 1) < 1e-6 && Math.abs(matrix[3] - 1) < 1e-6 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6
+    wholePixelDashVectors: Math.abs(matrix[0] - 1) < 1e-6 && Math.abs(matrix[3] - 1) < 1e-6 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6,
+    ...scaled2 && !dashes ? {
+      cutToLogicalUnits: true,
+      logicalScale: ellipse ? [Math.abs(matrix[0]), Math.abs(matrix[3])] : Math.abs(matrix[0]),
+      // The pen rounds to whole pixels, but a square cap extends by half the unrounded width.
+      ...uniform ? { capWidth: state.penWidth * Math.abs(matrix[0]) * 16 } : {}
+    } : {}
   };
 }
 function hatchBackgroundMask(hatch) {
@@ -32013,8 +32027,14 @@ function handleRoundRect(rCtx, dataOff, recSize) {
     const cornerFixW = inset ? Math.abs(cornerW * devM[0]) * 16 : fixExtent(rCtx, cornerW, 0);
     const cornerFixH = inset ? Math.abs(cornerH * devM[3]) * 16 : fixExtent(rCtx, cornerH, 1);
     const cornerOnFrame = (fix, size, framedSize) => inset && size !== 0 ? Math.floor(Math.min(fix, size) * framedSize / size) : fix;
-    const cw = cornerOnFrame(cornerFixW, Math.abs((r - l) * devM[0]) * 16, Math.abs(framed.exx));
-    const ch = cornerOnFrame(cornerFixH, Math.abs((b - t) * devM[3]) * 16, Math.abs(framed.eyy));
+    let cw = cornerOnFrame(cornerFixW, Math.abs((r - l) * devM[0]) * 16, Math.abs(framed.exx));
+    let ch = cornerOnFrame(cornerFixH, Math.abs((b - t) * devM[3]) * 16, Math.abs(framed.eyy));
+    if (!inset && rCtx.state.penStyle !== 6 && cornerW !== 0 && cornerH !== 0 && Math.abs(devM[1]) < 1e-9 && Math.abs(devM[2]) < 1e-9 && rCtx.state.penStyle !== 5 && !penIsCosmetic(rCtx) && rCtx.state.worldTransform.every((v, i) => v === [1, 0, 0, 1, 0, 0][i])) {
+      const fullW = (Math.abs(r - l) + 1) * Math.abs(devM[0]) * 16;
+      const fullH = (Math.abs(b - t) + 1) * Math.abs(devM[3]) * 16;
+      cw = Math.floor(Math.min(cornerFixW, fullW) * Math.abs(framed.exx) / fullW);
+      ch = Math.floor(Math.min(cornerFixH, fullH) * Math.abs(framed.eyy) / fullH);
+    }
     const drawRoundRect = inset ? (c) => appendRoundRectPath(
       c,
       Math.min(framed.ax, framed.ax + framed.exx) / 16,

package/dist/index.mjs

@@ -29940,23 +29940,35 @@ function perpendicularVectors(width, dx0, dy0, height = width, matrixPen) {
   const vx = rounded[0], vy = rounded[1];
   return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
-function squareExtension(width, dx, dy, scale = 1, height = width, matrix, wholePixelNorm = false, symmetric = wholePixelNorm) {
+function norm(x, y) {
+  return Math.sqrt(x * x + y * y);
+}
+function squareExtension(width, dx, dy, scale = 1, height = width, matrix, wholePixelNorm = false, symmetric = wholePixelNorm, logicalScale = 1) {
+  const slack = 8;
   if (matrix) {
     const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
     const lx = (matrix[3] * dx - matrix[2] * dy) / det;
     const ly = (-matrix[1] * dx + matrix[0] * dy) / det;
-    const l = Math.hypot(lx, ly);
+    let l = Math.hypot(lx, ly);
+    if (wholePixelNorm) {
+      l = norm(Math.floor((lx + slack) / 16) * 16, Math.floor((ly + slack) / 16) * 16);
+      if (l === 0) return [0, 0];
+    }
     const q = width / 2 * scale / l;
     return [Math.floor((matrix[0] * lx + matrix[2] * ly) * q + 0.5), Math.floor((matrix[1] * lx + matrix[3] * ly) * q + 0.5)];
   }
-  let len = width === height ? Math.hypot(dx, dy) : Math.hypot(dx, dy * width / height);
-  if (wholePixelNorm && width === height) {
-    const whole = Math.hypot(Math.floor(dx / 16), Math.floor(dy / 16)) * 16;
-    if (whole === 0) return [0, 0];
-    len = whole;
-  }
+  const [ax, ay] = typeof logicalScale === "number" ? [logicalScale, logicalScale] : logicalScale;
   const r = width / 2 * scale;
   const round = symmetric ? (v) => Math.sign(v) * Math.floor(Math.abs(v) + 0.5) : (v) => Math.floor(v + 0.5);
+  if (wholePixelNorm && (width === height || ax !== ay)) {
+    const lx = dx / ax;
+    const ly = dy / ay;
+    const cut = ax === 1 && ay === 1 ? 0 : slack;
+    const whole = norm(Math.floor((lx + cut) / 16) * 16, Math.floor((ly + cut) / 16) * 16);
+    if (whole === 0) return [0, 0];
+    return [round(lx / whole * r), round(ly * ay / ax / whole * r)];
+  }
+  const len = width === height ? norm(dx, dy) : norm(dx, dy * width / height);
   return [round(dx / len * r), round(dy / len * r)];
 }
 function turnSign(ax, ay, bx, by) {
@@ -29996,7 +30008,7 @@ var Outliner = class {
     const [L, R] = drawVertices(this.pen, d[0], d[1], this.opts.width, this.opts.height, nibMatrix);
     const perpendicular = curve && drawDir ? drawDir : [dx, dy];
     const vectors = perpendicularVectors(this.opts.width, perpendicular[0], perpendicular[1], this.opts.height, nibMatrix ? this.pen : void 0);
-    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height, nibMatrix, !!this.opts.wholePixelDashVectors), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, role: drawDir?.[2] ?? 3, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
+    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.capWidth ?? this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height ?? this.opts.capWidth, nibMatrix, !!(this.opts.wholePixelDashVectors || this.opts.cutToLogicalUnits), void 0, this.opts.logicalScale), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, role: drawDir?.[2] ?? 3, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
   }
   push(p, v) {
     this.pts.push([p[0] + v[0], p[1] + v[1]]);
@@ -30314,8 +30326,8 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
     const [x1, y1] = P[i + 1];
     const dir = [x1 - x0, y1 - y0];
     const det = matrix ? matrix[0] * matrix[3] - matrix[1] * matrix[2] : 1;
-    const real = matrix ? Math.hypot((matrix[3] * dir[0] - matrix[2] * dir[1]) / det, (-matrix[1] * dir[0] + matrix[0] * dir[1]) / det) : metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : Math.hypot(dir[0], dir[1]);
-    const len = metric || matrix ? real : wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    const real = matrix ? Math.hypot((matrix[3] * dir[0] - matrix[2] * dir[1]) / det, (-matrix[1] * dir[0] + matrix[0] * dir[1]) / det) : metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : norm(dir[0], dir[1]);
+    const len = metric || matrix ? real : wholePixelVectors ? norm(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : norm(dir[0], dir[1]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -30423,26 +30435,16 @@ function widenPath(path, opts) {
       const runTangents = closed ? [...dirs, void 0] : dirs;
       const runCurves = closed ? [...curves, !!fig.roundWiden] : curves;
       for (const piece of dashPieces(run, runTangents, runCurves, opts.dashes, shorten, !!opts.wholePixelDashVectors, opts.dashMetric, opts.deviceNib ? opts.matrix : void 0)) {
-        const pts = [piece.pts[0]];
-        const pdirs = [];
-        const pdraws = [];
-        const pcurves = [];
-        for (let i = 1; i < piece.pts.length; i++) {
-          const q = piece.pts[i];
-          const last = pts[pts.length - 1];
-          if (q[0] !== last[0] || q[1] !== last[1]) {
-            pts.push(q);
-            pdirs.push(piece.dirs[i - 1]);
-            pdraws.push(piece.draws[i - 1]);
-            pcurves.push(piece.curves[i - 1]);
-          }
-        }
+        const pts = piece.pts;
+        const pdirs = piece.dirs;
+        const pdraws = piece.draws;
+        const pcurves = piece.curves;
         outliner.open(pts, pdirs.length > 0 ? pdirs : [piece.dirs[0]], pdirs.length > 0 ? pdraws : [piece.draws[0]], pdirs.length > 0 ? pcurves : [piece.curves[0]], piece.startScale, piece.endScale);
       }
     } else if (closed && P.length >= 3) {
       outliner.closed(P, dirs, curves);
     } else if (closed && P.length === 2) {
-      outliner.open([P[0], P[1], P[0]]);
+      outliner.closed(P, dirs, curves);
     } else {
       outliner.open(P, void 0, dirs, curves);
     }
@@ -30705,11 +30707,17 @@ function penWidenOptions(rCtx, opts = {}) {
       join: opts.roundPen ? "round" : opts.rectangle && !state.penExtended ? "miter" : !state.penExtended || joinBits === 0 ? "round" : joinBits === 4096 ? "bevel" : "miter",
       miterLimit: state.miterLimit ?? 10,
       dashes: dashes ? dashes.map((v) => v * 16) : null,
-      shortenDashes: (flags & 15) !== 7
+      shortenDashes: (flags & 15) !== 7,
+      // Under a rotation the device vector is converted back to logical units for a square cap's extension.
+      cutToLogicalUnits: !dashes
     };
   }
+  const unrotated = Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6;
+  const scaled2 = !rCtx.wholeDevicePixels && unrotated && (Math.abs(Math.abs(matrix[0]) - 1) > 1e-6 || Math.abs(Math.abs(matrix[3]) - 1) > 1e-6);
+  const uniform = scaled2 && !ellipse && state.penExtended && (flags & 15) !== 6;
+  const nibWidth = uniform ? Math.max(1, Math.floor(widthPx + 0.5)) : widthPx;
   return {
-    width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : widthPx) * 16),
+    width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : nibWidth) * 16),
     ...ellipse ? { height: Math.round(state.penWidth * Math.abs(matrix[3]) * 16) } : {},
     cap: opts.roundPen || !state.penExtended || capBits === 0 ? "round" : capBits === 256 ? "square" : "flat",
     join: opts.roundPen ? "round" : opts.rectangle && !state.penExtended ? "miter" : !state.penExtended || joinBits === 0 ? "round" : joinBits === 4096 ? "bevel" : "miter",
@@ -30719,7 +30727,13 @@ function penWidenOptions(rCtx, opts = {}) {
     shortenDashes: (flags & 15) !== 7,
     // One logical unit per device pixel, unrotated: GDI measures dash
     // segments in whole pixels.
-    wholePixelDashVectors: Math.abs(matrix[0] - 1) < 1e-6 && Math.abs(matrix[3] - 1) < 1e-6 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6
+    wholePixelDashVectors: Math.abs(matrix[0] - 1) < 1e-6 && Math.abs(matrix[3] - 1) < 1e-6 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6,
+    ...scaled2 && !dashes ? {
+      cutToLogicalUnits: true,
+      logicalScale: ellipse ? [Math.abs(matrix[0]), Math.abs(matrix[3])] : Math.abs(matrix[0]),
+      // The pen rounds to whole pixels, but a square cap extends by half the unrounded width.
+      ...uniform ? { capWidth: state.penWidth * Math.abs(matrix[0]) * 16 } : {}
+    } : {}
   };
 }
 function hatchBackgroundMask(hatch) {
@@ -32011,8 +32025,14 @@ function handleRoundRect(rCtx, dataOff, recSize) {
     const cornerFixW = inset ? Math.abs(cornerW * devM[0]) * 16 : fixExtent(rCtx, cornerW, 0);
     const cornerFixH = inset ? Math.abs(cornerH * devM[3]) * 16 : fixExtent(rCtx, cornerH, 1);
     const cornerOnFrame = (fix, size, framedSize) => inset && size !== 0 ? Math.floor(Math.min(fix, size) * framedSize / size) : fix;
-    const cw = cornerOnFrame(cornerFixW, Math.abs((r - l) * devM[0]) * 16, Math.abs(framed.exx));
-    const ch = cornerOnFrame(cornerFixH, Math.abs((b - t) * devM[3]) * 16, Math.abs(framed.eyy));
+    let cw = cornerOnFrame(cornerFixW, Math.abs((r - l) * devM[0]) * 16, Math.abs(framed.exx));
+    let ch = cornerOnFrame(cornerFixH, Math.abs((b - t) * devM[3]) * 16, Math.abs(framed.eyy));
+    if (!inset && rCtx.state.penStyle !== 6 && cornerW !== 0 && cornerH !== 0 && Math.abs(devM[1]) < 1e-9 && Math.abs(devM[2]) < 1e-9 && rCtx.state.penStyle !== 5 && !penIsCosmetic(rCtx) && rCtx.state.worldTransform.every((v, i) => v === [1, 0, 0, 1, 0, 0][i])) {
+      const fullW = (Math.abs(r - l) + 1) * Math.abs(devM[0]) * 16;
+      const fullH = (Math.abs(b - t) + 1) * Math.abs(devM[3]) * 16;
+      cw = Math.floor(Math.min(cornerFixW, fullW) * Math.abs(framed.exx) / fullW);
+      ch = Math.floor(Math.min(cornerFixH, fullH) * Math.abs(framed.eyy) / fullH);
+    }
     const drawRoundRect = inset ? (c) => appendRoundRectPath(
       c,
       Math.min(framed.ax, framed.ax + framed.exx) / 16,

package/package.json

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