emf-converter 4.9.0 → 4.11.0

package/dist/browser.js

@@ -29238,11 +29238,42 @@ function penPolygon(width, height = width) {
   penCache.set(key, pen);
   return pen;
 }
-function drawVertices(pen, dx, dy, width = 1, height = width) {
+var matrixPenCache = /* @__PURE__ */ new Map();
+function penPolygonMatrix(width, m) {
+  const key = `${width},${m.join(",")}`;
+  const cached = matrixPenCache.get(key);
+  if (cached) {
+    return cached;
+  }
+  const r = Math.ceil(width / 2);
+  const mirror2 = m[0] * m[3] - m[1] * m[2] < 0 ? -1 : 1;
+  const bez = ellipseBeziers(-r, -r, r, r);
+  const dev = [];
+  for (let i = 0; i < 14; i += 2) {
+    const x = bez[i];
+    const y = bez[i + 1] * mirror2;
+    dev.push(Math.round(m[0] * x + m[2] * y), Math.round(m[1] * x + m[3] * y));
+  }
+  const f = flattenBezierPath(dev);
+  const half = [];
+  for (let i = 0; i + 1 < f.length; i += 2) {
+    half.push([f[i], f[i + 1]]);
+  }
+  half.pop();
+  const pen = [...half, ...half.map((p) => [0 - p[0] || 0, 0 - p[1] || 0])];
+  matrixPenCache.set(key, pen);
+  return pen;
+}
+function drawVertices(pen, dx, dy, width = 1, height = width, matrix) {
   const n = pen.length;
   const axisVertex = pen.some((q) => q[1] === 0);
-  const yMagnitude = Math.abs(dy) * (width === height ? 1 : width);
-  const xMagnitude = Math.abs(dx) * (width === height ? 2 : height);
+  let yMagnitude = Math.abs(dy) * (width === height ? 1 : width);
+  let xMagnitude = Math.abs(dx) * (width === height ? 2 : height);
+  if (matrix) {
+    const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+    xMagnitude = Math.abs((matrix[3] * dx - matrix[2] * dy) / det);
+    yMagnitude = Math.abs((-matrix[1] * dx + matrix[0] * dy) / det);
+  }
   const steep = yMagnitude > xMagnitude || yMagnitude === xMagnitude && axisVertex;
   const s = (steep ? dy < 0 : dx < 0 || dx === 0 && dy < 0) ? -1 : 1;
   let best = 0;
@@ -29262,7 +29293,7 @@ function drawVertices(pen, dx, dy, width = 1, height = width) {
 function halfPixel(v) {
   return Math.sign(v) * 8 * Math.floor((Math.abs(v) + 4) / 8);
 }
-function perpendicularVectors(width, dx0, dy0, height = width) {
+function perpendicularVectors(width, dx0, dy0, height = width, matrixPen) {
   let dx = dx0;
   let dy = dy0;
   const flip = dx < 0 || dx === 0 && dy < 0;
@@ -29270,7 +29301,7 @@ function perpendicularVectors(width, dx0, dy0, height = width) {
     dx = -dx;
     dy = -dy;
   }
-  const pen = penPolygon(width, height);
+  const pen = matrixPen ?? penPolygon(width, height);
   const n = pen.length;
   const nx = -dy;
   const ny = dx;
@@ -29309,7 +29340,15 @@ function perpendicularVectors(width, dx0, dy0, height = width) {
   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) {
+function squareExtension(width, dx, dy, scale = 1, height = width, matrix) {
+  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);
+    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)];
+  }
   const len = width === height ? Math.hypot(dx, dy) : Math.hypot(dx, dy * width / height);
   const r = width / 2 * scale;
   return [Math.floor(dx / len * r + 0.5), Math.floor(dy / len * r + 0.5)];
@@ -29332,7 +29371,7 @@ var Outliner = class {
     this.opts = opts;
     this.out = out;
     this.pts = [];
-    this.pen = penPolygon(opts.width, opts.height);
+    this.pen = opts.matrix && opts.deviceNib ? penPolygonMatrix(opts.width, opts.matrix) : penPolygon(opts.width, opts.height);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
     this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
@@ -29347,10 +29386,11 @@ var Outliner = class {
     const dx = dir ? dir[0] : b[0] - a[0];
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
-    const [L, R] = drawVertices(this.pen, d[0], d[1], this.opts.width, this.opts.height);
+    const nibMatrix = this.opts.deviceNib ? this.opts.matrix : void 0;
+    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);
-    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
+    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), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, 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]]);
@@ -29463,7 +29503,7 @@ var Outliner = class {
     const sv = this.capSide(s, from);
     const ev = this.capSide(s, to);
     if (cap === "square") {
-      const e0 = scale === 1 ? s.e : squareExtension(this.opts.width, s.pe[0], s.pe[1], scale, this.opts.height);
+      const e0 = scale === 1 ? s.e : squareExtension(this.opts.width, s.pe[0], s.pe[1], scale, this.opts.height, this.opts.deviceNib ? this.opts.matrix : void 0);
       const e = start ? [-e0[0], -e0[1]] : e0;
       this.push(p, [sv[0] + e[0], sv[1] + e[1]]);
       this.push(p, [ev[0] + e[0], ev[1] + e[1]]);
@@ -29643,7 +29683,7 @@ var Outliner = class {
     this.flush();
   }
 };
-function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric) {
+function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric, matrix) {
   const out = [];
   const dashes = [];
   for (let i = 0; i < pattern.length; i += 2) {
@@ -29663,8 +29703,9 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
     const [x0, y0] = P[i];
     const [x1, y1] = P[i + 1];
     const dir = [x1 - x0, y1 - y0];
-    const real = metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : Math.hypot(dir[0], dir[1]);
-    const len = metric ? real : wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    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]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -29708,7 +29749,35 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
   }
   return out;
 }
+function widenInLogicalSpace(path, opts, m) {
+  const [a, b, c, d] = m;
+  const det = a * d - b * c;
+  const inverse = (x, y) => [(d * x - c * y) / det, (-b * x + a * y) / det];
+  const logical = new GdiRasterPath();
+  for (const fig of path.figures) {
+    const pts = [];
+    for (let i = 0; i + 1 < fig.pts.length; i += 2) {
+      pts.push(...inverse(fig.pts[i], fig.pts[i + 1]));
+    }
+    const copy = { pts, closed: fig.closed, roundWiden: fig.roundWiden, curveSegs: fig.curveSegs };
+    if (fig.tangents) {
+      copy.tangents = new Map([...fig.tangents].map(([k, v]) => [k, inverse(v[0], v[1])]));
+    }
+    logical.figures.push(copy);
+  }
+  const outline = widenPath(logical, { ...opts, matrix: void 0, height: void 0 });
+  return outline.map((poly) => {
+    const out = [];
+    for (let i = 0; i + 1 < poly.length; i += 2) {
+      out.push(Math.round(a * poly[i] + c * poly[i + 1]), Math.round(b * poly[i] + d * poly[i + 1]));
+    }
+    return out;
+  });
+}
 function widenPath(path, opts) {
+  if (opts.matrix && !(opts.deviceNib && opts.join === "round")) {
+    return widenInLogicalSpace(path, opts, opts.matrix);
+  }
   const out = [];
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
@@ -29740,7 +29809,7 @@ function widenPath(path, opts) {
       const shorten = opts.cap === "flat" || opts.shortenDashes === false ? 0 : opts.dashMetric ? opts.width / opts.dashMetric[0] : opts.width;
       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)) {
+      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 = [];
@@ -30008,8 +30077,24 @@ function penWidenOptions(rCtx, opts = {}) {
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const ellipse = !rCtx.wholeDevicePixels && state.penWidth * Math.abs(matrix[0]) * 16 >= 1 && state.penWidth * Math.abs(matrix[3]) * 16 >= 1 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6 && Math.abs(Math.abs(matrix[0]) - Math.abs(matrix[3])) > 1e-6;
-  const dashes = state.penExtended ? ellipse ? geometricStyle(flags, state.penWidth, state.penUserStyle, 1) : geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
+  const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+  const rotatedOrSheared = Math.abs(matrix[1]) >= 1e-6 || Math.abs(matrix[2]) >= 1e-6;
+  const quarterTurn = Math.abs(matrix[0]) < 1e-9 && Math.abs(matrix[3]) < 1e-9;
+  const general = !rCtx.wholeDevicePixels && rotatedOrSheared && !quarterTurn && Math.abs(det) > 1e-9 && state.penWidth * Math.sqrt(Math.abs(det)) * 16 >= 1;
+  const dashes = state.penExtended ? ellipse || general ? geometricStyle(flags, state.penWidth, state.penUserStyle, 1) : geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
   const dashMetric = ellipse && dashes ? [Math.abs(matrix[0]), Math.abs(matrix[3])] : void 0;
+  if (general) {
+    return {
+      width: Math.round(state.penWidth * 16),
+      matrix: [matrix[0], matrix[1], matrix[2], matrix[3]],
+      deviceNib: true,
+      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",
+      miterLimit: state.miterLimit ?? 10,
+      dashes: dashes ? dashes.map((v) => v * 16) : null,
+      shortenDashes: (flags & 15) !== 7
+    };
+  }
   return {
     width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : widthPx) * 16),
     ...ellipse ? { height: Math.round(state.penWidth * Math.abs(matrix[3]) * 16) } : {},

package/dist/browser.mjs

@@ -29236,11 +29236,42 @@ function penPolygon(width, height = width) {
   penCache.set(key, pen);
   return pen;
 }
-function drawVertices(pen, dx, dy, width = 1, height = width) {
+var matrixPenCache = /* @__PURE__ */ new Map();
+function penPolygonMatrix(width, m) {
+  const key = `${width},${m.join(",")}`;
+  const cached = matrixPenCache.get(key);
+  if (cached) {
+    return cached;
+  }
+  const r = Math.ceil(width / 2);
+  const mirror2 = m[0] * m[3] - m[1] * m[2] < 0 ? -1 : 1;
+  const bez = ellipseBeziers(-r, -r, r, r);
+  const dev = [];
+  for (let i = 0; i < 14; i += 2) {
+    const x = bez[i];
+    const y = bez[i + 1] * mirror2;
+    dev.push(Math.round(m[0] * x + m[2] * y), Math.round(m[1] * x + m[3] * y));
+  }
+  const f = flattenBezierPath(dev);
+  const half = [];
+  for (let i = 0; i + 1 < f.length; i += 2) {
+    half.push([f[i], f[i + 1]]);
+  }
+  half.pop();
+  const pen = [...half, ...half.map((p) => [0 - p[0] || 0, 0 - p[1] || 0])];
+  matrixPenCache.set(key, pen);
+  return pen;
+}
+function drawVertices(pen, dx, dy, width = 1, height = width, matrix) {
   const n = pen.length;
   const axisVertex = pen.some((q) => q[1] === 0);
-  const yMagnitude = Math.abs(dy) * (width === height ? 1 : width);
-  const xMagnitude = Math.abs(dx) * (width === height ? 2 : height);
+  let yMagnitude = Math.abs(dy) * (width === height ? 1 : width);
+  let xMagnitude = Math.abs(dx) * (width === height ? 2 : height);
+  if (matrix) {
+    const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+    xMagnitude = Math.abs((matrix[3] * dx - matrix[2] * dy) / det);
+    yMagnitude = Math.abs((-matrix[1] * dx + matrix[0] * dy) / det);
+  }
   const steep = yMagnitude > xMagnitude || yMagnitude === xMagnitude && axisVertex;
   const s = (steep ? dy < 0 : dx < 0 || dx === 0 && dy < 0) ? -1 : 1;
   let best = 0;
@@ -29260,7 +29291,7 @@ function drawVertices(pen, dx, dy, width = 1, height = width) {
 function halfPixel(v) {
   return Math.sign(v) * 8 * Math.floor((Math.abs(v) + 4) / 8);
 }
-function perpendicularVectors(width, dx0, dy0, height = width) {
+function perpendicularVectors(width, dx0, dy0, height = width, matrixPen) {
   let dx = dx0;
   let dy = dy0;
   const flip = dx < 0 || dx === 0 && dy < 0;
@@ -29268,7 +29299,7 @@ function perpendicularVectors(width, dx0, dy0, height = width) {
     dx = -dx;
     dy = -dy;
   }
-  const pen = penPolygon(width, height);
+  const pen = matrixPen ?? penPolygon(width, height);
   const n = pen.length;
   const nx = -dy;
   const ny = dx;
@@ -29307,7 +29338,15 @@ function perpendicularVectors(width, dx0, dy0, height = width) {
   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) {
+function squareExtension(width, dx, dy, scale = 1, height = width, matrix) {
+  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);
+    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)];
+  }
   const len = width === height ? Math.hypot(dx, dy) : Math.hypot(dx, dy * width / height);
   const r = width / 2 * scale;
   return [Math.floor(dx / len * r + 0.5), Math.floor(dy / len * r + 0.5)];
@@ -29330,7 +29369,7 @@ var Outliner = class {
     this.opts = opts;
     this.out = out;
     this.pts = [];
-    this.pen = penPolygon(opts.width, opts.height);
+    this.pen = opts.matrix && opts.deviceNib ? penPolygonMatrix(opts.width, opts.matrix) : penPolygon(opts.width, opts.height);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
     this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
@@ -29345,10 +29384,11 @@ var Outliner = class {
     const dx = dir ? dir[0] : b[0] - a[0];
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
-    const [L, R] = drawVertices(this.pen, d[0], d[1], this.opts.width, this.opts.height);
+    const nibMatrix = this.opts.deviceNib ? this.opts.matrix : void 0;
+    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);
-    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
+    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), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, 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]]);
@@ -29461,7 +29501,7 @@ var Outliner = class {
     const sv = this.capSide(s, from);
     const ev = this.capSide(s, to);
     if (cap === "square") {
-      const e0 = scale === 1 ? s.e : squareExtension(this.opts.width, s.pe[0], s.pe[1], scale, this.opts.height);
+      const e0 = scale === 1 ? s.e : squareExtension(this.opts.width, s.pe[0], s.pe[1], scale, this.opts.height, this.opts.deviceNib ? this.opts.matrix : void 0);
       const e = start ? [-e0[0], -e0[1]] : e0;
       this.push(p, [sv[0] + e[0], sv[1] + e[1]]);
       this.push(p, [ev[0] + e[0], ev[1] + e[1]]);
@@ -29641,7 +29681,7 @@ var Outliner = class {
     this.flush();
   }
 };
-function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric) {
+function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric, matrix) {
   const out = [];
   const dashes = [];
   for (let i = 0; i < pattern.length; i += 2) {
@@ -29661,8 +29701,9 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
     const [x0, y0] = P[i];
     const [x1, y1] = P[i + 1];
     const dir = [x1 - x0, y1 - y0];
-    const real = metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : Math.hypot(dir[0], dir[1]);
-    const len = metric ? real : wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    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]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -29706,7 +29747,35 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
   }
   return out;
 }
+function widenInLogicalSpace(path, opts, m) {
+  const [a, b, c, d] = m;
+  const det = a * d - b * c;
+  const inverse = (x, y) => [(d * x - c * y) / det, (-b * x + a * y) / det];
+  const logical = new GdiRasterPath();
+  for (const fig of path.figures) {
+    const pts = [];
+    for (let i = 0; i + 1 < fig.pts.length; i += 2) {
+      pts.push(...inverse(fig.pts[i], fig.pts[i + 1]));
+    }
+    const copy = { pts, closed: fig.closed, roundWiden: fig.roundWiden, curveSegs: fig.curveSegs };
+    if (fig.tangents) {
+      copy.tangents = new Map([...fig.tangents].map(([k, v]) => [k, inverse(v[0], v[1])]));
+    }
+    logical.figures.push(copy);
+  }
+  const outline = widenPath(logical, { ...opts, matrix: void 0, height: void 0 });
+  return outline.map((poly) => {
+    const out = [];
+    for (let i = 0; i + 1 < poly.length; i += 2) {
+      out.push(Math.round(a * poly[i] + c * poly[i + 1]), Math.round(b * poly[i] + d * poly[i + 1]));
+    }
+    return out;
+  });
+}
 function widenPath(path, opts) {
+  if (opts.matrix && !(opts.deviceNib && opts.join === "round")) {
+    return widenInLogicalSpace(path, opts, opts.matrix);
+  }
   const out = [];
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
@@ -29738,7 +29807,7 @@ function widenPath(path, opts) {
       const shorten = opts.cap === "flat" || opts.shortenDashes === false ? 0 : opts.dashMetric ? opts.width / opts.dashMetric[0] : opts.width;
       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)) {
+      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 = [];
@@ -30006,8 +30075,24 @@ function penWidenOptions(rCtx, opts = {}) {
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const ellipse = !rCtx.wholeDevicePixels && state.penWidth * Math.abs(matrix[0]) * 16 >= 1 && state.penWidth * Math.abs(matrix[3]) * 16 >= 1 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6 && Math.abs(Math.abs(matrix[0]) - Math.abs(matrix[3])) > 1e-6;
-  const dashes = state.penExtended ? ellipse ? geometricStyle(flags, state.penWidth, state.penUserStyle, 1) : geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
+  const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+  const rotatedOrSheared = Math.abs(matrix[1]) >= 1e-6 || Math.abs(matrix[2]) >= 1e-6;
+  const quarterTurn = Math.abs(matrix[0]) < 1e-9 && Math.abs(matrix[3]) < 1e-9;
+  const general = !rCtx.wholeDevicePixels && rotatedOrSheared && !quarterTurn && Math.abs(det) > 1e-9 && state.penWidth * Math.sqrt(Math.abs(det)) * 16 >= 1;
+  const dashes = state.penExtended ? ellipse || general ? geometricStyle(flags, state.penWidth, state.penUserStyle, 1) : geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
   const dashMetric = ellipse && dashes ? [Math.abs(matrix[0]), Math.abs(matrix[3])] : void 0;
+  if (general) {
+    return {
+      width: Math.round(state.penWidth * 16),
+      matrix: [matrix[0], matrix[1], matrix[2], matrix[3]],
+      deviceNib: true,
+      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",
+      miterLimit: state.miterLimit ?? 10,
+      dashes: dashes ? dashes.map((v) => v * 16) : null,
+      shortenDashes: (flags & 15) !== 7
+    };
+  }
   return {
     width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : widthPx) * 16),
     ...ellipse ? { height: Math.round(state.penWidth * Math.abs(matrix[3]) * 16) } : {},

package/dist/index.js

@@ -29239,11 +29239,42 @@ function penPolygon(width, height = width) {
   penCache.set(key, pen);
   return pen;
 }
-function drawVertices(pen, dx, dy, width = 1, height = width) {
+var matrixPenCache = /* @__PURE__ */ new Map();
+function penPolygonMatrix(width, m) {
+  const key = `${width},${m.join(",")}`;
+  const cached = matrixPenCache.get(key);
+  if (cached) {
+    return cached;
+  }
+  const r = Math.ceil(width / 2);
+  const mirror2 = m[0] * m[3] - m[1] * m[2] < 0 ? -1 : 1;
+  const bez = ellipseBeziers(-r, -r, r, r);
+  const dev = [];
+  for (let i = 0; i < 14; i += 2) {
+    const x = bez[i];
+    const y = bez[i + 1] * mirror2;
+    dev.push(Math.round(m[0] * x + m[2] * y), Math.round(m[1] * x + m[3] * y));
+  }
+  const f = flattenBezierPath(dev);
+  const half = [];
+  for (let i = 0; i + 1 < f.length; i += 2) {
+    half.push([f[i], f[i + 1]]);
+  }
+  half.pop();
+  const pen = [...half, ...half.map((p) => [0 - p[0] || 0, 0 - p[1] || 0])];
+  matrixPenCache.set(key, pen);
+  return pen;
+}
+function drawVertices(pen, dx, dy, width = 1, height = width, matrix) {
   const n = pen.length;
   const axisVertex = pen.some((q) => q[1] === 0);
-  const yMagnitude = Math.abs(dy) * (width === height ? 1 : width);
-  const xMagnitude = Math.abs(dx) * (width === height ? 2 : height);
+  let yMagnitude = Math.abs(dy) * (width === height ? 1 : width);
+  let xMagnitude = Math.abs(dx) * (width === height ? 2 : height);
+  if (matrix) {
+    const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+    xMagnitude = Math.abs((matrix[3] * dx - matrix[2] * dy) / det);
+    yMagnitude = Math.abs((-matrix[1] * dx + matrix[0] * dy) / det);
+  }
   const steep = yMagnitude > xMagnitude || yMagnitude === xMagnitude && axisVertex;
   const s = (steep ? dy < 0 : dx < 0 || dx === 0 && dy < 0) ? -1 : 1;
   let best = 0;
@@ -29263,7 +29294,7 @@ function drawVertices(pen, dx, dy, width = 1, height = width) {
 function halfPixel(v) {
   return Math.sign(v) * 8 * Math.floor((Math.abs(v) + 4) / 8);
 }
-function perpendicularVectors(width, dx0, dy0, height = width) {
+function perpendicularVectors(width, dx0, dy0, height = width, matrixPen) {
   let dx = dx0;
   let dy = dy0;
   const flip = dx < 0 || dx === 0 && dy < 0;
@@ -29271,7 +29302,7 @@ function perpendicularVectors(width, dx0, dy0, height = width) {
     dx = -dx;
     dy = -dy;
   }
-  const pen = penPolygon(width, height);
+  const pen = matrixPen ?? penPolygon(width, height);
   const n = pen.length;
   const nx = -dy;
   const ny = dx;
@@ -29310,7 +29341,15 @@ function perpendicularVectors(width, dx0, dy0, height = width) {
   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) {
+function squareExtension(width, dx, dy, scale = 1, height = width, matrix) {
+  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);
+    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)];
+  }
   const len = width === height ? Math.hypot(dx, dy) : Math.hypot(dx, dy * width / height);
   const r = width / 2 * scale;
   return [Math.floor(dx / len * r + 0.5), Math.floor(dy / len * r + 0.5)];
@@ -29333,7 +29372,7 @@ var Outliner = class {
     this.opts = opts;
     this.out = out;
     this.pts = [];
-    this.pen = penPolygon(opts.width, opts.height);
+    this.pen = opts.matrix && opts.deviceNib ? penPolygonMatrix(opts.width, opts.matrix) : penPolygon(opts.width, opts.height);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
     this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
@@ -29348,10 +29387,11 @@ var Outliner = class {
     const dx = dir ? dir[0] : b[0] - a[0];
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
-    const [L, R] = drawVertices(this.pen, d[0], d[1], this.opts.width, this.opts.height);
+    const nibMatrix = this.opts.deviceNib ? this.opts.matrix : void 0;
+    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);
-    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
+    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), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, 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]]);
@@ -29464,7 +29504,7 @@ var Outliner = class {
     const sv = this.capSide(s, from);
     const ev = this.capSide(s, to);
     if (cap === "square") {
-      const e0 = scale === 1 ? s.e : squareExtension(this.opts.width, s.pe[0], s.pe[1], scale, this.opts.height);
+      const e0 = scale === 1 ? s.e : squareExtension(this.opts.width, s.pe[0], s.pe[1], scale, this.opts.height, this.opts.deviceNib ? this.opts.matrix : void 0);
       const e = start ? [-e0[0], -e0[1]] : e0;
       this.push(p, [sv[0] + e[0], sv[1] + e[1]]);
       this.push(p, [ev[0] + e[0], ev[1] + e[1]]);
@@ -29644,7 +29684,7 @@ var Outliner = class {
     this.flush();
   }
 };
-function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric) {
+function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric, matrix) {
   const out = [];
   const dashes = [];
   for (let i = 0; i < pattern.length; i += 2) {
@@ -29664,8 +29704,9 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
     const [x0, y0] = P[i];
     const [x1, y1] = P[i + 1];
     const dir = [x1 - x0, y1 - y0];
-    const real = metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : Math.hypot(dir[0], dir[1]);
-    const len = metric ? real : wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    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]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -29709,7 +29750,35 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
   }
   return out;
 }
+function widenInLogicalSpace(path, opts, m) {
+  const [a, b, c, d] = m;
+  const det = a * d - b * c;
+  const inverse = (x, y) => [(d * x - c * y) / det, (-b * x + a * y) / det];
+  const logical = new GdiRasterPath();
+  for (const fig of path.figures) {
+    const pts = [];
+    for (let i = 0; i + 1 < fig.pts.length; i += 2) {
+      pts.push(...inverse(fig.pts[i], fig.pts[i + 1]));
+    }
+    const copy = { pts, closed: fig.closed, roundWiden: fig.roundWiden, curveSegs: fig.curveSegs };
+    if (fig.tangents) {
+      copy.tangents = new Map([...fig.tangents].map(([k, v]) => [k, inverse(v[0], v[1])]));
+    }
+    logical.figures.push(copy);
+  }
+  const outline = widenPath(logical, { ...opts, matrix: void 0, height: void 0 });
+  return outline.map((poly) => {
+    const out = [];
+    for (let i = 0; i + 1 < poly.length; i += 2) {
+      out.push(Math.round(a * poly[i] + c * poly[i + 1]), Math.round(b * poly[i] + d * poly[i + 1]));
+    }
+    return out;
+  });
+}
 function widenPath(path, opts) {
+  if (opts.matrix && !(opts.deviceNib && opts.join === "round")) {
+    return widenInLogicalSpace(path, opts, opts.matrix);
+  }
   const out = [];
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
@@ -29741,7 +29810,7 @@ function widenPath(path, opts) {
       const shorten = opts.cap === "flat" || opts.shortenDashes === false ? 0 : opts.dashMetric ? opts.width / opts.dashMetric[0] : opts.width;
       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)) {
+      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 = [];
@@ -30009,8 +30078,24 @@ function penWidenOptions(rCtx, opts = {}) {
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const ellipse = !rCtx.wholeDevicePixels && state.penWidth * Math.abs(matrix[0]) * 16 >= 1 && state.penWidth * Math.abs(matrix[3]) * 16 >= 1 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6 && Math.abs(Math.abs(matrix[0]) - Math.abs(matrix[3])) > 1e-6;
-  const dashes = state.penExtended ? ellipse ? geometricStyle(flags, state.penWidth, state.penUserStyle, 1) : geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
+  const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+  const rotatedOrSheared = Math.abs(matrix[1]) >= 1e-6 || Math.abs(matrix[2]) >= 1e-6;
+  const quarterTurn = Math.abs(matrix[0]) < 1e-9 && Math.abs(matrix[3]) < 1e-9;
+  const general = !rCtx.wholeDevicePixels && rotatedOrSheared && !quarterTurn && Math.abs(det) > 1e-9 && state.penWidth * Math.sqrt(Math.abs(det)) * 16 >= 1;
+  const dashes = state.penExtended ? ellipse || general ? geometricStyle(flags, state.penWidth, state.penUserStyle, 1) : geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
   const dashMetric = ellipse && dashes ? [Math.abs(matrix[0]), Math.abs(matrix[3])] : void 0;
+  if (general) {
+    return {
+      width: Math.round(state.penWidth * 16),
+      matrix: [matrix[0], matrix[1], matrix[2], matrix[3]],
+      deviceNib: true,
+      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",
+      miterLimit: state.miterLimit ?? 10,
+      dashes: dashes ? dashes.map((v) => v * 16) : null,
+      shortenDashes: (flags & 15) !== 7
+    };
+  }
   return {
     width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : widthPx) * 16),
     ...ellipse ? { height: Math.round(state.penWidth * Math.abs(matrix[3]) * 16) } : {},

package/dist/index.mjs

@@ -29237,11 +29237,42 @@ function penPolygon(width, height = width) {
   penCache.set(key, pen);
   return pen;
 }
-function drawVertices(pen, dx, dy, width = 1, height = width) {
+var matrixPenCache = /* @__PURE__ */ new Map();
+function penPolygonMatrix(width, m) {
+  const key = `${width},${m.join(",")}`;
+  const cached = matrixPenCache.get(key);
+  if (cached) {
+    return cached;
+  }
+  const r = Math.ceil(width / 2);
+  const mirror2 = m[0] * m[3] - m[1] * m[2] < 0 ? -1 : 1;
+  const bez = ellipseBeziers(-r, -r, r, r);
+  const dev = [];
+  for (let i = 0; i < 14; i += 2) {
+    const x = bez[i];
+    const y = bez[i + 1] * mirror2;
+    dev.push(Math.round(m[0] * x + m[2] * y), Math.round(m[1] * x + m[3] * y));
+  }
+  const f = flattenBezierPath(dev);
+  const half = [];
+  for (let i = 0; i + 1 < f.length; i += 2) {
+    half.push([f[i], f[i + 1]]);
+  }
+  half.pop();
+  const pen = [...half, ...half.map((p) => [0 - p[0] || 0, 0 - p[1] || 0])];
+  matrixPenCache.set(key, pen);
+  return pen;
+}
+function drawVertices(pen, dx, dy, width = 1, height = width, matrix) {
   const n = pen.length;
   const axisVertex = pen.some((q) => q[1] === 0);
-  const yMagnitude = Math.abs(dy) * (width === height ? 1 : width);
-  const xMagnitude = Math.abs(dx) * (width === height ? 2 : height);
+  let yMagnitude = Math.abs(dy) * (width === height ? 1 : width);
+  let xMagnitude = Math.abs(dx) * (width === height ? 2 : height);
+  if (matrix) {
+    const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+    xMagnitude = Math.abs((matrix[3] * dx - matrix[2] * dy) / det);
+    yMagnitude = Math.abs((-matrix[1] * dx + matrix[0] * dy) / det);
+  }
   const steep = yMagnitude > xMagnitude || yMagnitude === xMagnitude && axisVertex;
   const s = (steep ? dy < 0 : dx < 0 || dx === 0 && dy < 0) ? -1 : 1;
   let best = 0;
@@ -29261,7 +29292,7 @@ function drawVertices(pen, dx, dy, width = 1, height = width) {
 function halfPixel(v) {
   return Math.sign(v) * 8 * Math.floor((Math.abs(v) + 4) / 8);
 }
-function perpendicularVectors(width, dx0, dy0, height = width) {
+function perpendicularVectors(width, dx0, dy0, height = width, matrixPen) {
   let dx = dx0;
   let dy = dy0;
   const flip = dx < 0 || dx === 0 && dy < 0;
@@ -29269,7 +29300,7 @@ function perpendicularVectors(width, dx0, dy0, height = width) {
     dx = -dx;
     dy = -dy;
   }
-  const pen = penPolygon(width, height);
+  const pen = matrixPen ?? penPolygon(width, height);
   const n = pen.length;
   const nx = -dy;
   const ny = dx;
@@ -29308,7 +29339,15 @@ function perpendicularVectors(width, dx0, dy0, height = width) {
   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) {
+function squareExtension(width, dx, dy, scale = 1, height = width, matrix) {
+  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);
+    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)];
+  }
   const len = width === height ? Math.hypot(dx, dy) : Math.hypot(dx, dy * width / height);
   const r = width / 2 * scale;
   return [Math.floor(dx / len * r + 0.5), Math.floor(dy / len * r + 0.5)];
@@ -29331,7 +29370,7 @@ var Outliner = class {
     this.opts = opts;
     this.out = out;
     this.pts = [];
-    this.pen = penPolygon(opts.width, opts.height);
+    this.pen = opts.matrix && opts.deviceNib ? penPolygonMatrix(opts.width, opts.matrix) : penPolygon(opts.width, opts.height);
     this.n = this.pen.length;
     this.rr = opts.cap === "round" && opts.join === "round";
     this.originalRoundJoinSides = opts.join === "round" && opts.cap !== "flat";
@@ -29346,10 +29385,11 @@ var Outliner = class {
     const dx = dir ? dir[0] : b[0] - a[0];
     const dy = dir ? dir[1] : b[1] - a[1];
     const d = drawDir ?? [dx, dy];
-    const [L, R] = drawVertices(this.pen, d[0], d[1], this.opts.width, this.opts.height);
+    const nibMatrix = this.opts.deviceNib ? this.opts.matrix : void 0;
+    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);
-    return { dx, dy, L, R, v: vectors.v, vRaw: vectors.ray, e: squareExtension(this.opts.width, perpendicular[0], perpendicular[1], 1, this.opts.height), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, tangentLength: drawDir ? drawDir[0] * drawDir[0] + drawDir[1] * drawDir[1] : 0, curve };
+    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), pe: [perpendicular[0], perpendicular[1]], curveEnd: !!drawDir, 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]]);
@@ -29462,7 +29502,7 @@ var Outliner = class {
     const sv = this.capSide(s, from);
     const ev = this.capSide(s, to);
     if (cap === "square") {
-      const e0 = scale === 1 ? s.e : squareExtension(this.opts.width, s.pe[0], s.pe[1], scale, this.opts.height);
+      const e0 = scale === 1 ? s.e : squareExtension(this.opts.width, s.pe[0], s.pe[1], scale, this.opts.height, this.opts.deviceNib ? this.opts.matrix : void 0);
       const e = start ? [-e0[0], -e0[1]] : e0;
       this.push(p, [sv[0] + e[0], sv[1] + e[1]]);
       this.push(p, [ev[0] + e[0], ev[1] + e[1]]);
@@ -29642,7 +29682,7 @@ var Outliner = class {
     this.flush();
   }
 };
-function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric) {
+function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric, matrix) {
   const out = [];
   const dashes = [];
   for (let i = 0; i < pattern.length; i += 2) {
@@ -29662,8 +29702,9 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
     const [x0, y0] = P[i];
     const [x1, y1] = P[i + 1];
     const dir = [x1 - x0, y1 - y0];
-    const real = metric ? Math.hypot(dir[0] / metric[0], dir[1] / metric[1]) : Math.hypot(dir[0], dir[1]);
-    const len = metric ? real : wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    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]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -29707,7 +29748,35 @@ function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors
   }
   return out;
 }
+function widenInLogicalSpace(path, opts, m) {
+  const [a, b, c, d] = m;
+  const det = a * d - b * c;
+  const inverse = (x, y) => [(d * x - c * y) / det, (-b * x + a * y) / det];
+  const logical = new GdiRasterPath();
+  for (const fig of path.figures) {
+    const pts = [];
+    for (let i = 0; i + 1 < fig.pts.length; i += 2) {
+      pts.push(...inverse(fig.pts[i], fig.pts[i + 1]));
+    }
+    const copy = { pts, closed: fig.closed, roundWiden: fig.roundWiden, curveSegs: fig.curveSegs };
+    if (fig.tangents) {
+      copy.tangents = new Map([...fig.tangents].map(([k, v]) => [k, inverse(v[0], v[1])]));
+    }
+    logical.figures.push(copy);
+  }
+  const outline = widenPath(logical, { ...opts, matrix: void 0, height: void 0 });
+  return outline.map((poly) => {
+    const out = [];
+    for (let i = 0; i + 1 < poly.length; i += 2) {
+      out.push(Math.round(a * poly[i] + c * poly[i + 1]), Math.round(b * poly[i] + d * poly[i + 1]));
+    }
+    return out;
+  });
+}
 function widenPath(path, opts) {
+  if (opts.matrix && !(opts.deviceNib && opts.join === "round")) {
+    return widenInLogicalSpace(path, opts, opts.matrix);
+  }
   const out = [];
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
@@ -29739,7 +29808,7 @@ function widenPath(path, opts) {
       const shorten = opts.cap === "flat" || opts.shortenDashes === false ? 0 : opts.dashMetric ? opts.width / opts.dashMetric[0] : opts.width;
       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)) {
+      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 = [];
@@ -30007,8 +30076,24 @@ function penWidenOptions(rCtx, opts = {}) {
   const capBits = flags & 3840;
   const joinBits = flags & 61440;
   const ellipse = !rCtx.wholeDevicePixels && state.penWidth * Math.abs(matrix[0]) * 16 >= 1 && state.penWidth * Math.abs(matrix[3]) * 16 >= 1 && Math.abs(matrix[1]) < 1e-6 && Math.abs(matrix[2]) < 1e-6 && Math.abs(Math.abs(matrix[0]) - Math.abs(matrix[3])) > 1e-6;
-  const dashes = state.penExtended ? ellipse ? geometricStyle(flags, state.penWidth, state.penUserStyle, 1) : geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
+  const det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+  const rotatedOrSheared = Math.abs(matrix[1]) >= 1e-6 || Math.abs(matrix[2]) >= 1e-6;
+  const quarterTurn = Math.abs(matrix[0]) < 1e-9 && Math.abs(matrix[3]) < 1e-9;
+  const general = !rCtx.wholeDevicePixels && rotatedOrSheared && !quarterTurn && Math.abs(det) > 1e-9 && state.penWidth * Math.sqrt(Math.abs(det)) * 16 >= 1;
+  const dashes = state.penExtended ? ellipse || general ? geometricStyle(flags, state.penWidth, state.penUserStyle, 1) : geometricStyle(flags, widthPx, state.penUserStyle, widthPx / (state.penWidth || 1)) : null;
   const dashMetric = ellipse && dashes ? [Math.abs(matrix[0]), Math.abs(matrix[3])] : void 0;
+  if (general) {
+    return {
+      width: Math.round(state.penWidth * 16),
+      matrix: [matrix[0], matrix[1], matrix[2], matrix[3]],
+      deviceNib: true,
+      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",
+      miterLimit: state.miterLimit ?? 10,
+      dashes: dashes ? dashes.map((v) => v * 16) : null,
+      shortenDashes: (flags & 15) !== 7
+    };
+  }
   return {
     width: Math.round((ellipse ? state.penWidth * Math.abs(matrix[0]) : widthPx) * 16),
     ...ellipse ? { height: Math.round(state.penWidth * Math.abs(matrix[3]) * 16) } : {},

package/package.json

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