emf-converter 4.6.6 → 4.6.8

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);
@@ -31435,28 +31460,92 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (reverse) taps.reverse();
   return taps;
 }
-var SOFT_TENT_SIGMA = 0.25;
-var SOFT_TENT_STEPS = 31;
-var SOFT_TENT_SPAN = 3;
-var softTentCache = /* @__PURE__ */ new Map();
-function softTent(d) {
-  const key = Math.round(d * 1024);
-  const cached = softTentCache.get(key);
-  if (cached !== void 0) {
-    return cached;
+function halftoneReduceTaps(srcLen, dstLen, reverse) {
+  if (dstLen >= srcLen) return halftoneAxis(0, srcLen, dstLen, reverse);
+  const taps = [];
+  for (let i = 0; i < dstLen; i++) {
+    const from = i * srcLen;
+    const to = (i + 1) * srcLen;
+    const run = [];
+    let rest = 0;
+    for (let k = Math.floor(from / dstLen); k * dstLen < to; k++) {
+      const overlap = Math.min(to, (k + 1) * dstLen) - Math.max(from, k * dstLen);
+      if (overlap <= 0) continue;
+      const w = Math.ceil(overlap * FIX / srcLen);
+      run.push([k, w]);
+      if (run.length > 1) rest += w;
+    }
+    if (run.length > 1) run[0][1] = FIX - rest;
+    taps.push(run);
   }
-  let sum = 0;
+  if (reverse) taps.reverse();
+  return taps;
+}
+var ENLARGE_KERNEL = [
+  0.7598,
+  0.7276,
+  0.6829,
+  0.6528,
+  0.6106,
+  0.5745,
+  0.5362,
+  0.4955,
+  0.457,
+  0.4121,
+  0.3762,
+  0.3233,
+  0.2741,
+  0.226,
+  0.1822,
+  0.1412,
+  0.1021,
+  0.0685,
+  0.0382,
+  0.0138,
+  0
+];
+var ENLARGE_BOX = 0.2429;
+var ENLARGE_STEP = 0.05;
+function enlargeKernel(u) {
+  const edge = u / ENLARGE_STEP;
+  const i = Math.floor(edge);
+  const smooth = i >= ENLARGE_KERNEL.length - 1 ? 0 : ENLARGE_KERNEL[i] + (ENLARGE_KERNEL[i + 1] - ENLARGE_KERNEL[i]) * (edge - i);
+  return smooth + ENLARGE_BOX * (Math.abs(u - 0.5) < 1e-9 ? 0.5 : u < 0.5 ? 1 : 0);
+}
+function halftoneEnlargeTaps(src, dst) {
+  const ratio = dst / src;
+  const reach = Math.ceil((ENLARGE_KERNEL.length - 1) * ENLARGE_STEP * ratio);
+  const fir = [];
   let total = 0;
-  const half = (SOFT_TENT_STEPS - 1) / 2;
-  for (let i = -half; i <= half; i++) {
-    const x = i / half * SOFT_TENT_SPAN * SOFT_TENT_SIGMA;
-    const g = Math.exp(-(x * x) / (2 * SOFT_TENT_SIGMA * SOFT_TENT_SIGMA));
-    total += g;
-    sum += g * Math.max(0, 1 - Math.abs(key / 1024 + x));
+  for (let k = 0; k <= reach; k++) {
+    const w = enlargeKernel(k / ratio);
+    fir.push(w);
+    total += k === 0 ? w : 2 * w;
+  }
+  const cover = [];
+  for (let x = 0; x < dst; x++) {
+    const lo = x / ratio;
+    const hi = (x + 1) / ratio;
+    const run = [];
+    for (let j = Math.max(0, Math.floor(lo)); j < Math.min(src, hi); j++) {
+      const overlap = Math.min(hi, j + 1) - Math.max(lo, j);
+      if (overlap > 0) run.push([j, overlap * ratio]);
+    }
+    cover.push(run);
   }
-  const value = sum / total;
-  softTentCache.set(key, value);
-  return value;
+  const taps = [];
+  for (let x = 0; x < dst; x++) {
+    const weights = /* @__PURE__ */ new Map();
+    for (let k = -reach; k <= reach; k++) {
+      const w = fir[Math.abs(k)] / total;
+      if (w === 0) continue;
+      for (const [j, v] of cover[Math.max(0, Math.min(dst - 1, x + k))]) {
+        weights.set(j, (weights.get(j) ?? 0) + w * v);
+      }
+    }
+    taps.push([...weights.entries()]);
+  }
+  return taps;
 }
 function ditherPixels(px, w, h, dither, flipX, flipY, phaseX, phaseY) {
   for (let y = 0; y < h; y++) {
@@ -31598,7 +31687,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   const mixed = W > SW && H < SH || W < SW && H > SH;
   const dithered = !!dither && !!adjust && !adjustAfterSampling;
   const nearestMixed = mixed && (!adjust || adjustAfterSampling || dithered) && (W < SW && W * 2 > SW || H < SH && H * 2 > SH);
-  const nativeMixed = mixed && (!adjust || adjustAfterSampling || dithered) && Math.min(SW, W) >= 2 && Math.min(SH, H) >= 2 && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
+  const nativeMixed = mixed && (!adjust || adjustAfterSampling || dithered) && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
   if ((enlarging || nearestMixed) && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
@@ -31612,8 +31701,9 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   }
   const sampleW = nativeMixed ? Math.min(SW, W) : W;
   const sampleH = nativeMixed ? Math.min(SH, H) : H;
-  const cols = halftoneAxis(0, SW, sampleW, flipX);
-  const rows = halftoneAxis(0, SH, sampleH, flipY);
+  const axis = nativeMixed ? (n, d, r) => halftoneReduceTaps(n, d, r) : (n, d, r) => halftoneAxis(0, n, d, r);
+  const cols = axis(SW, sampleW, flipX);
+  const rows = axis(SH, sampleH, flipY);
   if (nearestMixed) {
     const nearest = (taps, src2, dst, reverse) => {
       for (let i = 0; i < dst; i++) {
@@ -31685,29 +31775,15 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     const source = out;
     out = new Int32Array(W * H * 3);
     const axisTaps = (src2, dst) => {
-      const r = [];
-      for (let i = 0; i < dst; i++) {
-        if (src2 === dst) {
-          r.push([[i, 1]]);
-          continue;
-        }
-        const raw = (i + 0.5) * src2 / dst - 0.5;
-        const pos = Math.max(0, Math.min(src2 - 1, raw));
-        const i0 = Math.floor(pos);
-        if (dst === 2 * src2) {
-          r.push([[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]]);
-          continue;
-        }
-        const taps = [];
-        let total = 0;
-        for (let k = i0 - 2; k <= i0 + 3; k++) {
-          const w = softTent(raw - k);
-          taps.push([Math.max(0, Math.min(src2 - 1, k)), w]);
-          total += w;
-        }
-        r.push(taps.map(([k, w]) => [k, w / total]));
+      if (src2 === dst) return Array.from({ length: dst }, (_, i) => [[i, 1]]);
+      if (dst === 2 * src2) {
+        return Array.from({ length: dst }, (_, i) => {
+          const pos = Math.max(0, Math.min(src2 - 1, (i + 0.5) * src2 / dst - 0.5));
+          const i0 = Math.floor(pos);
+          return [[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]];
+        });
       }
-      return r;
+      return halftoneEnlargeTaps(src2, dst);
     };
     const xt = axisTaps(sampleW, W), yt = axisTaps(sampleH, H);
     for (let y = 0; y < H; y++) {
@@ -31715,7 +31791,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
         for (let c = 0; c < 3; c++) {
           let v = 0;
           for (const [yy, wy] of yt[y]) for (const [xx, wx] of xt[x]) v += source[(yy * sampleW + xx) * 3 + c] * wy * wx;
-          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5)));
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5 + 1e-7)));
         }
       }
     }
@@ -38818,7 +38894,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);
@@ -31433,28 +31458,92 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (reverse) taps.reverse();
   return taps;
 }
-var SOFT_TENT_SIGMA = 0.25;
-var SOFT_TENT_STEPS = 31;
-var SOFT_TENT_SPAN = 3;
-var softTentCache = /* @__PURE__ */ new Map();
-function softTent(d) {
-  const key = Math.round(d * 1024);
-  const cached = softTentCache.get(key);
-  if (cached !== void 0) {
-    return cached;
+function halftoneReduceTaps(srcLen, dstLen, reverse) {
+  if (dstLen >= srcLen) return halftoneAxis(0, srcLen, dstLen, reverse);
+  const taps = [];
+  for (let i = 0; i < dstLen; i++) {
+    const from = i * srcLen;
+    const to = (i + 1) * srcLen;
+    const run = [];
+    let rest = 0;
+    for (let k = Math.floor(from / dstLen); k * dstLen < to; k++) {
+      const overlap = Math.min(to, (k + 1) * dstLen) - Math.max(from, k * dstLen);
+      if (overlap <= 0) continue;
+      const w = Math.ceil(overlap * FIX / srcLen);
+      run.push([k, w]);
+      if (run.length > 1) rest += w;
+    }
+    if (run.length > 1) run[0][1] = FIX - rest;
+    taps.push(run);
   }
-  let sum = 0;
+  if (reverse) taps.reverse();
+  return taps;
+}
+var ENLARGE_KERNEL = [
+  0.7598,
+  0.7276,
+  0.6829,
+  0.6528,
+  0.6106,
+  0.5745,
+  0.5362,
+  0.4955,
+  0.457,
+  0.4121,
+  0.3762,
+  0.3233,
+  0.2741,
+  0.226,
+  0.1822,
+  0.1412,
+  0.1021,
+  0.0685,
+  0.0382,
+  0.0138,
+  0
+];
+var ENLARGE_BOX = 0.2429;
+var ENLARGE_STEP = 0.05;
+function enlargeKernel(u) {
+  const edge = u / ENLARGE_STEP;
+  const i = Math.floor(edge);
+  const smooth = i >= ENLARGE_KERNEL.length - 1 ? 0 : ENLARGE_KERNEL[i] + (ENLARGE_KERNEL[i + 1] - ENLARGE_KERNEL[i]) * (edge - i);
+  return smooth + ENLARGE_BOX * (Math.abs(u - 0.5) < 1e-9 ? 0.5 : u < 0.5 ? 1 : 0);
+}
+function halftoneEnlargeTaps(src, dst) {
+  const ratio = dst / src;
+  const reach = Math.ceil((ENLARGE_KERNEL.length - 1) * ENLARGE_STEP * ratio);
+  const fir = [];
   let total = 0;
-  const half = (SOFT_TENT_STEPS - 1) / 2;
-  for (let i = -half; i <= half; i++) {
-    const x = i / half * SOFT_TENT_SPAN * SOFT_TENT_SIGMA;
-    const g = Math.exp(-(x * x) / (2 * SOFT_TENT_SIGMA * SOFT_TENT_SIGMA));
-    total += g;
-    sum += g * Math.max(0, 1 - Math.abs(key / 1024 + x));
+  for (let k = 0; k <= reach; k++) {
+    const w = enlargeKernel(k / ratio);
+    fir.push(w);
+    total += k === 0 ? w : 2 * w;
+  }
+  const cover = [];
+  for (let x = 0; x < dst; x++) {
+    const lo = x / ratio;
+    const hi = (x + 1) / ratio;
+    const run = [];
+    for (let j = Math.max(0, Math.floor(lo)); j < Math.min(src, hi); j++) {
+      const overlap = Math.min(hi, j + 1) - Math.max(lo, j);
+      if (overlap > 0) run.push([j, overlap * ratio]);
+    }
+    cover.push(run);
   }
-  const value = sum / total;
-  softTentCache.set(key, value);
-  return value;
+  const taps = [];
+  for (let x = 0; x < dst; x++) {
+    const weights = /* @__PURE__ */ new Map();
+    for (let k = -reach; k <= reach; k++) {
+      const w = fir[Math.abs(k)] / total;
+      if (w === 0) continue;
+      for (const [j, v] of cover[Math.max(0, Math.min(dst - 1, x + k))]) {
+        weights.set(j, (weights.get(j) ?? 0) + w * v);
+      }
+    }
+    taps.push([...weights.entries()]);
+  }
+  return taps;
 }
 function ditherPixels(px, w, h, dither, flipX, flipY, phaseX, phaseY) {
   for (let y = 0; y < h; y++) {
@@ -31596,7 +31685,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   const mixed = W > SW && H < SH || W < SW && H > SH;
   const dithered = !!dither && !!adjust && !adjustAfterSampling;
   const nearestMixed = mixed && (!adjust || adjustAfterSampling || dithered) && (W < SW && W * 2 > SW || H < SH && H * 2 > SH);
-  const nativeMixed = mixed && (!adjust || adjustAfterSampling || dithered) && Math.min(SW, W) >= 2 && Math.min(SH, H) >= 2 && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
+  const nativeMixed = mixed && (!adjust || adjustAfterSampling || dithered) && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
   if ((enlarging || nearestMixed) && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
@@ -31610,8 +31699,9 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   }
   const sampleW = nativeMixed ? Math.min(SW, W) : W;
   const sampleH = nativeMixed ? Math.min(SH, H) : H;
-  const cols = halftoneAxis(0, SW, sampleW, flipX);
-  const rows = halftoneAxis(0, SH, sampleH, flipY);
+  const axis = nativeMixed ? (n, d, r) => halftoneReduceTaps(n, d, r) : (n, d, r) => halftoneAxis(0, n, d, r);
+  const cols = axis(SW, sampleW, flipX);
+  const rows = axis(SH, sampleH, flipY);
   if (nearestMixed) {
     const nearest = (taps, src2, dst, reverse) => {
       for (let i = 0; i < dst; i++) {
@@ -31683,29 +31773,15 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     const source = out;
     out = new Int32Array(W * H * 3);
     const axisTaps = (src2, dst) => {
-      const r = [];
-      for (let i = 0; i < dst; i++) {
-        if (src2 === dst) {
-          r.push([[i, 1]]);
-          continue;
-        }
-        const raw = (i + 0.5) * src2 / dst - 0.5;
-        const pos = Math.max(0, Math.min(src2 - 1, raw));
-        const i0 = Math.floor(pos);
-        if (dst === 2 * src2) {
-          r.push([[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]]);
-          continue;
-        }
-        const taps = [];
-        let total = 0;
-        for (let k = i0 - 2; k <= i0 + 3; k++) {
-          const w = softTent(raw - k);
-          taps.push([Math.max(0, Math.min(src2 - 1, k)), w]);
-          total += w;
-        }
-        r.push(taps.map(([k, w]) => [k, w / total]));
+      if (src2 === dst) return Array.from({ length: dst }, (_, i) => [[i, 1]]);
+      if (dst === 2 * src2) {
+        return Array.from({ length: dst }, (_, i) => {
+          const pos = Math.max(0, Math.min(src2 - 1, (i + 0.5) * src2 / dst - 0.5));
+          const i0 = Math.floor(pos);
+          return [[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]];
+        });
       }
-      return r;
+      return halftoneEnlargeTaps(src2, dst);
     };
     const xt = axisTaps(sampleW, W), yt = axisTaps(sampleH, H);
     for (let y = 0; y < H; y++) {
@@ -31713,7 +31789,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
         for (let c = 0; c < 3; c++) {
           let v = 0;
           for (const [yy, wy] of yt[y]) for (const [xx, wx] of xt[x]) v += source[(yy * sampleW + xx) * 3 + c] * wy * wx;
-          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5)));
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5 + 1e-7)));
         }
       }
     }
@@ -38816,7 +38892,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);
@@ -31436,28 +31461,92 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (reverse) taps.reverse();
   return taps;
 }
-var SOFT_TENT_SIGMA = 0.25;
-var SOFT_TENT_STEPS = 31;
-var SOFT_TENT_SPAN = 3;
-var softTentCache = /* @__PURE__ */ new Map();
-function softTent(d) {
-  const key = Math.round(d * 1024);
-  const cached = softTentCache.get(key);
-  if (cached !== void 0) {
-    return cached;
+function halftoneReduceTaps(srcLen, dstLen, reverse) {
+  if (dstLen >= srcLen) return halftoneAxis(0, srcLen, dstLen, reverse);
+  const taps = [];
+  for (let i = 0; i < dstLen; i++) {
+    const from = i * srcLen;
+    const to = (i + 1) * srcLen;
+    const run = [];
+    let rest = 0;
+    for (let k = Math.floor(from / dstLen); k * dstLen < to; k++) {
+      const overlap = Math.min(to, (k + 1) * dstLen) - Math.max(from, k * dstLen);
+      if (overlap <= 0) continue;
+      const w = Math.ceil(overlap * FIX / srcLen);
+      run.push([k, w]);
+      if (run.length > 1) rest += w;
+    }
+    if (run.length > 1) run[0][1] = FIX - rest;
+    taps.push(run);
   }
-  let sum = 0;
+  if (reverse) taps.reverse();
+  return taps;
+}
+var ENLARGE_KERNEL = [
+  0.7598,
+  0.7276,
+  0.6829,
+  0.6528,
+  0.6106,
+  0.5745,
+  0.5362,
+  0.4955,
+  0.457,
+  0.4121,
+  0.3762,
+  0.3233,
+  0.2741,
+  0.226,
+  0.1822,
+  0.1412,
+  0.1021,
+  0.0685,
+  0.0382,
+  0.0138,
+  0
+];
+var ENLARGE_BOX = 0.2429;
+var ENLARGE_STEP = 0.05;
+function enlargeKernel(u) {
+  const edge = u / ENLARGE_STEP;
+  const i = Math.floor(edge);
+  const smooth = i >= ENLARGE_KERNEL.length - 1 ? 0 : ENLARGE_KERNEL[i] + (ENLARGE_KERNEL[i + 1] - ENLARGE_KERNEL[i]) * (edge - i);
+  return smooth + ENLARGE_BOX * (Math.abs(u - 0.5) < 1e-9 ? 0.5 : u < 0.5 ? 1 : 0);
+}
+function halftoneEnlargeTaps(src, dst) {
+  const ratio = dst / src;
+  const reach = Math.ceil((ENLARGE_KERNEL.length - 1) * ENLARGE_STEP * ratio);
+  const fir = [];
   let total = 0;
-  const half = (SOFT_TENT_STEPS - 1) / 2;
-  for (let i = -half; i <= half; i++) {
-    const x = i / half * SOFT_TENT_SPAN * SOFT_TENT_SIGMA;
-    const g = Math.exp(-(x * x) / (2 * SOFT_TENT_SIGMA * SOFT_TENT_SIGMA));
-    total += g;
-    sum += g * Math.max(0, 1 - Math.abs(key / 1024 + x));
+  for (let k = 0; k <= reach; k++) {
+    const w = enlargeKernel(k / ratio);
+    fir.push(w);
+    total += k === 0 ? w : 2 * w;
+  }
+  const cover = [];
+  for (let x = 0; x < dst; x++) {
+    const lo = x / ratio;
+    const hi = (x + 1) / ratio;
+    const run = [];
+    for (let j = Math.max(0, Math.floor(lo)); j < Math.min(src, hi); j++) {
+      const overlap = Math.min(hi, j + 1) - Math.max(lo, j);
+      if (overlap > 0) run.push([j, overlap * ratio]);
+    }
+    cover.push(run);
   }
-  const value = sum / total;
-  softTentCache.set(key, value);
-  return value;
+  const taps = [];
+  for (let x = 0; x < dst; x++) {
+    const weights = /* @__PURE__ */ new Map();
+    for (let k = -reach; k <= reach; k++) {
+      const w = fir[Math.abs(k)] / total;
+      if (w === 0) continue;
+      for (const [j, v] of cover[Math.max(0, Math.min(dst - 1, x + k))]) {
+        weights.set(j, (weights.get(j) ?? 0) + w * v);
+      }
+    }
+    taps.push([...weights.entries()]);
+  }
+  return taps;
 }
 function ditherPixels(px, w, h, dither, flipX, flipY, phaseX, phaseY) {
   for (let y = 0; y < h; y++) {
@@ -31599,7 +31688,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   const mixed = W > SW && H < SH || W < SW && H > SH;
   const dithered = !!dither && !!adjust && !adjustAfterSampling;
   const nearestMixed = mixed && (!adjust || adjustAfterSampling || dithered) && (W < SW && W * 2 > SW || H < SH && H * 2 > SH);
-  const nativeMixed = mixed && (!adjust || adjustAfterSampling || dithered) && Math.min(SW, W) >= 2 && Math.min(SH, H) >= 2 && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
+  const nativeMixed = mixed && (!adjust || adjustAfterSampling || dithered) && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
   if ((enlarging || nearestMixed) && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
@@ -31613,8 +31702,9 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   }
   const sampleW = nativeMixed ? Math.min(SW, W) : W;
   const sampleH = nativeMixed ? Math.min(SH, H) : H;
-  const cols = halftoneAxis(0, SW, sampleW, flipX);
-  const rows = halftoneAxis(0, SH, sampleH, flipY);
+  const axis = nativeMixed ? (n, d, r) => halftoneReduceTaps(n, d, r) : (n, d, r) => halftoneAxis(0, n, d, r);
+  const cols = axis(SW, sampleW, flipX);
+  const rows = axis(SH, sampleH, flipY);
   if (nearestMixed) {
     const nearest = (taps, src2, dst, reverse) => {
       for (let i = 0; i < dst; i++) {
@@ -31686,29 +31776,15 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     const source = out;
     out = new Int32Array(W * H * 3);
     const axisTaps = (src2, dst) => {
-      const r = [];
-      for (let i = 0; i < dst; i++) {
-        if (src2 === dst) {
-          r.push([[i, 1]]);
-          continue;
-        }
-        const raw = (i + 0.5) * src2 / dst - 0.5;
-        const pos = Math.max(0, Math.min(src2 - 1, raw));
-        const i0 = Math.floor(pos);
-        if (dst === 2 * src2) {
-          r.push([[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]]);
-          continue;
-        }
-        const taps = [];
-        let total = 0;
-        for (let k = i0 - 2; k <= i0 + 3; k++) {
-          const w = softTent(raw - k);
-          taps.push([Math.max(0, Math.min(src2 - 1, k)), w]);
-          total += w;
-        }
-        r.push(taps.map(([k, w]) => [k, w / total]));
+      if (src2 === dst) return Array.from({ length: dst }, (_, i) => [[i, 1]]);
+      if (dst === 2 * src2) {
+        return Array.from({ length: dst }, (_, i) => {
+          const pos = Math.max(0, Math.min(src2 - 1, (i + 0.5) * src2 / dst - 0.5));
+          const i0 = Math.floor(pos);
+          return [[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]];
+        });
       }
-      return r;
+      return halftoneEnlargeTaps(src2, dst);
     };
     const xt = axisTaps(sampleW, W), yt = axisTaps(sampleH, H);
     for (let y = 0; y < H; y++) {
@@ -31716,7 +31792,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
         for (let c = 0; c < 3; c++) {
           let v = 0;
           for (const [yy, wy] of yt[y]) for (const [xx, wx] of xt[x]) v += source[(yy * sampleW + xx) * 3 + c] * wy * wx;
-          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5)));
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5 + 1e-7)));
         }
       }
     }
@@ -38819,7 +38895,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);
@@ -31434,28 +31459,92 @@ function halftoneAxis(start, srcLen, dstLen, reverse) {
   if (reverse) taps.reverse();
   return taps;
 }
-var SOFT_TENT_SIGMA = 0.25;
-var SOFT_TENT_STEPS = 31;
-var SOFT_TENT_SPAN = 3;
-var softTentCache = /* @__PURE__ */ new Map();
-function softTent(d) {
-  const key = Math.round(d * 1024);
-  const cached = softTentCache.get(key);
-  if (cached !== void 0) {
-    return cached;
+function halftoneReduceTaps(srcLen, dstLen, reverse) {
+  if (dstLen >= srcLen) return halftoneAxis(0, srcLen, dstLen, reverse);
+  const taps = [];
+  for (let i = 0; i < dstLen; i++) {
+    const from = i * srcLen;
+    const to = (i + 1) * srcLen;
+    const run = [];
+    let rest = 0;
+    for (let k = Math.floor(from / dstLen); k * dstLen < to; k++) {
+      const overlap = Math.min(to, (k + 1) * dstLen) - Math.max(from, k * dstLen);
+      if (overlap <= 0) continue;
+      const w = Math.ceil(overlap * FIX / srcLen);
+      run.push([k, w]);
+      if (run.length > 1) rest += w;
+    }
+    if (run.length > 1) run[0][1] = FIX - rest;
+    taps.push(run);
   }
-  let sum = 0;
+  if (reverse) taps.reverse();
+  return taps;
+}
+var ENLARGE_KERNEL = [
+  0.7598,
+  0.7276,
+  0.6829,
+  0.6528,
+  0.6106,
+  0.5745,
+  0.5362,
+  0.4955,
+  0.457,
+  0.4121,
+  0.3762,
+  0.3233,
+  0.2741,
+  0.226,
+  0.1822,
+  0.1412,
+  0.1021,
+  0.0685,
+  0.0382,
+  0.0138,
+  0
+];
+var ENLARGE_BOX = 0.2429;
+var ENLARGE_STEP = 0.05;
+function enlargeKernel(u) {
+  const edge = u / ENLARGE_STEP;
+  const i = Math.floor(edge);
+  const smooth = i >= ENLARGE_KERNEL.length - 1 ? 0 : ENLARGE_KERNEL[i] + (ENLARGE_KERNEL[i + 1] - ENLARGE_KERNEL[i]) * (edge - i);
+  return smooth + ENLARGE_BOX * (Math.abs(u - 0.5) < 1e-9 ? 0.5 : u < 0.5 ? 1 : 0);
+}
+function halftoneEnlargeTaps(src, dst) {
+  const ratio = dst / src;
+  const reach = Math.ceil((ENLARGE_KERNEL.length - 1) * ENLARGE_STEP * ratio);
+  const fir = [];
   let total = 0;
-  const half = (SOFT_TENT_STEPS - 1) / 2;
-  for (let i = -half; i <= half; i++) {
-    const x = i / half * SOFT_TENT_SPAN * SOFT_TENT_SIGMA;
-    const g = Math.exp(-(x * x) / (2 * SOFT_TENT_SIGMA * SOFT_TENT_SIGMA));
-    total += g;
-    sum += g * Math.max(0, 1 - Math.abs(key / 1024 + x));
+  for (let k = 0; k <= reach; k++) {
+    const w = enlargeKernel(k / ratio);
+    fir.push(w);
+    total += k === 0 ? w : 2 * w;
+  }
+  const cover = [];
+  for (let x = 0; x < dst; x++) {
+    const lo = x / ratio;
+    const hi = (x + 1) / ratio;
+    const run = [];
+    for (let j = Math.max(0, Math.floor(lo)); j < Math.min(src, hi); j++) {
+      const overlap = Math.min(hi, j + 1) - Math.max(lo, j);
+      if (overlap > 0) run.push([j, overlap * ratio]);
+    }
+    cover.push(run);
   }
-  const value = sum / total;
-  softTentCache.set(key, value);
-  return value;
+  const taps = [];
+  for (let x = 0; x < dst; x++) {
+    const weights = /* @__PURE__ */ new Map();
+    for (let k = -reach; k <= reach; k++) {
+      const w = fir[Math.abs(k)] / total;
+      if (w === 0) continue;
+      for (const [j, v] of cover[Math.max(0, Math.min(dst - 1, x + k))]) {
+        weights.set(j, (weights.get(j) ?? 0) + w * v);
+      }
+    }
+    taps.push([...weights.entries()]);
+  }
+  return taps;
 }
 function ditherPixels(px, w, h, dither, flipX, flipY, phaseX, phaseY) {
   for (let y = 0; y < h; y++) {
@@ -31597,7 +31686,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   const mixed = W > SW && H < SH || W < SW && H > SH;
   const dithered = !!dither && !!adjust && !adjustAfterSampling;
   const nearestMixed = mixed && (!adjust || adjustAfterSampling || dithered) && (W < SW && W * 2 > SW || H < SH && H * 2 > SH);
-  const nativeMixed = mixed && (!adjust || adjustAfterSampling || dithered) && Math.min(SW, W) >= 2 && Math.min(SH, H) >= 2 && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
+  const nativeMixed = mixed && (!adjust || adjustAfterSampling || dithered) && (W > SW && H * 2 <= SH || H > SH && W * 2 <= SW);
   if ((enlarging || nearestMixed) && !directDib) {
     halftoneDespeckle(rect, SW, SH);
   }
@@ -31611,8 +31700,9 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
   }
   const sampleW = nativeMixed ? Math.min(SW, W) : W;
   const sampleH = nativeMixed ? Math.min(SH, H) : H;
-  const cols = halftoneAxis(0, SW, sampleW, flipX);
-  const rows = halftoneAxis(0, SH, sampleH, flipY);
+  const axis = nativeMixed ? (n, d, r) => halftoneReduceTaps(n, d, r) : (n, d, r) => halftoneAxis(0, n, d, r);
+  const cols = axis(SW, sampleW, flipX);
+  const rows = axis(SH, sampleH, flipY);
   if (nearestMixed) {
     const nearest = (taps, src2, dst, reverse) => {
       for (let i = 0; i < dst; i++) {
@@ -31684,29 +31774,15 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
     const source = out;
     out = new Int32Array(W * H * 3);
     const axisTaps = (src2, dst) => {
-      const r = [];
-      for (let i = 0; i < dst; i++) {
-        if (src2 === dst) {
-          r.push([[i, 1]]);
-          continue;
-        }
-        const raw = (i + 0.5) * src2 / dst - 0.5;
-        const pos = Math.max(0, Math.min(src2 - 1, raw));
-        const i0 = Math.floor(pos);
-        if (dst === 2 * src2) {
-          r.push([[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]]);
-          continue;
-        }
-        const taps = [];
-        let total = 0;
-        for (let k = i0 - 2; k <= i0 + 3; k++) {
-          const w = softTent(raw - k);
-          taps.push([Math.max(0, Math.min(src2 - 1, k)), w]);
-          total += w;
-        }
-        r.push(taps.map(([k, w]) => [k, w / total]));
+      if (src2 === dst) return Array.from({ length: dst }, (_, i) => [[i, 1]]);
+      if (dst === 2 * src2) {
+        return Array.from({ length: dst }, (_, i) => {
+          const pos = Math.max(0, Math.min(src2 - 1, (i + 0.5) * src2 / dst - 0.5));
+          const i0 = Math.floor(pos);
+          return [[i0, 1 - (pos - i0)], [Math.min(src2 - 1, i0 + 1), pos - i0]];
+        });
       }
-      return r;
+      return halftoneEnlargeTaps(src2, dst);
     };
     const xt = axisTaps(sampleW, W), yt = axisTaps(sampleH, H);
     for (let y = 0; y < H; y++) {
@@ -31714,7 +31790,7 @@ function stretchHalftone(src, sx, sy, sw, sh, dw, dh, adjust, adjustAfterSamplin
         for (let c = 0; c < 3; c++) {
           let v = 0;
           for (const [yy, wy] of yt[y]) for (const [xx, wx] of xt[x]) v += source[(yy * sampleW + xx) * 3 + c] * wy * wx;
-          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5)));
+          out[(y * W + x) * 3 + c] = Math.max(0, Math.min(255, Math.floor(v + 0.5 + 1e-7)));
         }
       }
     }
@@ -38817,7 +38893,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.8",
 	"description": "Convert EMF/WMF metafile binaries to PNG data URLs or SVG (markup, data URL, React/JSX)",
 	"keywords": [
 		"canvas",