npm - emf-converter - Versions diffs - 4.9.0 → 4.10.0 - Mend

emf-converter 4.9.0 → 4.10.0

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

Files changed (5) hide show

package/dist/browser.js CHANGED Viewed

@@ -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) {
@@ -30008,8 +30036,23 @@ 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 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) } : {},

package/dist/browser.mjs CHANGED Viewed

@@ -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) {
@@ -30006,8 +30034,23 @@ 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 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) } : {},

package/dist/index.js CHANGED Viewed

@@ -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) {
@@ -30009,8 +30037,23 @@ 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 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) } : {},

package/dist/index.mjs CHANGED Viewed

@@ -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) {
@@ -30007,8 +30035,23 @@ 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 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) } : {},

package/package.json CHANGED Viewed

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