emf-converter 4.3.1 → 4.3.2

package/README.md

@@ -196,7 +196,7 @@ A three-phase pipeline: **parse → replay → export**. The header parser reads
 
 Everything below is verified against output painted by Windows itself; `src/gdi-parity.fixture.test.ts` holds the per-fixture bounds.
 
-- **GDI shapes** (`gdi-raster.ts`, `gdi-raster-widen.ts`): 28.4 fixed-point geometry; GDI's fill rule (ALTERNATE/WINDING); one-pixel lines by GDI's diamond rule with its tie-breaks; GDI's own Bezier flattener, ellipse, rounded-rectangle, arc (GDI's trigonometry table and `SetArcDirection`), chord and pie construction; cosmetic dash styles (dash 18/6, dot 3/3, ...) and geometric dashes; wide pens widened from GDI's own pen polygons with every cap and join and the miter limit; rotated and skewed world transforms. Pixel-exact on the shape fixtures.
+- **GDI shapes** (`gdi-raster.ts`, `gdi-raster-widen.ts`): 28.4 fixed-point geometry; GDI's fill rule (ALTERNATE/WINDING); one-pixel lines by GDI's diamond rule with its tie-breaks; GDI's own Bezier flattener, ellipse, rounded-rectangle, arc (GDI's trigonometry table and `SetArcDirection`), chord and pie construction; cosmetic dash styles (dash 18/6, dot 3/3, ...) and geometric dashes; wide pens widened from GDI's own pen polygons with every cap and join and the miter limit; rotated and skewed world transforms. Pixel-exact on the shape fixtures. A path bracket's GDI geometry has the points, point types, figure starts and direction that Windows' `GetPath` reports (checked against the Windows data in Wine's `gdi32` path tests).
 - **Raster operations**: all 256 ROP3 codes for `BitBlt`/`StretchBlt`/`StretchDIBits`/`PatBlt`, exact per bit against the destination, brush and source, with GDI's stretch modes, mirrored rectangles and rotated destinations (each device pixel mapped back to one source texel). Every `SetROP2` mode, including the bitwise AND/OR/XOR family, for shapes, paths and pattern-brush fills.
 - **Brushes**: hatch, monochrome and DIB pattern brushes anchored to the brush origin, with the background mode; GDI+ solid, hatch, texture (bilinear, WrapMode-aware, as GDI+ samples them), linear gradients (GDI+'s own interpolation table: preset colours, blend shapes, gamma correction, every WrapMode) and path gradients (true boundary-shaped falloff, every WrapMode).
 - **Clipping**: every GDI and GDI+ region combine mode exact for every clip (vector where possible, otherwise scan-converted to pixel regions, which is how GDI stores them), path clips with their fill mode, and region offsets.

package/dist/index.js

@@ -1737,7 +1737,21 @@ var KAPPA = 0.5522847498307936;
 function axisBox(l, t, r, b) {
   return { ax: l, ay: t, exx: r - l, exy: 0, eyx: 0, eyy: b - t };
 }
-function ellipseBeziersBox(box) {
+function ellipseBeziersBox(box, clockwise = false) {
+  if (!clockwise) {
+    return ellipsePoints(box, false);
+  }
+  const e = clockwiseEllipseBeziersBox(box);
+  const out = [];
+  for (let i = e.length - 2; i >= 0; i -= 2) {
+    out.push(e[i], e[i + 1]);
+  }
+  return out;
+}
+function clockwiseEllipseBeziersBox(box) {
+  return ellipsePoints(box, true);
+}
+function ellipsePoints(box, cwControls) {
   const half = (v, up) => up ? Math.ceil(v / 2) : Math.floor(v / 2);
   const hMidLo = (v) => half(v, false);
   const hMidHi = (v) => half(v, true);
@@ -1747,6 +1761,11 @@ function ellipseBeziersBox(box) {
   const vMidHi = (v) => half(v, true);
   const vCtl = (v) => Math.floor(v / 2) - Math.floor(KAPPA * Math.floor(v / 2));
   const vCtlR = (v) => v - vCtl(v);
+  const vDist = (v) => Math.ceil(KAPPA * Math.floor(v / 2));
+  const rightUpper = cwControls ? (v) => vMidHi(v) - vDist(v) : vCtl;
+  const leftUpper = cwControls ? (v) => vMidLo(v) - vDist(v) : vCtl;
+  const leftLower = cwControls ? (v) => vMidLo(v) + vDist(v) : vCtlR;
+  const rightLower = cwControls ? (v) => vMidHi(v) + vDist(v) : vCtlR;
   const zero = () => 0;
   const full = (v) => v;
   const { ax, ay, exx, exy, eyx, eyy } = box;
@@ -1755,17 +1774,17 @@ function ellipseBeziersBox(box) {
     out.push(ax + gx(exx) + gy(eyx), ay + gx(exy) + gy(eyy));
   };
   P(full, vMidHi);
-  P(full, vCtl);
+  P(full, rightUpper);
   P(hCtl, zero);
   P(hMidLo, zero);
   P(hCtl2, zero);
-  P(zero, vCtl);
+  P(zero, leftUpper);
   P(zero, vMidLo);
-  P(zero, vCtlR);
+  P(zero, leftLower);
   P(hCtl2, full);
   P(hMidHi, full);
   P(hCtl, full);
-  P(full, vCtlR);
+  P(full, rightLower);
   P(full, vMidHi);
   return out;
 }
@@ -1782,8 +1801,12 @@ function flattenBezierPath(pts) {
 function roundRectCorners(l, t, r, b, cw, ch) {
   const w = r - l;
   const h = b - t;
-  const ew = Math.min(Math.abs(cw), w);
-  const eh = Math.min(Math.abs(ch), h);
+  let ew = Math.min(Math.abs(cw), w);
+  let eh = Math.min(Math.abs(ch), h);
+  if (ew === 0 || eh === 0) {
+    ew = 0;
+    eh = 0;
+  }
   const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = Math.floor(r - ew / 2);
   const hx = r - topX;
@@ -1892,12 +1915,7 @@ function angleArcFix(box, startDeg, sweepDeg) {
   const cx = l + w / 2;
   const cy = t + h / 2;
   const E = ellipseBeziers(l, t, l + w, t + h);
-  const Ecw = E.slice();
-  const d = Math.ceil(KAPPA * Math.floor(h / 2));
-  Ecw[3] = Ecw[1] - d;
-  Ecw[11] = Ecw[13] - d;
-  Ecw[15] = Ecw[13] + d;
-  Ecw[23] = Ecw[1] + d;
+  const Ecw = clockwiseEllipseBeziersBox(axisBox(l, t, l + w, t + h));
   const start = startDeg * Math.PI / 180;
   const out = [Math.round(cx + w / 2 * tableCos(start)), Math.round(cy - h / 2 * tableSin(start))];
   for (const p of angleArcPieces(startDeg, sweepDeg)) {
@@ -1939,15 +1957,7 @@ function arcBeziers(l, t, r, b, xs, ys, xe, ye, clockwise) {
   }
   const px = (a2) => cx + rx * tableCos(a2);
   const py = (a2) => cy - ry * tableSin(a2);
-  const E = ellipseBeziers(l, t, r, b);
-  if (clockwise) {
-    const fh = Math.floor((b - t) / 2);
-    const d = Math.ceil(KAPPA * fh);
-    E[3] = E[1] - d;
-    E[11] = E[13] - d;
-    E[15] = E[13] + d;
-    E[23] = E[1] + d;
-  }
+  const E = clockwise ? clockwiseEllipseBeziersBox(axisBox(l, t, r, b)) : ellipseBeziers(l, t, r, b);
   const out = [Math.round(px(a0)), Math.round(py(a0))];
   let a = a0;
   for (let guard = 0; guard < 8 && (s > 0 ? a < a1 - 1e-12 : a > a1 + 1e-12); guard++) {
@@ -1980,12 +1990,45 @@ function arcBeziers(l, t, r, b, xs, ys, xe, ye, clockwise) {
 var GdiRasterPath = class {
   constructor() {
     this.figures = [];
+    /**
+     * The path as `GetPath` reports it, before flattening: FIX points
+     * (`[x0, y0, ...]`) and their `PT_*` types (`PT_MOVETO` 6, `PT_LINETO`
+     * 2, `PT_BEZIERTO` 4, `PT_CLOSEFIGURE` 1 or-ed onto a figure's last
+     * point). Used to check the geometry against Windows' own paths.
+     */
+    this.getPath = { pts: [], types: [] };
     this.current = null;
   }
   /** Starts a new figure at (`x`, `y`). */
   moveTo(x, y) {
     this.current = { pts: [x, y], closed: false };
     this.figures.push(this.current);
+    this.log(x, y, 6);
+  }
+  /**
+   * Starts a new figure at the current position (`x`, `y`) unless the open
+   * figure already ends there. GDI opens a new figure for a drawing call
+   * that continues from the current position (`LineTo`, `PolylineTo`,
+   * `ArcTo`, ...) when the path is empty, its last figure is closed, or
+   * the current position has moved away from the path's last point (a
+   * `MoveTo`, or a call such as `Polyline`, `Arc` or `PolyPolygon` that
+   * adds to the path without moving the current position; Windows'
+   * `GetPath`, Wine `gdi32/tests/path.c`, `test_all_functions`).
+   */
+  continueAt(x, y) {
+    const f = this.current;
+    if (f && f.pts[f.pts.length - 2] === x && f.pts[f.pts.length - 1] === y) {
+      return;
+    }
+    this.moveTo(x, y);
+  }
+  /** True when a figure is open (not closed and not ended by an appended path). */
+  hasOpenFigure() {
+    return this.current !== null;
+  }
+  log(x, y, type) {
+    this.getPath.pts.push(x, y);
+    this.getPath.types.push(type);
   }
   /** Adds a line to (`x`, `y`), starting a figure there when none is open. */
   lineTo(x, y) {
@@ -1994,6 +2037,7 @@ var GdiRasterPath = class {
       this.moveTo(last ? last[0] : x, last ? last[1] : y);
     }
     this.current.pts.push(x, y);
+    this.log(x, y, 2);
   }
   /** Adds a cubic Bezier from the current point. */
   bezierTo(c1x, c1y, c2x, c2y, x, y) {
@@ -2003,6 +2047,9 @@ var GdiRasterPath = class {
     }
     const p = this.current.pts;
     this.flattenInto(p[p.length - 2], p[p.length - 1], c1x, c1y, c2x, c2y, x, y);
+    this.log(c1x, c1y, 4);
+    this.log(c2x, c2y, 4);
+    this.log(x, y, 4);
   }
   /** Flattens one Bezier onto the open figure, recording its end tangents. */
   flattenInto(x0, y0, c1x, c1y, c2x, c2y, x3, y3) {
@@ -2037,6 +2084,9 @@ var GdiRasterPath = class {
     }
     for (let i = 2; i + 5 < pts.length; i += 6) {
       this.flattenInto(pts[i - 2], pts[i - 1], pts[i], pts[i + 1], pts[i + 2], pts[i + 3], pts[i + 4], pts[i + 5]);
+      for (let k = i; k < i + 6; k += 2) {
+        this.log(pts[k], pts[k + 1], 4);
+      }
     }
   }
   /** Closes the open figure (the next drawing call starts a new one). */
@@ -2044,6 +2094,8 @@ var GdiRasterPath = class {
     if (this.current) {
       this.current.closed = true;
       this.current = null;
+      const t = this.getPath.types;
+      t[t.length - 1] |= 1;
     }
   }
   /** Appends every figure of `other`. */
@@ -2051,6 +2103,9 @@ var GdiRasterPath = class {
     for (const f of other.figures) {
       this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
     }
+    for (let i = 0; i < other.getPath.types.length; i++) {
+      this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
+    }
     this.current = null;
   }
   lastPoint() {
@@ -16653,8 +16708,11 @@ function boxCorners(box) {
   const { ax, ay, exx, exy, eyx, eyy } = box;
   return [ax + exx, ay + exy, ax, ay, ax + eyx, ay + eyy, ax + exx + eyx, ay + exy + eyy];
 }
-function rectRasterPath(box) {
-  const c = boxCorners(box);
+function flipBox(box) {
+  return { ax: box.ax + box.eyx, ay: box.ay + box.eyy, exx: box.exx, exy: box.exy, eyx: -box.eyx, eyy: -box.eyy };
+}
+function rectRasterPath(box, clockwise = false) {
+  const c = boxCorners(clockwise ? flipBox(box) : box);
   const path = new GdiRasterPath();
   path.moveTo(c[0], c[1]);
   path.lineTo(c[2], c[3]);
@@ -16663,9 +16721,9 @@ function rectRasterPath(box) {
   path.closeFigure();
   return path;
 }
-function ellipseRasterPath(box) {
+function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
-  path.addBeziers(ellipseBeziersBox(box), true);
+  path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
   return path;
 }
@@ -16691,13 +16749,16 @@ function boxFrame(box) {
   const h = Math.round(Math.hypot(box.eyx, box.eyy));
   return { l: 0, t: 0, r: w, b: h };
 }
-function roundRectRasterPath(box, cw, ch) {
+function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false) {
+  if (rectangle) {
+    return rectRasterPath(box, clockwise);
+  }
   const f = boxFrame(box);
   const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
-    pts.push(...map(q[i], q[i + 1]));
+    pts.push(...map(q[i], clockwise ? f.t + f.b - q[i + 1] : q[i + 1]));
   }
   const path = new GdiRasterPath();
   for (let c = 0; c < 4; c++) {
@@ -16740,7 +16801,7 @@ function arcRasterPath(box, s, e, clockwise, kind, from, path = new GdiRasterPat
     pts.push(...map(bz[i], bz[i + 1]));
   }
   if (kind === "arcto" && from) {
-    path.lineTo(from[0], from[1]);
+    path.continueAt(from[0], from[1]);
     path.addBeziers(pts, false);
   } else {
     path.addBeziers(pts, true);
@@ -19460,6 +19521,15 @@ function rasterPathOf(rCtx) {
   rCtx.rasterPath ?? (rCtx.rasterPath = new GdiRasterPath());
   return rCtx.rasterPath;
 }
+function continueFigure(rCtx) {
+  const path = rasterPathOf(rCtx);
+  const [x, y] = currentFix(rCtx);
+  const before = path.figures.length;
+  path.continueAt(x, y);
+  if (path.figures.length !== before) {
+    gdiPathRecorder(rCtx).moveTo(x / 16, y / 16);
+  }
+}
 function lineStyleOf(rCtx) {
   rCtx.lineStyle ?? (rCtx.lineStyle = { pos: 0 });
   return rCtx.lineStyle;
@@ -19475,6 +19545,9 @@ function currentFix(rCtx) {
   }
   return fixPoint(rCtx, state.curX, state.curY);
 }
+function uprightFixBox(rCtx, l, t, r, b) {
+  return fixBox(rCtx, Math.min(l, r), Math.min(t, b), Math.max(l, r), Math.max(t, b));
+}
 function fixExtent(rCtx, v, axis) {
   const m = gdiDeviceMatrix(rCtx);
   const k = axis === 0 ? Math.hypot(m[0], m[1]) : Math.hypot(m[2], m[3]);
@@ -19517,6 +19590,7 @@ function handleLineTo(rCtx, dataOff, recSize) {
     const to = rotated ? gmapPoint(rCtx, lx, ly) : { x: gmx(rCtx, lx), y: gmy(rCtx, ly) };
     const fixTo = fixPoint(rCtx, lx, ly);
     if (inPath) {
+      continueFigure(rCtx);
       gdiPathRecorder(rCtx).lineTo(to.x, to.y);
       rasterPathOf(rCtx).lineTo(fixTo[0], fixTo[1]);
     } else {
@@ -19551,7 +19625,8 @@ function handleRectangle(rCtx, dataOff, recSize) {
     const t = view.getInt32(dataOff + 4, true);
     const r = view.getInt32(dataOff + 8, true);
     const b = view.getInt32(dataOff + 12, true);
-    const box = fixBox(rCtx, l, t, r, b);
+    const box = uprightFixBox(rCtx, l, t, r, b);
+    const clockwise = rCtx.state.arcDirection === 2;
     if (!inPath) {
       resetLineStyle(rCtx);
     }
@@ -19570,14 +19645,14 @@ function handleRectangle(rCtx, dataOff, recSize) {
       };
       if (inPath) {
         appendRect(gdiPathRecorder(rCtx));
-        rasterPathOf(rCtx).append(rectRasterPath(box));
+        rasterPathOf(rCtx).append(rectRasterPath(box, clockwise));
       } else {
         paintGdiShape(rCtx, {
           build: (c) => {
             c.beginPath();
             appendRect(c);
           },
-          raster: () => rectRasterPath(box),
+          raster: () => rectRasterPath(box, clockwise),
           rectangle: true,
           fill: true,
           stroke: true,
@@ -19592,14 +19667,14 @@ function handleRectangle(rCtx, dataOff, recSize) {
     const h = gmh(rCtx, b - t);
     if (inPath) {
       gdiPathRecorder(rCtx).rect(x, y, w, h);
-      rasterPathOf(rCtx).append(rectRasterPath(box));
+      rasterPathOf(rCtx).append(rectRasterPath(box, clockwise));
     } else if (needsPathBasedRectangle(rCtx)) {
       paintGdiShape(rCtx, {
         build: (c) => {
           c.beginPath();
           c.rect(x, y, w, h);
         },
-        raster: () => rectRasterPath(box),
+        raster: () => rectRasterPath(box, clockwise),
         rectangle: true,
         fill: true,
         stroke: true,
@@ -19712,7 +19787,8 @@ function handleRoundRect(rCtx, dataOff, recSize) {
       gmh(rCtx, cornerH) / 2,
       null
     );
-    const raster = (box = fixBox(rCtx, l, t, r, b)) => roundRectRasterPath(box, fixExtent(rCtx, cornerW, 0), fixExtent(rCtx, cornerH, 1));
+    const clockwise = rCtx.state.arcDirection === 2;
+    const raster = (box = uprightFixBox(rCtx, l, t, r, b)) => roundRectRasterPath(box, fixExtent(rCtx, cornerW, 0), fixExtent(rCtx, cornerH, 1), clockwise, cornerW === 0 || cornerH === 0);
     if (inPath) {
       drawRoundRect(gdiPathRecorder(rCtx));
       rasterPathOf(rCtx).append(raster());
@@ -19723,7 +19799,7 @@ function handleRoundRect(rCtx, dataOff, recSize) {
           c.beginPath();
           drawRoundRect(c);
         },
-        raster: () => raster(curvedFixBox(rCtx, l, t, r, b)),
+        raster: () => raster(curvedFixBox(rCtx, l, t, r, b, true)),
         roundPen: true,
         fill: true,
         stroke: true
@@ -19732,8 +19808,8 @@ function handleRoundRect(rCtx, dataOff, recSize) {
   }
   return true;
 }
-function curvedFixBox(rCtx, l, t, r, b) {
-  const box = fixBox(rCtx, l, t, r, b);
+function curvedFixBox(rCtx, l, t, r, b, upright = false) {
+  const box = upright ? uprightFixBox(rCtx, l, t, r, b) : fixBox(rCtx, l, t, r, b);
   if (rCtx.state.penStyle !== 5) {
     return box;
   }
@@ -19759,6 +19835,7 @@ function handleEllipse(rCtx, dataOff, recSize) {
     const t = view.getInt32(dataOff + 4, true);
     const r = view.getInt32(dataOff + 8, true);
     const b = view.getInt32(dataOff + 12, true);
+    const clockwise = rCtx.state.arcDirection === 2;
     const params = hasWorldRotation(rCtx) ? gdiEllipseParams(rCtx, (l + r) / 2, (t + b) / 2, Math.abs(r - l) / 2, Math.abs(b - t) / 2) : {
       cx: gmx(rCtx, (l + r) / 2),
       cy: gmy(rCtx, (t + b) / 2),
@@ -19768,7 +19845,7 @@ function handleEllipse(rCtx, dataOff, recSize) {
     };
     if (inPath) {
       gdiPathRecorder(rCtx).ellipse(params.cx, params.cy, params.rx, params.ry, params.rotation, 0, Math.PI * 2);
-      rasterPathOf(rCtx).append(ellipseRasterPath(fixBox(rCtx, l, t, r, b)));
+      rasterPathOf(rCtx).append(ellipseRasterPath(uprightFixBox(rCtx, l, t, r, b), clockwise));
     } else {
       resetLineStyle(rCtx);
       paintGdiShape(rCtx, {
@@ -19776,7 +19853,7 @@ function handleEllipse(rCtx, dataOff, recSize) {
           c.beginPath();
           c.ellipse(params.cx, params.cy, params.rx, params.ry, params.rotation, 0, Math.PI * 2);
         },
-        raster: () => ellipseRasterPath(curvedFixBox(rCtx, l, t, r, b)),
+        raster: () => ellipseRasterPath(curvedFixBox(rCtx, l, t, r, b, true), clockwise),
         roundPen: true,
         fill: true,
         stroke: true
@@ -19834,6 +19911,9 @@ function handleArcFamily(rCtx, recType, dataOff, recSize) {
       from: currentFix(rCtx)
     });
     if (inPath) {
+      if (isArcTo) {
+        continueFigure(rCtx);
+      }
       build(gdiPathRecorder(rCtx));
       const a = rasterArgs();
       arcRasterPath(a.box, a.s, a.e, clockwise, kind, a.from, rasterPathOf(rCtx));
@@ -19910,9 +19990,7 @@ function handleAngleArc(rCtx, dataOff, recSize) {
   }
   const e = [fixPts[fixPts.length - 2], fixPts[fixPts.length - 1]];
   const buildRaster = (path, from) => {
-    if (from) {
-      path.moveTo(from[0], from[1]);
-    }
+    path.continueAt(from[0], from[1]);
     path.addBeziers(fixPts, false);
   };
   const params = gdiEllipseParams(rCtx, cx, cy, radius, radius);
@@ -19926,9 +20004,9 @@ function handleAngleArc(rCtx, dataOff, recSize) {
     c.ellipse(params.cx, params.cy, params.rx, params.ry, params.rotation, -a0, clockwise ? -a0 + span : -a0 - span, !clockwise);
   };
   if (inPath) {
-    const rec = gdiPathRecorder(rCtx);
-    buildCanvas(rec);
-    buildRaster(rasterPathOf(rCtx), rasterPathOf(rCtx).figures.length === 0 ? currentFix(rCtx) : null);
+    continueFigure(rCtx);
+    buildCanvas(gdiPathRecorder(rCtx));
+    buildRaster(rasterPathOf(rCtx), currentFix(rCtx));
   } else {
     resetLineStyle(rCtx);
     const from = currentFix(rCtx);
@@ -22775,9 +22853,12 @@ function handlePoly(rCtx, recType, count, readPt, kinds) {
     }
   };
   if (inPath) {
+    if (isTo) {
+      continueFigure(rCtx);
+    }
     build(gdiPathRecorder(rCtx));
     rCtx.rasterPath ?? (rCtx.rasterPath = new GdiRasterPath());
-    buildRaster(rCtx.rasterPath, isTo && rCtx.rasterPath.figures.length === 0 ? currentFix(rCtx) : null);
+    buildRaster(rCtx.rasterPath, null);
   } else {
     const from = isTo ? currentFix(rCtx) : null;
     const start = isTo ? gmapPoint(rCtx, state.curX, state.curY) : null;
@@ -22800,10 +22881,11 @@ function handlePoly(rCtx, recType, count, readPt, kinds) {
       fillRule: state.polyFillMode === 2 ? "nonzero" : "evenodd"
     });
   }
-  if (count > 0) {
+  if (isTo && count > 0) {
     const [x, y] = readPt(count - 1);
     state.curX = x;
     state.curY = y;
+    rCtx.curFix = void 0;
   }
 }
 function handlePoly32(rCtx, recType, offset, dataOff, recSize) {
@@ -22908,9 +22990,11 @@ function handlePolyDraw(rCtx, offset, dataOff, recSize, pointSize) {
   };
   const startsWithMove = (typeAt(0) & ~PT_CLOSEFIGURE) === PT_MOVETO;
   if (inPath) {
+    if (!startsWithMove) {
+      continueFigure(rCtx);
+    }
     rCtx.rasterPath ?? (rCtx.rasterPath = new GdiRasterPath());
-    const fresh = rCtx.rasterPath.figures.length === 0;
-    walk2(gdiPathRecorder(rCtx), rCtx.rasterPath, !startsWithMove && fresh ? currentFix(rCtx) : null, null);
+    walk2(gdiPathRecorder(rCtx), rCtx.rasterPath, null, null);
   } else {
     const from = startsWithMove ? null : currentFix(rCtx);
     const fromPx = startsWithMove ? null : gmapPoint(rCtx, state.curX, state.curY);
@@ -27366,7 +27450,8 @@ function wmfSetDibToDev(p, d, end) {
   const hv = new DataView(bmi.buffer);
   const fullH = hv.getInt32(8, true);
   hv.setInt32(8, fullH < 0 ? -scanCount : scanCount, true);
-  const [ox, oy] = deviceDest(p, dx, dy, 0, 0);
+  const [mx, oy] = deviceDest(p, dx, dy, 0, 0);
+  const ox = p.layout & 1 ? mx - w : mx;
   playStretchDibits(p, 13369376, ox, oy + (sy + h - hi), w, hi - lo, sx, lo - startScan, w, hi - lo, { bmi, bits: dib.bits }, true);
 }
 
@@ -27713,25 +27798,30 @@ function wmfRectangle(p, l, t, r, b) {
       c.beginPath();
       c.rect(cr.x, cr.y, cr.w, cr.h);
     },
-    raster: () => rectRasterPath(fixBoxOf(box)),
+    raster: () => rectRasterPath(fixBoxOf(box), clockwiseOf(p)),
     rectangle: true,
     fill: true,
     stroke: true,
     axisRect: { interior: rectInterior(p, box) }
   });
 }
+function compatCorner(p, w, h) {
+  const m = gdiDeviceMatrix(p.rCtx);
+  const cw = Math.round(Math.abs(w * m[0]) * 16);
+  const ch = Math.round(Math.abs(h * m[3]) * 16);
+  const ux = 16 * p.kx;
+  const uy = 16 * p.ky;
+  if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
+    return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
+  }
+  return [Math.round(Math.floor(Math.round(cw / ux) / 2) * 2 * ux), Math.round(Math.floor(Math.round(ch / uy) / 2) * 2 * uy)];
+}
 function wmfRoundRect(p, l, t, r, b, w, h) {
   const box = compatBox(p, l, t, r, b, { curved: true });
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const m = gdiDeviceMatrix(p.rCtx);
-  let cw = Math.round(Math.abs(w * m[0]) * 16);
-  let ch = Math.round(Math.abs(h * m[3]) * 16);
-  if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
-    cw = Math.floor(cw / 32) * 32;
-    ch = Math.floor(ch / 32) * 32;
-  }
+  const [cw, ch] = compatCorner(p, w, h);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -27756,7 +27846,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0),
     roundPen: true,
     fill: true,
     stroke: true
@@ -27773,24 +27863,31 @@ function wmfEllipse(p, l, t, r, b) {
       c.beginPath();
       c.ellipse(cr.x + cr.w / 2, cr.y + cr.h / 2, cr.w / 2, cr.h / 2, 0, 0, Math.PI * 2);
     },
-    raster: () => ellipseRasterPath(fixBoxOf(box)),
+    raster: () => ellipseRasterPath(fixBoxOf(box), clockwiseOf(p)),
     roundPen: true,
     fill: true,
     stroke: true
   });
 }
-function wmfArcFamily(p, kind, l, t, r, b, xs, ys, xe, ye) {
-  const box = compatBox(p, l, t, r, b, { curved: kind !== "arc" });
+function compatArc(p, kind, l, t, r, b, xs, ys, xe, ye) {
+  const box = compatBox(p, l, t, r, b, { curved: kind === "chord" || kind === "pie" });
   if (box.x1 < box.x0 || box.y1 < box.y0) {
-    return;
+    return null;
   }
   const raw = compatBox(p, l, t, r, b, { exclusive: false });
-  const rdx = (box.x0 + box.x1 - raw.x0 - raw.x1) / 2;
-  const rdy = (box.y0 + box.y1 - raw.y0 - raw.y1) / 2;
-  const s0 = fixPoint(p.rCtx, xs, ys);
-  const e0 = fixPoint(p.rCtx, xe, ye);
-  const s = [s0[0] + rdx, s0[1] + rdy];
-  const e = [e0[0] + rdx, e0[1] + rdy];
+  const onBox = (v, r0, r1, b0, b1) => (b0 + b1) / 2 + (r1 !== r0 ? (v - (r0 + r1) / 2) * (b1 - b0) / (r1 - r0) : v - (r0 + r1) / 2);
+  const radial = (x, y) => {
+    const [fx, fy] = fixPoint(p.rCtx, x, y);
+    return [onBox(fx, raw.x0, raw.x1, box.x0, box.x1), onBox(fy, raw.y0, raw.y1, box.y0, box.y1)];
+  };
+  return { box, s: radial(xs, ys), e: radial(xe, ye) };
+}
+function wmfArcFamily(p, kind, l, t, r, b, xs, ys, xe, ye) {
+  const geom = compatArc(p, kind, l, t, r, b, xs, ys, xe, ye);
+  if (!geom) {
+    return;
+  }
+  const { box, s, e } = geom;
   const clockwise = p.rCtx.state.arcDirection === 2;
   const cr = canvasRect(box);
   const cx = cr.x + cr.w / 2;
@@ -27816,6 +27913,9 @@ function wmfArcFamily(p, kind, l, t, r, b, xs, ys, xe, ye) {
     stroke: true
   });
 }
+function clockwiseOf(p) {
+  return p.rCtx.state.arcDirection === 2;
+}
 function penIsNull(p) {
   return (p.rCtx.state.penStyle & 15) === PS_NULL3;
 }

package/dist/index.mjs

@@ -1735,7 +1735,21 @@ var KAPPA = 0.5522847498307936;
 function axisBox(l, t, r, b) {
   return { ax: l, ay: t, exx: r - l, exy: 0, eyx: 0, eyy: b - t };
 }
-function ellipseBeziersBox(box) {
+function ellipseBeziersBox(box, clockwise = false) {
+  if (!clockwise) {
+    return ellipsePoints(box, false);
+  }
+  const e = clockwiseEllipseBeziersBox(box);
+  const out = [];
+  for (let i = e.length - 2; i >= 0; i -= 2) {
+    out.push(e[i], e[i + 1]);
+  }
+  return out;
+}
+function clockwiseEllipseBeziersBox(box) {
+  return ellipsePoints(box, true);
+}
+function ellipsePoints(box, cwControls) {
   const half = (v, up) => up ? Math.ceil(v / 2) : Math.floor(v / 2);
   const hMidLo = (v) => half(v, false);
   const hMidHi = (v) => half(v, true);
@@ -1745,6 +1759,11 @@ function ellipseBeziersBox(box) {
   const vMidHi = (v) => half(v, true);
   const vCtl = (v) => Math.floor(v / 2) - Math.floor(KAPPA * Math.floor(v / 2));
   const vCtlR = (v) => v - vCtl(v);
+  const vDist = (v) => Math.ceil(KAPPA * Math.floor(v / 2));
+  const rightUpper = cwControls ? (v) => vMidHi(v) - vDist(v) : vCtl;
+  const leftUpper = cwControls ? (v) => vMidLo(v) - vDist(v) : vCtl;
+  const leftLower = cwControls ? (v) => vMidLo(v) + vDist(v) : vCtlR;
+  const rightLower = cwControls ? (v) => vMidHi(v) + vDist(v) : vCtlR;
   const zero = () => 0;
   const full = (v) => v;
   const { ax, ay, exx, exy, eyx, eyy } = box;
@@ -1753,17 +1772,17 @@ function ellipseBeziersBox(box) {
     out.push(ax + gx(exx) + gy(eyx), ay + gx(exy) + gy(eyy));
   };
   P(full, vMidHi);
-  P(full, vCtl);
+  P(full, rightUpper);
   P(hCtl, zero);
   P(hMidLo, zero);
   P(hCtl2, zero);
-  P(zero, vCtl);
+  P(zero, leftUpper);
   P(zero, vMidLo);
-  P(zero, vCtlR);
+  P(zero, leftLower);
   P(hCtl2, full);
   P(hMidHi, full);
   P(hCtl, full);
-  P(full, vCtlR);
+  P(full, rightLower);
   P(full, vMidHi);
   return out;
 }
@@ -1780,8 +1799,12 @@ function flattenBezierPath(pts) {
 function roundRectCorners(l, t, r, b, cw, ch) {
   const w = r - l;
   const h = b - t;
-  const ew = Math.min(Math.abs(cw), w);
-  const eh = Math.min(Math.abs(ch), h);
+  let ew = Math.min(Math.abs(cw), w);
+  let eh = Math.min(Math.abs(ch), h);
+  if (ew === 0 || eh === 0) {
+    ew = 0;
+    eh = 0;
+  }
   const hy = Math.floor(h / 2) - Math.floor((h - eh) / 2);
   const topX = Math.floor(r - ew / 2);
   const hx = r - topX;
@@ -1890,12 +1913,7 @@ function angleArcFix(box, startDeg, sweepDeg) {
   const cx = l + w / 2;
   const cy = t + h / 2;
   const E = ellipseBeziers(l, t, l + w, t + h);
-  const Ecw = E.slice();
-  const d = Math.ceil(KAPPA * Math.floor(h / 2));
-  Ecw[3] = Ecw[1] - d;
-  Ecw[11] = Ecw[13] - d;
-  Ecw[15] = Ecw[13] + d;
-  Ecw[23] = Ecw[1] + d;
+  const Ecw = clockwiseEllipseBeziersBox(axisBox(l, t, l + w, t + h));
   const start = startDeg * Math.PI / 180;
   const out = [Math.round(cx + w / 2 * tableCos(start)), Math.round(cy - h / 2 * tableSin(start))];
   for (const p of angleArcPieces(startDeg, sweepDeg)) {
@@ -1937,15 +1955,7 @@ function arcBeziers(l, t, r, b, xs, ys, xe, ye, clockwise) {
   }
   const px = (a2) => cx + rx * tableCos(a2);
   const py = (a2) => cy - ry * tableSin(a2);
-  const E = ellipseBeziers(l, t, r, b);
-  if (clockwise) {
-    const fh = Math.floor((b - t) / 2);
-    const d = Math.ceil(KAPPA * fh);
-    E[3] = E[1] - d;
-    E[11] = E[13] - d;
-    E[15] = E[13] + d;
-    E[23] = E[1] + d;
-  }
+  const E = clockwise ? clockwiseEllipseBeziersBox(axisBox(l, t, r, b)) : ellipseBeziers(l, t, r, b);
   const out = [Math.round(px(a0)), Math.round(py(a0))];
   let a = a0;
   for (let guard = 0; guard < 8 && (s > 0 ? a < a1 - 1e-12 : a > a1 + 1e-12); guard++) {
@@ -1978,12 +1988,45 @@ function arcBeziers(l, t, r, b, xs, ys, xe, ye, clockwise) {
 var GdiRasterPath = class {
   constructor() {
     this.figures = [];
+    /**
+     * The path as `GetPath` reports it, before flattening: FIX points
+     * (`[x0, y0, ...]`) and their `PT_*` types (`PT_MOVETO` 6, `PT_LINETO`
+     * 2, `PT_BEZIERTO` 4, `PT_CLOSEFIGURE` 1 or-ed onto a figure's last
+     * point). Used to check the geometry against Windows' own paths.
+     */
+    this.getPath = { pts: [], types: [] };
     this.current = null;
   }
   /** Starts a new figure at (`x`, `y`). */
   moveTo(x, y) {
     this.current = { pts: [x, y], closed: false };
     this.figures.push(this.current);
+    this.log(x, y, 6);
+  }
+  /**
+   * Starts a new figure at the current position (`x`, `y`) unless the open
+   * figure already ends there. GDI opens a new figure for a drawing call
+   * that continues from the current position (`LineTo`, `PolylineTo`,
+   * `ArcTo`, ...) when the path is empty, its last figure is closed, or
+   * the current position has moved away from the path's last point (a
+   * `MoveTo`, or a call such as `Polyline`, `Arc` or `PolyPolygon` that
+   * adds to the path without moving the current position; Windows'
+   * `GetPath`, Wine `gdi32/tests/path.c`, `test_all_functions`).
+   */
+  continueAt(x, y) {
+    const f = this.current;
+    if (f && f.pts[f.pts.length - 2] === x && f.pts[f.pts.length - 1] === y) {
+      return;
+    }
+    this.moveTo(x, y);
+  }
+  /** True when a figure is open (not closed and not ended by an appended path). */
+  hasOpenFigure() {
+    return this.current !== null;
+  }
+  log(x, y, type) {
+    this.getPath.pts.push(x, y);
+    this.getPath.types.push(type);
   }
   /** Adds a line to (`x`, `y`), starting a figure there when none is open. */
   lineTo(x, y) {
@@ -1992,6 +2035,7 @@ var GdiRasterPath = class {
       this.moveTo(last ? last[0] : x, last ? last[1] : y);
     }
     this.current.pts.push(x, y);
+    this.log(x, y, 2);
   }
   /** Adds a cubic Bezier from the current point. */
   bezierTo(c1x, c1y, c2x, c2y, x, y) {
@@ -2001,6 +2045,9 @@ var GdiRasterPath = class {
     }
     const p = this.current.pts;
     this.flattenInto(p[p.length - 2], p[p.length - 1], c1x, c1y, c2x, c2y, x, y);
+    this.log(c1x, c1y, 4);
+    this.log(c2x, c2y, 4);
+    this.log(x, y, 4);
   }
   /** Flattens one Bezier onto the open figure, recording its end tangents. */
   flattenInto(x0, y0, c1x, c1y, c2x, c2y, x3, y3) {
@@ -2035,6 +2082,9 @@ var GdiRasterPath = class {
     }
     for (let i = 2; i + 5 < pts.length; i += 6) {
       this.flattenInto(pts[i - 2], pts[i - 1], pts[i], pts[i + 1], pts[i + 2], pts[i + 3], pts[i + 4], pts[i + 5]);
+      for (let k = i; k < i + 6; k += 2) {
+        this.log(pts[k], pts[k + 1], 4);
+      }
     }
   }
   /** Closes the open figure (the next drawing call starts a new one). */
@@ -2042,6 +2092,8 @@ var GdiRasterPath = class {
     if (this.current) {
       this.current.closed = true;
       this.current = null;
+      const t = this.getPath.types;
+      t[t.length - 1] |= 1;
     }
   }
   /** Appends every figure of `other`. */
@@ -2049,6 +2101,9 @@ var GdiRasterPath = class {
     for (const f of other.figures) {
       this.figures.push({ pts: f.pts.slice(), closed: f.closed, tangents: f.tangents && new Map(f.tangents) });
     }
+    for (let i = 0; i < other.getPath.types.length; i++) {
+      this.log(other.getPath.pts[2 * i], other.getPath.pts[2 * i + 1], other.getPath.types[i]);
+    }
     this.current = null;
   }
   lastPoint() {
@@ -16651,8 +16706,11 @@ function boxCorners(box) {
   const { ax, ay, exx, exy, eyx, eyy } = box;
   return [ax + exx, ay + exy, ax, ay, ax + eyx, ay + eyy, ax + exx + eyx, ay + exy + eyy];
 }
-function rectRasterPath(box) {
-  const c = boxCorners(box);
+function flipBox(box) {
+  return { ax: box.ax + box.eyx, ay: box.ay + box.eyy, exx: box.exx, exy: box.exy, eyx: -box.eyx, eyy: -box.eyy };
+}
+function rectRasterPath(box, clockwise = false) {
+  const c = boxCorners(clockwise ? flipBox(box) : box);
   const path = new GdiRasterPath();
   path.moveTo(c[0], c[1]);
   path.lineTo(c[2], c[3]);
@@ -16661,9 +16719,9 @@ function rectRasterPath(box) {
   path.closeFigure();
   return path;
 }
-function ellipseRasterPath(box) {
+function ellipseRasterPath(box, clockwise = false) {
   const path = new GdiRasterPath();
-  path.addBeziers(ellipseBeziersBox(box), true);
+  path.addBeziers(ellipseBeziersBox(box, clockwise), true);
   path.closeFigure();
   return path;
 }
@@ -16689,13 +16747,16 @@ function boxFrame(box) {
   const h = Math.round(Math.hypot(box.eyx, box.eyy));
   return { l: 0, t: 0, r: w, b: h };
 }
-function roundRectRasterPath(box, cw, ch) {
+function roundRectRasterPath(box, cw, ch, clockwise = false, rectangle = false) {
+  if (rectangle) {
+    return rectRasterPath(box, clockwise);
+  }
   const f = boxFrame(box);
   const q = roundRectCorners(f.l, f.t, f.r, f.b, cw, ch);
   const map = frameMapper(box, f.l, f.t, f.r - f.l, f.b - f.t);
   const pts = [];
   for (let i = 0; i < q.length; i += 2) {
-    pts.push(...map(q[i], q[i + 1]));
+    pts.push(...map(q[i], clockwise ? f.t + f.b - q[i + 1] : q[i + 1]));
   }
   const path = new GdiRasterPath();
   for (let c = 0; c < 4; c++) {
@@ -16738,7 +16799,7 @@ function arcRasterPath(box, s, e, clockwise, kind, from, path = new GdiRasterPat
     pts.push(...map(bz[i], bz[i + 1]));
   }
   if (kind === "arcto" && from) {
-    path.lineTo(from[0], from[1]);
+    path.continueAt(from[0], from[1]);
     path.addBeziers(pts, false);
   } else {
     path.addBeziers(pts, true);
@@ -19458,6 +19519,15 @@ function rasterPathOf(rCtx) {
   rCtx.rasterPath ?? (rCtx.rasterPath = new GdiRasterPath());
   return rCtx.rasterPath;
 }
+function continueFigure(rCtx) {
+  const path = rasterPathOf(rCtx);
+  const [x, y] = currentFix(rCtx);
+  const before = path.figures.length;
+  path.continueAt(x, y);
+  if (path.figures.length !== before) {
+    gdiPathRecorder(rCtx).moveTo(x / 16, y / 16);
+  }
+}
 function lineStyleOf(rCtx) {
   rCtx.lineStyle ?? (rCtx.lineStyle = { pos: 0 });
   return rCtx.lineStyle;
@@ -19473,6 +19543,9 @@ function currentFix(rCtx) {
   }
   return fixPoint(rCtx, state.curX, state.curY);
 }
+function uprightFixBox(rCtx, l, t, r, b) {
+  return fixBox(rCtx, Math.min(l, r), Math.min(t, b), Math.max(l, r), Math.max(t, b));
+}
 function fixExtent(rCtx, v, axis) {
   const m = gdiDeviceMatrix(rCtx);
   const k = axis === 0 ? Math.hypot(m[0], m[1]) : Math.hypot(m[2], m[3]);
@@ -19515,6 +19588,7 @@ function handleLineTo(rCtx, dataOff, recSize) {
     const to = rotated ? gmapPoint(rCtx, lx, ly) : { x: gmx(rCtx, lx), y: gmy(rCtx, ly) };
     const fixTo = fixPoint(rCtx, lx, ly);
     if (inPath) {
+      continueFigure(rCtx);
       gdiPathRecorder(rCtx).lineTo(to.x, to.y);
       rasterPathOf(rCtx).lineTo(fixTo[0], fixTo[1]);
     } else {
@@ -19549,7 +19623,8 @@ function handleRectangle(rCtx, dataOff, recSize) {
     const t = view.getInt32(dataOff + 4, true);
     const r = view.getInt32(dataOff + 8, true);
     const b = view.getInt32(dataOff + 12, true);
-    const box = fixBox(rCtx, l, t, r, b);
+    const box = uprightFixBox(rCtx, l, t, r, b);
+    const clockwise = rCtx.state.arcDirection === 2;
     if (!inPath) {
       resetLineStyle(rCtx);
     }
@@ -19568,14 +19643,14 @@ function handleRectangle(rCtx, dataOff, recSize) {
       };
       if (inPath) {
         appendRect(gdiPathRecorder(rCtx));
-        rasterPathOf(rCtx).append(rectRasterPath(box));
+        rasterPathOf(rCtx).append(rectRasterPath(box, clockwise));
       } else {
         paintGdiShape(rCtx, {
           build: (c) => {
             c.beginPath();
             appendRect(c);
           },
-          raster: () => rectRasterPath(box),
+          raster: () => rectRasterPath(box, clockwise),
           rectangle: true,
           fill: true,
           stroke: true,
@@ -19590,14 +19665,14 @@ function handleRectangle(rCtx, dataOff, recSize) {
     const h = gmh(rCtx, b - t);
     if (inPath) {
       gdiPathRecorder(rCtx).rect(x, y, w, h);
-      rasterPathOf(rCtx).append(rectRasterPath(box));
+      rasterPathOf(rCtx).append(rectRasterPath(box, clockwise));
     } else if (needsPathBasedRectangle(rCtx)) {
       paintGdiShape(rCtx, {
         build: (c) => {
           c.beginPath();
           c.rect(x, y, w, h);
         },
-        raster: () => rectRasterPath(box),
+        raster: () => rectRasterPath(box, clockwise),
         rectangle: true,
         fill: true,
         stroke: true,
@@ -19710,7 +19785,8 @@ function handleRoundRect(rCtx, dataOff, recSize) {
       gmh(rCtx, cornerH) / 2,
       null
     );
-    const raster = (box = fixBox(rCtx, l, t, r, b)) => roundRectRasterPath(box, fixExtent(rCtx, cornerW, 0), fixExtent(rCtx, cornerH, 1));
+    const clockwise = rCtx.state.arcDirection === 2;
+    const raster = (box = uprightFixBox(rCtx, l, t, r, b)) => roundRectRasterPath(box, fixExtent(rCtx, cornerW, 0), fixExtent(rCtx, cornerH, 1), clockwise, cornerW === 0 || cornerH === 0);
     if (inPath) {
       drawRoundRect(gdiPathRecorder(rCtx));
       rasterPathOf(rCtx).append(raster());
@@ -19721,7 +19797,7 @@ function handleRoundRect(rCtx, dataOff, recSize) {
           c.beginPath();
           drawRoundRect(c);
         },
-        raster: () => raster(curvedFixBox(rCtx, l, t, r, b)),
+        raster: () => raster(curvedFixBox(rCtx, l, t, r, b, true)),
         roundPen: true,
         fill: true,
         stroke: true
@@ -19730,8 +19806,8 @@ function handleRoundRect(rCtx, dataOff, recSize) {
   }
   return true;
 }
-function curvedFixBox(rCtx, l, t, r, b) {
-  const box = fixBox(rCtx, l, t, r, b);
+function curvedFixBox(rCtx, l, t, r, b, upright = false) {
+  const box = upright ? uprightFixBox(rCtx, l, t, r, b) : fixBox(rCtx, l, t, r, b);
   if (rCtx.state.penStyle !== 5) {
     return box;
   }
@@ -19757,6 +19833,7 @@ function handleEllipse(rCtx, dataOff, recSize) {
     const t = view.getInt32(dataOff + 4, true);
     const r = view.getInt32(dataOff + 8, true);
     const b = view.getInt32(dataOff + 12, true);
+    const clockwise = rCtx.state.arcDirection === 2;
     const params = hasWorldRotation(rCtx) ? gdiEllipseParams(rCtx, (l + r) / 2, (t + b) / 2, Math.abs(r - l) / 2, Math.abs(b - t) / 2) : {
       cx: gmx(rCtx, (l + r) / 2),
       cy: gmy(rCtx, (t + b) / 2),
@@ -19766,7 +19843,7 @@ function handleEllipse(rCtx, dataOff, recSize) {
     };
     if (inPath) {
       gdiPathRecorder(rCtx).ellipse(params.cx, params.cy, params.rx, params.ry, params.rotation, 0, Math.PI * 2);
-      rasterPathOf(rCtx).append(ellipseRasterPath(fixBox(rCtx, l, t, r, b)));
+      rasterPathOf(rCtx).append(ellipseRasterPath(uprightFixBox(rCtx, l, t, r, b), clockwise));
     } else {
       resetLineStyle(rCtx);
       paintGdiShape(rCtx, {
@@ -19774,7 +19851,7 @@ function handleEllipse(rCtx, dataOff, recSize) {
           c.beginPath();
           c.ellipse(params.cx, params.cy, params.rx, params.ry, params.rotation, 0, Math.PI * 2);
         },
-        raster: () => ellipseRasterPath(curvedFixBox(rCtx, l, t, r, b)),
+        raster: () => ellipseRasterPath(curvedFixBox(rCtx, l, t, r, b, true), clockwise),
         roundPen: true,
         fill: true,
         stroke: true
@@ -19832,6 +19909,9 @@ function handleArcFamily(rCtx, recType, dataOff, recSize) {
       from: currentFix(rCtx)
     });
     if (inPath) {
+      if (isArcTo) {
+        continueFigure(rCtx);
+      }
       build(gdiPathRecorder(rCtx));
       const a = rasterArgs();
       arcRasterPath(a.box, a.s, a.e, clockwise, kind, a.from, rasterPathOf(rCtx));
@@ -19908,9 +19988,7 @@ function handleAngleArc(rCtx, dataOff, recSize) {
   }
   const e = [fixPts[fixPts.length - 2], fixPts[fixPts.length - 1]];
   const buildRaster = (path, from) => {
-    if (from) {
-      path.moveTo(from[0], from[1]);
-    }
+    path.continueAt(from[0], from[1]);
     path.addBeziers(fixPts, false);
   };
   const params = gdiEllipseParams(rCtx, cx, cy, radius, radius);
@@ -19924,9 +20002,9 @@ function handleAngleArc(rCtx, dataOff, recSize) {
     c.ellipse(params.cx, params.cy, params.rx, params.ry, params.rotation, -a0, clockwise ? -a0 + span : -a0 - span, !clockwise);
   };
   if (inPath) {
-    const rec = gdiPathRecorder(rCtx);
-    buildCanvas(rec);
-    buildRaster(rasterPathOf(rCtx), rasterPathOf(rCtx).figures.length === 0 ? currentFix(rCtx) : null);
+    continueFigure(rCtx);
+    buildCanvas(gdiPathRecorder(rCtx));
+    buildRaster(rasterPathOf(rCtx), currentFix(rCtx));
   } else {
     resetLineStyle(rCtx);
     const from = currentFix(rCtx);
@@ -22773,9 +22851,12 @@ function handlePoly(rCtx, recType, count, readPt, kinds) {
     }
   };
   if (inPath) {
+    if (isTo) {
+      continueFigure(rCtx);
+    }
     build(gdiPathRecorder(rCtx));
     rCtx.rasterPath ?? (rCtx.rasterPath = new GdiRasterPath());
-    buildRaster(rCtx.rasterPath, isTo && rCtx.rasterPath.figures.length === 0 ? currentFix(rCtx) : null);
+    buildRaster(rCtx.rasterPath, null);
   } else {
     const from = isTo ? currentFix(rCtx) : null;
     const start = isTo ? gmapPoint(rCtx, state.curX, state.curY) : null;
@@ -22798,10 +22879,11 @@ function handlePoly(rCtx, recType, count, readPt, kinds) {
       fillRule: state.polyFillMode === 2 ? "nonzero" : "evenodd"
     });
   }
-  if (count > 0) {
+  if (isTo && count > 0) {
     const [x, y] = readPt(count - 1);
     state.curX = x;
     state.curY = y;
+    rCtx.curFix = void 0;
   }
 }
 function handlePoly32(rCtx, recType, offset, dataOff, recSize) {
@@ -22906,9 +22988,11 @@ function handlePolyDraw(rCtx, offset, dataOff, recSize, pointSize) {
   };
   const startsWithMove = (typeAt(0) & ~PT_CLOSEFIGURE) === PT_MOVETO;
   if (inPath) {
+    if (!startsWithMove) {
+      continueFigure(rCtx);
+    }
     rCtx.rasterPath ?? (rCtx.rasterPath = new GdiRasterPath());
-    const fresh = rCtx.rasterPath.figures.length === 0;
-    walk2(gdiPathRecorder(rCtx), rCtx.rasterPath, !startsWithMove && fresh ? currentFix(rCtx) : null, null);
+    walk2(gdiPathRecorder(rCtx), rCtx.rasterPath, null, null);
   } else {
     const from = startsWithMove ? null : currentFix(rCtx);
     const fromPx = startsWithMove ? null : gmapPoint(rCtx, state.curX, state.curY);
@@ -27364,7 +27448,8 @@ function wmfSetDibToDev(p, d, end) {
   const hv = new DataView(bmi.buffer);
   const fullH = hv.getInt32(8, true);
   hv.setInt32(8, fullH < 0 ? -scanCount : scanCount, true);
-  const [ox, oy] = deviceDest(p, dx, dy, 0, 0);
+  const [mx, oy] = deviceDest(p, dx, dy, 0, 0);
+  const ox = p.layout & 1 ? mx - w : mx;
   playStretchDibits(p, 13369376, ox, oy + (sy + h - hi), w, hi - lo, sx, lo - startScan, w, hi - lo, { bmi, bits: dib.bits }, true);
 }
 
@@ -27711,25 +27796,30 @@ function wmfRectangle(p, l, t, r, b) {
       c.beginPath();
       c.rect(cr.x, cr.y, cr.w, cr.h);
     },
-    raster: () => rectRasterPath(fixBoxOf(box)),
+    raster: () => rectRasterPath(fixBoxOf(box), clockwiseOf(p)),
     rectangle: true,
     fill: true,
     stroke: true,
     axisRect: { interior: rectInterior(p, box) }
   });
 }
+function compatCorner(p, w, h) {
+  const m = gdiDeviceMatrix(p.rCtx);
+  const cw = Math.round(Math.abs(w * m[0]) * 16);
+  const ch = Math.round(Math.abs(h * m[3]) * 16);
+  const ux = 16 * p.kx;
+  const uy = 16 * p.ky;
+  if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
+    return [Math.round(Math.floor(cw / (2 * ux)) * 2 * ux), Math.round(Math.floor(ch / (2 * uy)) * 2 * uy)];
+  }
+  return [Math.round(Math.floor(Math.round(cw / ux) / 2) * 2 * ux), Math.round(Math.floor(Math.round(ch / uy) / 2) * 2 * uy)];
+}
 function wmfRoundRect(p, l, t, r, b, w, h) {
   const box = compatBox(p, l, t, r, b, { curved: true });
   if (box.x1 < box.x0 || box.y1 < box.y0) {
     return;
   }
-  const m = gdiDeviceMatrix(p.rCtx);
-  let cw = Math.round(Math.abs(w * m[0]) * 16);
-  let ch = Math.round(Math.abs(h * m[3]) * 16);
-  if (!penIsNull(p) && !penIsCosmetic(p.rCtx)) {
-    cw = Math.floor(cw / 32) * 32;
-    ch = Math.floor(ch / 32) * 32;
-  }
+  const [cw, ch] = compatCorner(p, w, h);
   const cr = canvasRect(box);
   paintGdiShape(p.rCtx, {
     build: (c) => {
@@ -27754,7 +27844,7 @@ function wmfRoundRect(p, l, t, r, b, w, h) {
       c.ellipse(cr.x + ex, cr.y + ey, ex, ey, 0, 2 * q, 3 * q);
       c.closePath();
     },
-    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch),
+    raster: () => roundRectRasterPath(fixBoxOf(box), cw, ch, clockwiseOf(p), w === 0 || h === 0),
     roundPen: true,
     fill: true,
     stroke: true
@@ -27771,24 +27861,31 @@ function wmfEllipse(p, l, t, r, b) {
       c.beginPath();
       c.ellipse(cr.x + cr.w / 2, cr.y + cr.h / 2, cr.w / 2, cr.h / 2, 0, 0, Math.PI * 2);
     },
-    raster: () => ellipseRasterPath(fixBoxOf(box)),
+    raster: () => ellipseRasterPath(fixBoxOf(box), clockwiseOf(p)),
     roundPen: true,
     fill: true,
     stroke: true
   });
 }
-function wmfArcFamily(p, kind, l, t, r, b, xs, ys, xe, ye) {
-  const box = compatBox(p, l, t, r, b, { curved: kind !== "arc" });
+function compatArc(p, kind, l, t, r, b, xs, ys, xe, ye) {
+  const box = compatBox(p, l, t, r, b, { curved: kind === "chord" || kind === "pie" });
   if (box.x1 < box.x0 || box.y1 < box.y0) {
-    return;
+    return null;
   }
   const raw = compatBox(p, l, t, r, b, { exclusive: false });
-  const rdx = (box.x0 + box.x1 - raw.x0 - raw.x1) / 2;
-  const rdy = (box.y0 + box.y1 - raw.y0 - raw.y1) / 2;
-  const s0 = fixPoint(p.rCtx, xs, ys);
-  const e0 = fixPoint(p.rCtx, xe, ye);
-  const s = [s0[0] + rdx, s0[1] + rdy];
-  const e = [e0[0] + rdx, e0[1] + rdy];
+  const onBox = (v, r0, r1, b0, b1) => (b0 + b1) / 2 + (r1 !== r0 ? (v - (r0 + r1) / 2) * (b1 - b0) / (r1 - r0) : v - (r0 + r1) / 2);
+  const radial = (x, y) => {
+    const [fx, fy] = fixPoint(p.rCtx, x, y);
+    return [onBox(fx, raw.x0, raw.x1, box.x0, box.x1), onBox(fy, raw.y0, raw.y1, box.y0, box.y1)];
+  };
+  return { box, s: radial(xs, ys), e: radial(xe, ye) };
+}
+function wmfArcFamily(p, kind, l, t, r, b, xs, ys, xe, ye) {
+  const geom = compatArc(p, kind, l, t, r, b, xs, ys, xe, ye);
+  if (!geom) {
+    return;
+  }
+  const { box, s, e } = geom;
   const clockwise = p.rCtx.state.arcDirection === 2;
   const cr = canvasRect(box);
   const cx = cr.x + cr.w / 2;
@@ -27814,6 +27911,9 @@ function wmfArcFamily(p, kind, l, t, r, b, xs, ys, xe, ye) {
     stroke: true
   });
 }
+function clockwiseOf(p) {
+  return p.rCtx.state.arcDirection === 2;
+}
 function penIsNull(p) {
   return (p.rCtx.state.penStyle & 15) === PS_NULL3;
 }

package/package.json

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