emf-converter 4.8.21 → 4.10.0

package/dist/browser.js

@@ -29643,7 +29643,7 @@ var Outliner = class {
     this.flush();
   }
 };
-function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors) {
+function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric) {
   const out = [];
   const dashes = [];
   for (let i = 0; i < pattern.length; i += 2) {
@@ -29663,8 +29663,8 @@ 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 = Math.hypot(dir[0], dir[1]);
-    const len = wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    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]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -29708,7 +29708,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) {
+    return widenInLogicalSpace(path, opts, opts.matrix);
+  }
   const out = [];
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
@@ -29737,10 +29765,10 @@ function widenPath(path, opts) {
     }
     if (dashed) {
       const run = closed ? [...P, P[0]] : P;
-      const shorten = opts.cap === "flat" || opts.shortenDashes === false ? 0 : opts.width;
+      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)) {
+      for (const piece of dashPieces(run, runTangents, runCurves, opts.dashes, shorten, !!opts.wholePixelDashVectors, opts.dashMetric)) {
         const pts = [piece.pts[0]];
         const pdirs = [];
         const pdraws = [];
@@ -30007,8 +30035,24 @@ function penWidenOptions(rCtx, opts = {}) {
   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;
-  const ellipse = !dashes && !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 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 det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+  const rotatedOrSheared = Math.abs(matrix[1]) >= 1e-6 || Math.abs(matrix[2]) >= 1e-6;
+  const similar = Math.abs(matrix[0] - matrix[3]) < 1e-6 && Math.abs(matrix[1] + matrix[2]) < 1e-6 || Math.abs(matrix[0] + matrix[3]) < 1e-6 && Math.abs(matrix[1] - matrix[2]) < 1e-6;
+  const general = !rCtx.wholeDevicePixels && rotatedOrSheared && !similar && 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]],
+      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) } : {},
@@ -30016,6 +30060,7 @@ 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,
+    ...dashMetric ? { dashMetric } : {},
     shortenDashes: (flags & 15) !== 7,
     // One logical unit per device pixel, unrotated: GDI measures dash
     // segments in whole pixels.

package/dist/browser.mjs

@@ -29641,7 +29641,7 @@ var Outliner = class {
     this.flush();
   }
 };
-function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors) {
+function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric) {
   const out = [];
   const dashes = [];
   for (let i = 0; i < pattern.length; i += 2) {
@@ -29661,8 +29661,8 @@ 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 = Math.hypot(dir[0], dir[1]);
-    const len = wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    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]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -29706,7 +29706,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) {
+    return widenInLogicalSpace(path, opts, opts.matrix);
+  }
   const out = [];
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
@@ -29735,10 +29763,10 @@ function widenPath(path, opts) {
     }
     if (dashed) {
       const run = closed ? [...P, P[0]] : P;
-      const shorten = opts.cap === "flat" || opts.shortenDashes === false ? 0 : opts.width;
+      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)) {
+      for (const piece of dashPieces(run, runTangents, runCurves, opts.dashes, shorten, !!opts.wholePixelDashVectors, opts.dashMetric)) {
         const pts = [piece.pts[0]];
         const pdirs = [];
         const pdraws = [];
@@ -30005,8 +30033,24 @@ function penWidenOptions(rCtx, opts = {}) {
   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;
-  const ellipse = !dashes && !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 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 det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+  const rotatedOrSheared = Math.abs(matrix[1]) >= 1e-6 || Math.abs(matrix[2]) >= 1e-6;
+  const similar = Math.abs(matrix[0] - matrix[3]) < 1e-6 && Math.abs(matrix[1] + matrix[2]) < 1e-6 || Math.abs(matrix[0] + matrix[3]) < 1e-6 && Math.abs(matrix[1] - matrix[2]) < 1e-6;
+  const general = !rCtx.wholeDevicePixels && rotatedOrSheared && !similar && 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]],
+      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) } : {},
@@ -30014,6 +30058,7 @@ 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,
+    ...dashMetric ? { dashMetric } : {},
     shortenDashes: (flags & 15) !== 7,
     // One logical unit per device pixel, unrotated: GDI measures dash
     // segments in whole pixels.

package/dist/index.js

@@ -29644,7 +29644,7 @@ var Outliner = class {
     this.flush();
   }
 };
-function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors) {
+function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric) {
   const out = [];
   const dashes = [];
   for (let i = 0; i < pattern.length; i += 2) {
@@ -29664,8 +29664,8 @@ 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 = Math.hypot(dir[0], dir[1]);
-    const len = wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    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]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -29709,7 +29709,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) {
+    return widenInLogicalSpace(path, opts, opts.matrix);
+  }
   const out = [];
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
@@ -29738,10 +29766,10 @@ function widenPath(path, opts) {
     }
     if (dashed) {
       const run = closed ? [...P, P[0]] : P;
-      const shorten = opts.cap === "flat" || opts.shortenDashes === false ? 0 : opts.width;
+      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)) {
+      for (const piece of dashPieces(run, runTangents, runCurves, opts.dashes, shorten, !!opts.wholePixelDashVectors, opts.dashMetric)) {
         const pts = [piece.pts[0]];
         const pdirs = [];
         const pdraws = [];
@@ -30008,8 +30036,24 @@ function penWidenOptions(rCtx, opts = {}) {
   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;
-  const ellipse = !dashes && !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 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 det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+  const rotatedOrSheared = Math.abs(matrix[1]) >= 1e-6 || Math.abs(matrix[2]) >= 1e-6;
+  const similar = Math.abs(matrix[0] - matrix[3]) < 1e-6 && Math.abs(matrix[1] + matrix[2]) < 1e-6 || Math.abs(matrix[0] + matrix[3]) < 1e-6 && Math.abs(matrix[1] - matrix[2]) < 1e-6;
+  const general = !rCtx.wholeDevicePixels && rotatedOrSheared && !similar && 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]],
+      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) } : {},
@@ -30017,6 +30061,7 @@ 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,
+    ...dashMetric ? { dashMetric } : {},
     shortenDashes: (flags & 15) !== 7,
     // One logical unit per device pixel, unrotated: GDI measures dash
     // segments in whole pixels.

package/dist/index.mjs

@@ -29642,7 +29642,7 @@ var Outliner = class {
     this.flush();
   }
 };
-function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors) {
+function dashPieces(P, tangents, curveFlags, pattern, shorten, wholePixelVectors, metric) {
   const out = [];
   const dashes = [];
   for (let i = 0; i < pattern.length; i += 2) {
@@ -29662,8 +29662,8 @@ 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 = Math.hypot(dir[0], dir[1]);
-    const len = wholePixelVectors ? Math.hypot(Math.floor(dir[0] / 16), Math.floor(dir[1] / 16)) * 16 : Math.hypot(dir[0], dir[1]);
+    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]);
     if (len === 0) {
       if (on && cur) {
         cur.pts.push(P[i + 1]);
@@ -29707,7 +29707,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) {
+    return widenInLogicalSpace(path, opts, opts.matrix);
+  }
   const out = [];
   const dashed = !!opts.dashes && opts.dashes.length > 0;
   for (const fig of path.figures) {
@@ -29736,10 +29764,10 @@ function widenPath(path, opts) {
     }
     if (dashed) {
       const run = closed ? [...P, P[0]] : P;
-      const shorten = opts.cap === "flat" || opts.shortenDashes === false ? 0 : opts.width;
+      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)) {
+      for (const piece of dashPieces(run, runTangents, runCurves, opts.dashes, shorten, !!opts.wholePixelDashVectors, opts.dashMetric)) {
         const pts = [piece.pts[0]];
         const pdirs = [];
         const pdraws = [];
@@ -30006,8 +30034,24 @@ function penWidenOptions(rCtx, opts = {}) {
   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;
-  const ellipse = !dashes && !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 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 det = matrix[0] * matrix[3] - matrix[1] * matrix[2];
+  const rotatedOrSheared = Math.abs(matrix[1]) >= 1e-6 || Math.abs(matrix[2]) >= 1e-6;
+  const similar = Math.abs(matrix[0] - matrix[3]) < 1e-6 && Math.abs(matrix[1] + matrix[2]) < 1e-6 || Math.abs(matrix[0] + matrix[3]) < 1e-6 && Math.abs(matrix[1] - matrix[2]) < 1e-6;
+  const general = !rCtx.wholeDevicePixels && rotatedOrSheared && !similar && 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]],
+      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) } : {},
@@ -30015,6 +30059,7 @@ 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,
+    ...dashMetric ? { dashMetric } : {},
     shortenDashes: (flags & 15) !== 7,
     // One logical unit per device pixel, unrotated: GDI measures dash
     // segments in whole pixels.

package/package.json

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