emf-converter 4.6.6 → 4.6.7

package/dist/browser.js

@@ -28827,6 +28827,20 @@ var FLAT_SECTOR_BIAS = {
 function sectorBias(code) {
   return code >= 97 ? (code - 97) / 2 - 1.5 : (code - 65) / 2 - 1.5 - 1 / 64;
 }
+var VERTICAL_STEP_EARLY = "120002002002002002202200200200200220220020000022222220000002222220000002222220000";
+var VERTICAL_STEP_FIRST = 7;
+function verticalSideOffset(width) {
+  if (width < HOBBY_LIMIT || width > 1400) {
+    return void 0;
+  }
+  let m = VERTICAL_STEP_FIRST;
+  for (let i = 1; i < VERTICAL_STEP_EARLY.length; i++) {
+    if (width >= 16 * (i + VERTICAL_STEP_FIRST) - 7 - +VERTICAL_STEP_EARLY[i]) {
+      m = i + VERTICAL_STEP_FIRST;
+    }
+  }
+  return 8 * m;
+}
 var penCache = /* @__PURE__ */ new Map();
 function penPolygon(width) {
   const cached = penCache.get(width);
@@ -28839,7 +28853,7 @@ function penPolygon(width) {
     pen = HOBBY[n - 1];
   } else {
     const rx = Math.ceil(width / 2);
-    const ry = 8 * Math.floor((width + 9) / 16);
+    const ry = rx;
     const f = flattenBezierPath(ellipseBeziers(-rx, -ry, rx, ry));
     const half = [];
     for (let i = 0; i + 1 < f.length; i += 2) {
@@ -28917,7 +28931,8 @@ function perpendicularVectors(width, dx0, dy0) {
       cy = sectorBias(pair.charCodeAt(1));
     }
   }
-  const vx = r(x + cx), vy = r(y + cy);
+  const side = dx === 0 ? verticalSideOffset(width) : void 0;
+  const vx = side === void 0 ? r(x + cx) : -side, vy = r(y + cy);
   return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
 function squareExtension(width, dx, dy) {
@@ -29571,6 +29586,14 @@ function brushPaint2(rCtx) {
     ...state.bkMode === 1 && state.brushPattern?.kind === "hatch" ? { skip: hatchBackgroundMask(state.brushPattern.hatch) } : {}
   };
 }
+function withoutCurveTangents(path) {
+  if (!path.figures.some((f) => f.tangents)) {
+    return path;
+  }
+  const plain = new GdiRasterPath();
+  plain.figures = path.figures.map((f) => ({ pts: f.pts, closed: f.closed, roundWiden: f.roundWiden }));
+  return plain;
+}
 function layoutRasterPath(rCtx, path, boxShape = false) {
   if (!rCtx.wmfLayoutRtl || boxShape) return path;
   const shift = Math.round(16 * (rCtx.wholeDevicePixels?.[0] ?? 1));
@@ -29581,9 +29604,11 @@ function layoutRasterPath(rCtx, path, boxShape = false) {
 function paintRasterPath(rCtx, path, opts) {
   path = layoutRasterPath(rCtx, path, opts.rectangle || opts.roundPen);
   const { ctx, state } = rCtx;
+  let filled = !!opts.filled;
   if (opts.fill) {
     const paint = brushPaint2(rCtx);
     if (paint) {
+      filled = true;
       const fillPath = opts.fillPath ? layoutRasterPath(rCtx, opts.fillPath, opts.rectangle || opts.roundPen) : path;
       const spans = fillPathSpans(fillPath, !!opts.winding);
       paintSpansDeferred(rCtx, spans, paint, state.rop2);
@@ -29596,7 +29621,7 @@ function paintRasterPath(rCtx, path, opts) {
     if (!penIsWidened(rCtx)) {
       return false;
     }
-    const polys = widenPath(path, penWidenOptions(rCtx, opts));
+    const polys = widenPath(filled ? withoutCurveTangents(path) : path, penWidenOptions(rCtx, opts));
     paintSpansDeferred(rCtx, fillPolygonSpans(polys, true), { kind: "solid", rgb: rgbOf(state.penColor) }, state.rop2);
     return true;
   }
@@ -29913,7 +29938,7 @@ function paintGdiShape(rCtx, shape) {
     return;
   }
   if ((cosmetic || penIsWidened(rCtx)) && (aliased || bitwise)) {
-    paintRasterPath(rCtx, getPath(), { fill: false, stroke: true, style: shape.style, rectangle: shape.rectangle, roundPen: shape.roundPen });
+    paintRasterPath(rCtx, getPath(), { fill: false, stroke: true, style: shape.style, rectangle: shape.rectangle, roundPen: shape.roundPen, filled: !!shape.fill && state.brushStyle !== 1 });
     return;
   }
   const pattern = cosmeticPattern(rCtx);
@@ -38818,7 +38843,7 @@ function compatCorner(p, w, h, box) {
   if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
     const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
-    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+    return [Math.floor(Math.min(cw, width + penWidth) * width / (width + penWidth)), Math.floor(Math.min(ch, height + penWidth) * height / (height + penWidth))];
   }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;

package/dist/browser.mjs

@@ -28825,6 +28825,20 @@ var FLAT_SECTOR_BIAS = {
 function sectorBias(code) {
   return code >= 97 ? (code - 97) / 2 - 1.5 : (code - 65) / 2 - 1.5 - 1 / 64;
 }
+var VERTICAL_STEP_EARLY = "120002002002002002202200200200200220220020000022222220000002222220000002222220000";
+var VERTICAL_STEP_FIRST = 7;
+function verticalSideOffset(width) {
+  if (width < HOBBY_LIMIT || width > 1400) {
+    return void 0;
+  }
+  let m = VERTICAL_STEP_FIRST;
+  for (let i = 1; i < VERTICAL_STEP_EARLY.length; i++) {
+    if (width >= 16 * (i + VERTICAL_STEP_FIRST) - 7 - +VERTICAL_STEP_EARLY[i]) {
+      m = i + VERTICAL_STEP_FIRST;
+    }
+  }
+  return 8 * m;
+}
 var penCache = /* @__PURE__ */ new Map();
 function penPolygon(width) {
   const cached = penCache.get(width);
@@ -28837,7 +28851,7 @@ function penPolygon(width) {
     pen = HOBBY[n - 1];
   } else {
     const rx = Math.ceil(width / 2);
-    const ry = 8 * Math.floor((width + 9) / 16);
+    const ry = rx;
     const f = flattenBezierPath(ellipseBeziers(-rx, -ry, rx, ry));
     const half = [];
     for (let i = 0; i + 1 < f.length; i += 2) {
@@ -28915,7 +28929,8 @@ function perpendicularVectors(width, dx0, dy0) {
       cy = sectorBias(pair.charCodeAt(1));
     }
   }
-  const vx = r(x + cx), vy = r(y + cy);
+  const side = dx === 0 ? verticalSideOffset(width) : void 0;
+  const vx = side === void 0 ? r(x + cx) : -side, vy = r(y + cy);
   return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
 function squareExtension(width, dx, dy) {
@@ -29569,6 +29584,14 @@ function brushPaint2(rCtx) {
     ...state.bkMode === 1 && state.brushPattern?.kind === "hatch" ? { skip: hatchBackgroundMask(state.brushPattern.hatch) } : {}
   };
 }
+function withoutCurveTangents(path) {
+  if (!path.figures.some((f) => f.tangents)) {
+    return path;
+  }
+  const plain = new GdiRasterPath();
+  plain.figures = path.figures.map((f) => ({ pts: f.pts, closed: f.closed, roundWiden: f.roundWiden }));
+  return plain;
+}
 function layoutRasterPath(rCtx, path, boxShape = false) {
   if (!rCtx.wmfLayoutRtl || boxShape) return path;
   const shift = Math.round(16 * (rCtx.wholeDevicePixels?.[0] ?? 1));
@@ -29579,9 +29602,11 @@ function layoutRasterPath(rCtx, path, boxShape = false) {
 function paintRasterPath(rCtx, path, opts) {
   path = layoutRasterPath(rCtx, path, opts.rectangle || opts.roundPen);
   const { ctx, state } = rCtx;
+  let filled = !!opts.filled;
   if (opts.fill) {
     const paint = brushPaint2(rCtx);
     if (paint) {
+      filled = true;
       const fillPath = opts.fillPath ? layoutRasterPath(rCtx, opts.fillPath, opts.rectangle || opts.roundPen) : path;
       const spans = fillPathSpans(fillPath, !!opts.winding);
       paintSpansDeferred(rCtx, spans, paint, state.rop2);
@@ -29594,7 +29619,7 @@ function paintRasterPath(rCtx, path, opts) {
     if (!penIsWidened(rCtx)) {
       return false;
     }
-    const polys = widenPath(path, penWidenOptions(rCtx, opts));
+    const polys = widenPath(filled ? withoutCurveTangents(path) : path, penWidenOptions(rCtx, opts));
     paintSpansDeferred(rCtx, fillPolygonSpans(polys, true), { kind: "solid", rgb: rgbOf(state.penColor) }, state.rop2);
     return true;
   }
@@ -29911,7 +29936,7 @@ function paintGdiShape(rCtx, shape) {
     return;
   }
   if ((cosmetic || penIsWidened(rCtx)) && (aliased || bitwise)) {
-    paintRasterPath(rCtx, getPath(), { fill: false, stroke: true, style: shape.style, rectangle: shape.rectangle, roundPen: shape.roundPen });
+    paintRasterPath(rCtx, getPath(), { fill: false, stroke: true, style: shape.style, rectangle: shape.rectangle, roundPen: shape.roundPen, filled: !!shape.fill && state.brushStyle !== 1 });
     return;
   }
   const pattern = cosmeticPattern(rCtx);
@@ -38816,7 +38841,7 @@ function compatCorner(p, w, h, box) {
   if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
     const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
-    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+    return [Math.floor(Math.min(cw, width + penWidth) * width / (width + penWidth)), Math.floor(Math.min(ch, height + penWidth) * height / (height + penWidth))];
   }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;

package/dist/index.js

@@ -28828,6 +28828,20 @@ var FLAT_SECTOR_BIAS = {
 function sectorBias(code) {
   return code >= 97 ? (code - 97) / 2 - 1.5 : (code - 65) / 2 - 1.5 - 1 / 64;
 }
+var VERTICAL_STEP_EARLY = "120002002002002002202200200200200220220020000022222220000002222220000002222220000";
+var VERTICAL_STEP_FIRST = 7;
+function verticalSideOffset(width) {
+  if (width < HOBBY_LIMIT || width > 1400) {
+    return void 0;
+  }
+  let m = VERTICAL_STEP_FIRST;
+  for (let i = 1; i < VERTICAL_STEP_EARLY.length; i++) {
+    if (width >= 16 * (i + VERTICAL_STEP_FIRST) - 7 - +VERTICAL_STEP_EARLY[i]) {
+      m = i + VERTICAL_STEP_FIRST;
+    }
+  }
+  return 8 * m;
+}
 var penCache = /* @__PURE__ */ new Map();
 function penPolygon(width) {
   const cached = penCache.get(width);
@@ -28840,7 +28854,7 @@ function penPolygon(width) {
     pen = HOBBY[n - 1];
   } else {
     const rx = Math.ceil(width / 2);
-    const ry = 8 * Math.floor((width + 9) / 16);
+    const ry = rx;
     const f = flattenBezierPath(ellipseBeziers(-rx, -ry, rx, ry));
     const half = [];
     for (let i = 0; i + 1 < f.length; i += 2) {
@@ -28918,7 +28932,8 @@ function perpendicularVectors(width, dx0, dy0) {
       cy = sectorBias(pair.charCodeAt(1));
     }
   }
-  const vx = r(x + cx), vy = r(y + cy);
+  const side = dx === 0 ? verticalSideOffset(width) : void 0;
+  const vx = side === void 0 ? r(x + cx) : -side, vy = r(y + cy);
   return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
 function squareExtension(width, dx, dy) {
@@ -29572,6 +29587,14 @@ function brushPaint2(rCtx) {
     ...state.bkMode === 1 && state.brushPattern?.kind === "hatch" ? { skip: hatchBackgroundMask(state.brushPattern.hatch) } : {}
   };
 }
+function withoutCurveTangents(path) {
+  if (!path.figures.some((f) => f.tangents)) {
+    return path;
+  }
+  const plain = new GdiRasterPath();
+  plain.figures = path.figures.map((f) => ({ pts: f.pts, closed: f.closed, roundWiden: f.roundWiden }));
+  return plain;
+}
 function layoutRasterPath(rCtx, path, boxShape = false) {
   if (!rCtx.wmfLayoutRtl || boxShape) return path;
   const shift = Math.round(16 * (rCtx.wholeDevicePixels?.[0] ?? 1));
@@ -29582,9 +29605,11 @@ function layoutRasterPath(rCtx, path, boxShape = false) {
 function paintRasterPath(rCtx, path, opts) {
   path = layoutRasterPath(rCtx, path, opts.rectangle || opts.roundPen);
   const { ctx, state } = rCtx;
+  let filled = !!opts.filled;
   if (opts.fill) {
     const paint = brushPaint2(rCtx);
     if (paint) {
+      filled = true;
       const fillPath = opts.fillPath ? layoutRasterPath(rCtx, opts.fillPath, opts.rectangle || opts.roundPen) : path;
       const spans = fillPathSpans(fillPath, !!opts.winding);
       paintSpansDeferred(rCtx, spans, paint, state.rop2);
@@ -29597,7 +29622,7 @@ function paintRasterPath(rCtx, path, opts) {
     if (!penIsWidened(rCtx)) {
       return false;
     }
-    const polys = widenPath(path, penWidenOptions(rCtx, opts));
+    const polys = widenPath(filled ? withoutCurveTangents(path) : path, penWidenOptions(rCtx, opts));
     paintSpansDeferred(rCtx, fillPolygonSpans(polys, true), { kind: "solid", rgb: rgbOf(state.penColor) }, state.rop2);
     return true;
   }
@@ -29914,7 +29939,7 @@ function paintGdiShape(rCtx, shape) {
     return;
   }
   if ((cosmetic || penIsWidened(rCtx)) && (aliased || bitwise)) {
-    paintRasterPath(rCtx, getPath(), { fill: false, stroke: true, style: shape.style, rectangle: shape.rectangle, roundPen: shape.roundPen });
+    paintRasterPath(rCtx, getPath(), { fill: false, stroke: true, style: shape.style, rectangle: shape.rectangle, roundPen: shape.roundPen, filled: !!shape.fill && state.brushStyle !== 1 });
     return;
   }
   const pattern = cosmeticPattern(rCtx);
@@ -38819,7 +38844,7 @@ function compatCorner(p, w, h, box) {
   if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
     const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
-    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+    return [Math.floor(Math.min(cw, width + penWidth) * width / (width + penWidth)), Math.floor(Math.min(ch, height + penWidth) * height / (height + penWidth))];
   }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;

package/dist/index.mjs

@@ -28826,6 +28826,20 @@ var FLAT_SECTOR_BIAS = {
 function sectorBias(code) {
   return code >= 97 ? (code - 97) / 2 - 1.5 : (code - 65) / 2 - 1.5 - 1 / 64;
 }
+var VERTICAL_STEP_EARLY = "120002002002002002202200200200200220220020000022222220000002222220000002222220000";
+var VERTICAL_STEP_FIRST = 7;
+function verticalSideOffset(width) {
+  if (width < HOBBY_LIMIT || width > 1400) {
+    return void 0;
+  }
+  let m = VERTICAL_STEP_FIRST;
+  for (let i = 1; i < VERTICAL_STEP_EARLY.length; i++) {
+    if (width >= 16 * (i + VERTICAL_STEP_FIRST) - 7 - +VERTICAL_STEP_EARLY[i]) {
+      m = i + VERTICAL_STEP_FIRST;
+    }
+  }
+  return 8 * m;
+}
 var penCache = /* @__PURE__ */ new Map();
 function penPolygon(width) {
   const cached = penCache.get(width);
@@ -28838,7 +28852,7 @@ function penPolygon(width) {
     pen = HOBBY[n - 1];
   } else {
     const rx = Math.ceil(width / 2);
-    const ry = 8 * Math.floor((width + 9) / 16);
+    const ry = rx;
     const f = flattenBezierPath(ellipseBeziers(-rx, -ry, rx, ry));
     const half = [];
     for (let i = 0; i + 1 < f.length; i += 2) {
@@ -28916,7 +28930,8 @@ function perpendicularVectors(width, dx0, dy0) {
       cy = sectorBias(pair.charCodeAt(1));
     }
   }
-  const vx = r(x + cx), vy = r(y + cy);
+  const side = dx === 0 ? verticalSideOffset(width) : void 0;
+  const vx = side === void 0 ? r(x + cx) : -side, vy = r(y + cy);
   return { v: flip ? [-vx, -vy] : [vx, vy], ray: flip ? [-x, -y] : [x, y] };
 }
 function squareExtension(width, dx, dy) {
@@ -29570,6 +29585,14 @@ function brushPaint2(rCtx) {
     ...state.bkMode === 1 && state.brushPattern?.kind === "hatch" ? { skip: hatchBackgroundMask(state.brushPattern.hatch) } : {}
   };
 }
+function withoutCurveTangents(path) {
+  if (!path.figures.some((f) => f.tangents)) {
+    return path;
+  }
+  const plain = new GdiRasterPath();
+  plain.figures = path.figures.map((f) => ({ pts: f.pts, closed: f.closed, roundWiden: f.roundWiden }));
+  return plain;
+}
 function layoutRasterPath(rCtx, path, boxShape = false) {
   if (!rCtx.wmfLayoutRtl || boxShape) return path;
   const shift = Math.round(16 * (rCtx.wholeDevicePixels?.[0] ?? 1));
@@ -29580,9 +29603,11 @@ function layoutRasterPath(rCtx, path, boxShape = false) {
 function paintRasterPath(rCtx, path, opts) {
   path = layoutRasterPath(rCtx, path, opts.rectangle || opts.roundPen);
   const { ctx, state } = rCtx;
+  let filled = !!opts.filled;
   if (opts.fill) {
     const paint = brushPaint2(rCtx);
     if (paint) {
+      filled = true;
       const fillPath = opts.fillPath ? layoutRasterPath(rCtx, opts.fillPath, opts.rectangle || opts.roundPen) : path;
       const spans = fillPathSpans(fillPath, !!opts.winding);
       paintSpansDeferred(rCtx, spans, paint, state.rop2);
@@ -29595,7 +29620,7 @@ function paintRasterPath(rCtx, path, opts) {
     if (!penIsWidened(rCtx)) {
       return false;
     }
-    const polys = widenPath(path, penWidenOptions(rCtx, opts));
+    const polys = widenPath(filled ? withoutCurveTangents(path) : path, penWidenOptions(rCtx, opts));
     paintSpansDeferred(rCtx, fillPolygonSpans(polys, true), { kind: "solid", rgb: rgbOf(state.penColor) }, state.rop2);
     return true;
   }
@@ -29912,7 +29937,7 @@ function paintGdiShape(rCtx, shape) {
     return;
   }
   if ((cosmetic || penIsWidened(rCtx)) && (aliased || bitwise)) {
-    paintRasterPath(rCtx, getPath(), { fill: false, stroke: true, style: shape.style, rectangle: shape.rectangle, roundPen: shape.roundPen });
+    paintRasterPath(rCtx, getPath(), { fill: false, stroke: true, style: shape.style, rectangle: shape.rectangle, roundPen: shape.roundPen, filled: !!shape.fill && state.brushStyle !== 1 });
     return;
   }
   const pattern = cosmeticPattern(rCtx);
@@ -38817,7 +38842,7 @@ function compatCorner(p, w, h, box) {
   if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
     const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
-    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+    return [Math.floor(Math.min(cw, width + penWidth) * width / (width + penWidth)), Math.floor(Math.min(ch, height + penWidth) * height / (height + penWidth))];
   }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;

package/package.json

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