emf-converter 4.6.5 → 4.6.7

package/dist/browser.js

@@ -28728,7 +28728,119 @@ var HOBBY = [
   [[8, -48], [-8, -48], [-24, -40], [-40, -24], [-48, -8], [-48, 8], [-40, 24], [-24, 40], [-8, 48], [8, 48], [24, 40], [40, 24], [48, 8], [48, -8], [40, -24], [24, -40]]
 ];
 var HOBBY_LIMIT = 104;
-var FLAT_VECTOR_OFFSET = { 7: [0, 0.5], 8: [0, 0.5], 9: [0.5, 0.5], 10: [0.5, 0] };
+var FLAT_SECTOR_BIAS = {
+  7: [9, "cf..", "edededEdcDcdcd"],
+  8: [9, "dFee", "ededededbdbdbd"],
+  9: [9, "df..", "ddddddddbDbdbd"],
+  10: [9, "de..", "dededeDebEbebE"],
+  11: [9, "ce..", "eeeeeeEececece"],
+  12: [13, "ce..", "eeeeeeeeeeeececEcecece"],
+  13: [17, "ce..", "eeeeededdddddeDebebebdbdcdcdce"],
+  14: [17, "df..", "ddedeeeededeeeedcDcebebecececd"],
+  15: [17, "dF..", "ddedeeeeeeeedeDdbdbecececececd"],
+  16: [17, "ce..", "eeeededededeeeeececebebebebece"],
+  17: [17, "df..", "ddedededededdeddbdbebdbdbdbdcd"],
+  18: [17, "de..", "deeededeededeeEdcDcecdcdbebece"],
+  19: [17, "cf..", "ededeeeedddddeDebEbecdcdbebecd"],
+  20: [17, "ce..", "eeeeddddeeeeddDdbdbdcecebdbdce"],
+  21: [17, "dF..", "ddddededededddDdbdbdcdcdcdcdbd"],
+  22: [17, "ce..", "eeeededeeeeedeDebebececebebece"],
+  23: [17, "cf..", "edededededededEdcDcdcdcdcdcdcD"],
+  24: [17, "dF..", "ddddddddddddddDdbdbdbdbdbdbdbd"],
+  25: [17, "cE..", "eeeeededededeeEecEcecdcdcdcdce"],
+  26: [17, "cf..", "ededdedeededdedebEbecdcdbebecd"],
+  27: [17, "de..", "dedeededdedeededcDcdbebecdcdbe"],
+  28: [17, "cf..", "ededddddeeeedeDebEbebebecdcdcd"],
+  29: [17, "ce..", "eeeeeeeededededebebebebececece"],
+  30: [17, "dF..", "dddddedeeeeeedEdcdcdcecebebebd"],
+  31: [17, "de..", "dedeededededdeDebebecdcdcdcdbe"],
+  32: [17, "cf..", "ededdededdddeeeecEcebdbdbebecd"],
+  33: [17, "de..", "dedeeeeeededddDdbdbdcdcdcecebe"],
+  34: [17, "de..", "dedeeeeeddddedEdcdcdbdbdcecebe"],
+  35: [17, "cf..", "ededededdededeDebebebebecdcdcd"],
+  36: [17, "deee", "eeeeeeeeddddddDdcdcdcdcDbebebe"],
+  37: [17, "dF..", "dddddededededdDdbdbdcecececebd"],
+  38: [17, "ce..", "eeeeddddddddeeEececebdbdbdbdce"],
+  39: [17, "cF..", "ededddddddddededcdcdbdbDbdbdcd"],
+  40: [17, "de..", "dededededdddddddbdbdbdbdbebebe"],
+  41: [17, "ce..", "eeeeeeeeeeeeeeEececececececece"],
+  42: [17, "cf..", "ededeeeedddddedebebebdbdcececd"],
+  43: [17, "df..", "ddddeeeededeedEdcdcdbebececebd"],
+  44: [17, "cF..", "ededdedeededdeDebebecdcdbebecd"],
+  45: [17, "ce..", "eeeededededeeeeecEcebebebebece"],
+  46: [17, "dF..", "ddddededddddedEdcDcdcdcdbdbdbd"],
+  47: [17, "ce..", "dedededededededececececececece"],
+  48: [25, "cf..", "ededeeeeeeeeededeeeeeeEecececececdcdcececececd"],
+  49: [25, "cF..", "ededddddededeeeeededdeDebebecdcdcececdcdbdbdcd"],
+  50: [25, "ce..", "eeeeddddededdededededeDebebebebebEbecdcdbdbdce"],
+  51: [25, "ce..", "eeeeededddddeeeededeeeEececebebececebdbdcdcdce"],
+  52: [25, "ce..", "eeeededededeededededeeEecececdcdcdcdbebebebece"],
+  53: [25, "dF..", "ddedeeeedddddddddedeeeEdcdcebebebdbDbdbdcececd"],
+  54: [25, "dF..", "ddedddddededededdddddEDdbdbebdbdcdcdcdcdbdbdcd"],
+  55: [25, "dF..", "ddeddedeeeeeeeeedededeDdbdbebebebebebebebebecd"],
+  56: [25, "dE..", "deeeeeeeededeeeededeeEedcdcebebecececdcdcecece"],
+  57: [25, "de..", "deeedddddddddedeededeeEdcDcecDcdcececdcdbdbDce"],
+  58: [25, "dF..", "ddedddddeeeedddddedeeeEdcdcebebebdbdcecebdbdcd"],
+  59: [33, "cF..", "ededdedeededddddeeeeeeeedddddeDebebebdbdcecececebdbdcdcdbebecd"],
+  60: [33, "cf..", "ededeeeeededededddddeeeeeeeedeDebebececececebdbdcdcdcdcdcececd"],
+  61: [33, "ce..", "eeeeeeeeddddeeeeeeeeddddeeeeeeeececececebdbdcecececebdbdcecece"],
+  62: [33, "ce..", "eeeeddddeeeeededededeeeeddddeeEecEcebdbdcececdcdcdcdcecebdbdce"],
+  63: [33, "cf..", "ededededeeeededededeeeeeeeeeeeEececececececebebEbebecececdcdcd"],
+  64: [33, "cF..", "ededeeeedddddedeeeeededeeeeedeDebebececebebececebebebdbdcececd"],
+  65: [33, "df..", "ddedededededddddddddeeeeeeeedeDdbdbececececebdbdbdbdcdcdcdcdcd"],
+  66: [33, "de..", "deeeededdedeeeeedddddededddddeDdbdbebdbdbebecdcdbebebebecdcdce"],
+  67: [33, "de..", "deeeddddddddededdddddededdddeeEdcDcebdbdbebebdbdcdcdbdbdbdbdce"],
+  68: [33, "dE..", "deeeeeeeeeeeeeeeddddeeeeeeeeeeEdcdcececececebdbdcecececececece"],
+  69: [33, "df..", "ddedededdedeeeeeddddededededdeDdbdbecdcdcdcdbdbdcecebebecdcdcd"],
+  70: [33, "dF..", "ddeddddddddddddddededededddddeDdbdbebdbdbebebebebdbdbdbdbdbDcd"],
+  71: [33, "ce..", "eeeeddddeeeededeeeeededeededdeDebebecdcdbebececebebececebdbdce"],
+  72: [33, "ce..", "eeeededededeededededddddddddeeEececebdbdbdbdcdcdcdcdbebebebece"],
+  73: [33, "ce..", "eeeeededededddddededdedeeeeeeeEececececebebecdcdbdbdcdcDcdcdce"],
+  74: [33, "cf..", "ededddddededededededdededddddeDebebebdbdbebecdcDcdcdcdcdbdbdcd"],
+  75: [33, "cF..", "ededdededededdddddddeeeedddddeDebebebdbdcececdcdcdcdbebebebecd"],
+  76: [33, "ce..", "eeeeeeeeeeeeeeeeeeeededeeeeedeDebebececebebecececececececececE"],
+  77: [33, "ce..", "eeeeeeeedededddddededdddedededEdcDcdcdcdbdbdbebebdbdbebececece"],
+  78: [33, "de..", "dedeededdedededeeeeeeeeededeedEdcdcdbebececececebebebebecdcdbe"],
+  79: [33, "dF..", "ddddddddededdededdddeeeeedededEdcDcdcdcdcecebdbdbebecdcdbdbdbd"],
+  80: [33, "dF..", "dddddededdddeeeeddddddddededddDdbdbdcdcdbdbdbdbDcecebdbdbebEbd"],
+  81: [33, "de..", "dedeeeeeeeeededeededeeeedededdDdbdbdbebecececdcdbebececececebe"],
+  82: [33, "de..", "dedeededdedeededdedededeedededEdcdcdcdcdbebebebecdcdbebecdcDbe"],
+  83: [33, "de..", "dededededddddededdddeeeededeeeEececebebececebdbdbebebdbdbebebe"],
+  84: [33, "cF..", "ededddddeeeeddddeeeeeeeeededeeEecececdcdcecebebecdcdcecebdbdcd"],
+  85: [33, "cf..", "ededdddddededddddddddedeeeeedeDebebececebebebdbdbdbdbebebdbdcd"],
+  86: [33, "ce..", "eeeeededddddeeeeeeeedededededeDebebebebebebebebebebebdbdcdcdce"],
+  87: [33, "ce..", "eeeeddddeeeeddddddddeeeeddddeeeececebdbdcecebdbDbdbdcecebdbdce"],
+  88: [33, "ce..", "eeeedededdddeeeeededededededeeeecececdcdcdcdcdcdcecebdbdbebece"],
+  89: [33, "cF..", "ededeeeeddddddddededdedededeeeEecEcebebEbebecdcdbdbdbdbdcececd"],
+  90: [33, "dF..", "ddddededeeeeededeeeedededededdDdbdbdbebebEbecececdcdcececdcdbd"],
+  91: [33, "df..", "ddddeeeededededeededdddddededdDdbdbdbebebdbdcdcdbebebebececebd"],
+  92: [33, "de..", "dedededeededdddddededededdddedEdcdcdbdbdbebebebebdbdcdcdbebebe"],
+  93: [33, "de..", "dededddddddddedeededeeeeeeeeededcdcdcececececdcdbebebdbdbdbdbe"],
+  94: [33, "dF..", "ddddeeeeddddeeeeddddeeeededeedEdcDcdbebececebdbDcecebdbdcecebd"],
+  95: [33, "df..", "ddddddddededeeeedddddededdddddDdbdbDbdbdbebecdcdbebecdcdbdbdbd"],
+  96: [33, "cf..", "ededeeeededeeeeedededdddeeeedeDebebececebdbdbebececebebecececd"],
+  97: [33, "ce..", "eeeedededededededdddeeeedddddeDebebebdbdcEcebdbdbebebEbebebece"],
+  98: [33, "ce..", "eeeeededededeeeeeeeededededeeeEececebebebebecececececdcdcdcdce"],
+  99: [33, "cf..", "ededededddddddddddddededdedeeeEececebebecdcdbdbdbdbdbdbdcdcdcd"],
+  100: [33, "cf..", "ededdedeeeeededededeeeeeededdeDebebecdcdcecebebebebececebebecd"]
+};
+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);
@@ -28741,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) {
@@ -28807,13 +28919,20 @@ function perpendicularVectors(width, dx0, dy0) {
   const [B, hB, hS] = hP >= hN ? [P, hP, hN] : [N, hN, hP];
   const den = 2 * (bh - hB + (bh - hS));
   const w = den === 0 ? 0 : (hB - hS) / den;
-  const off = width % 16 === 0 && width >= HOBBY_LIMIT ? FLAT_VECTOR_OFFSET[width / 16] : void 0;
-  const sgn = best < n / 2 ? 1 : -1;
-  const ox = off ? sgn * off[0] : 0;
-  const oy = off ? sgn * off[1] : 0;
   const r = (v) => 8 * Math.floor((v + 4) / 8);
   const x = D[0] + (B[0] - D[0]) * w, y = D[1] + (B[1] - D[1]) * w;
-  const vx = r(x + 0.5 * Math.sign(dy) + ox), vy = r(y + 0.5 * Math.sign(dx) + oy);
+  let cx = 0.5 * Math.sign(dy), cy = 0.5 * Math.sign(dx);
+  const table = width % 16 === 0 ? FLAT_SECTOR_BIAS[width / 16] : void 0;
+  if (table) {
+    const key = best * 2 + (hP >= hN ? 0 : 1);
+    const pair = key === 0 ? table[1].slice(0, 2) : key >= table[0] ? table[2].slice((key - table[0]) * 2, (key - table[0]) * 2 + 2) : "..";
+    if (pair[0] !== ".") {
+      cx = sectorBias(pair.charCodeAt(0));
+      cy = sectorBias(pair.charCodeAt(1));
+    }
+  }
+  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) {
@@ -29467,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));
@@ -29477,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);
@@ -29492,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;
   }
@@ -29809,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);
@@ -38714,7 +38843,7 @@ function compatCorner(p, w, h, box) {
   if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
     const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
-    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+    return [Math.floor(Math.min(cw, width + penWidth) * width / (width + penWidth)), Math.floor(Math.min(ch, height + penWidth) * height / (height + penWidth))];
   }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;

package/dist/browser.mjs

@@ -28726,7 +28726,119 @@ var HOBBY = [
   [[8, -48], [-8, -48], [-24, -40], [-40, -24], [-48, -8], [-48, 8], [-40, 24], [-24, 40], [-8, 48], [8, 48], [24, 40], [40, 24], [48, 8], [48, -8], [40, -24], [24, -40]]
 ];
 var HOBBY_LIMIT = 104;
-var FLAT_VECTOR_OFFSET = { 7: [0, 0.5], 8: [0, 0.5], 9: [0.5, 0.5], 10: [0.5, 0] };
+var FLAT_SECTOR_BIAS = {
+  7: [9, "cf..", "edededEdcDcdcd"],
+  8: [9, "dFee", "ededededbdbdbd"],
+  9: [9, "df..", "ddddddddbDbdbd"],
+  10: [9, "de..", "dededeDebEbebE"],
+  11: [9, "ce..", "eeeeeeEececece"],
+  12: [13, "ce..", "eeeeeeeeeeeececEcecece"],
+  13: [17, "ce..", "eeeeededdddddeDebebebdbdcdcdce"],
+  14: [17, "df..", "ddedeeeededeeeedcDcebebecececd"],
+  15: [17, "dF..", "ddedeeeeeeeedeDdbdbecececececd"],
+  16: [17, "ce..", "eeeededededeeeeececebebebebece"],
+  17: [17, "df..", "ddedededededdeddbdbebdbdbdbdcd"],
+  18: [17, "de..", "deeededeededeeEdcDcecdcdbebece"],
+  19: [17, "cf..", "ededeeeedddddeDebEbecdcdbebecd"],
+  20: [17, "ce..", "eeeeddddeeeeddDdbdbdcecebdbdce"],
+  21: [17, "dF..", "ddddededededddDdbdbdcdcdcdcdbd"],
+  22: [17, "ce..", "eeeededeeeeedeDebebececebebece"],
+  23: [17, "cf..", "edededededededEdcDcdcdcdcdcdcD"],
+  24: [17, "dF..", "ddddddddddddddDdbdbdbdbdbdbdbd"],
+  25: [17, "cE..", "eeeeededededeeEecEcecdcdcdcdce"],
+  26: [17, "cf..", "ededdedeededdedebEbecdcdbebecd"],
+  27: [17, "de..", "dedeededdedeededcDcdbebecdcdbe"],
+  28: [17, "cf..", "ededddddeeeedeDebEbebebecdcdcd"],
+  29: [17, "ce..", "eeeeeeeededededebebebebececece"],
+  30: [17, "dF..", "dddddedeeeeeedEdcdcdcecebebebd"],
+  31: [17, "de..", "dedeededededdeDebebecdcdcdcdbe"],
+  32: [17, "cf..", "ededdededdddeeeecEcebdbdbebecd"],
+  33: [17, "de..", "dedeeeeeededddDdbdbdcdcdcecebe"],
+  34: [17, "de..", "dedeeeeeddddedEdcdcdbdbdcecebe"],
+  35: [17, "cf..", "ededededdededeDebebebebecdcdcd"],
+  36: [17, "deee", "eeeeeeeeddddddDdcdcdcdcDbebebe"],
+  37: [17, "dF..", "dddddededededdDdbdbdcecececebd"],
+  38: [17, "ce..", "eeeeddddddddeeEececebdbdbdbdce"],
+  39: [17, "cF..", "ededddddddddededcdcdbdbDbdbdcd"],
+  40: [17, "de..", "dededededdddddddbdbdbdbdbebebe"],
+  41: [17, "ce..", "eeeeeeeeeeeeeeEececececececece"],
+  42: [17, "cf..", "ededeeeedddddedebebebdbdcececd"],
+  43: [17, "df..", "ddddeeeededeedEdcdcdbebececebd"],
+  44: [17, "cF..", "ededdedeededdeDebebecdcdbebecd"],
+  45: [17, "ce..", "eeeededededeeeeecEcebebebebece"],
+  46: [17, "dF..", "ddddededddddedEdcDcdcdcdbdbdbd"],
+  47: [17, "ce..", "dedededededededececececececece"],
+  48: [25, "cf..", "ededeeeeeeeeededeeeeeeEecececececdcdcececececd"],
+  49: [25, "cF..", "ededddddededeeeeededdeDebebecdcdcececdcdbdbdcd"],
+  50: [25, "ce..", "eeeeddddededdededededeDebebebebebEbecdcdbdbdce"],
+  51: [25, "ce..", "eeeeededddddeeeededeeeEececebebececebdbdcdcdce"],
+  52: [25, "ce..", "eeeededededeededededeeEecececdcdcdcdbebebebece"],
+  53: [25, "dF..", "ddedeeeedddddddddedeeeEdcdcebebebdbDbdbdcececd"],
+  54: [25, "dF..", "ddedddddededededdddddEDdbdbebdbdcdcdcdcdbdbdcd"],
+  55: [25, "dF..", "ddeddedeeeeeeeeedededeDdbdbebebebebebebebebecd"],
+  56: [25, "dE..", "deeeeeeeededeeeededeeEedcdcebebecececdcdcecece"],
+  57: [25, "de..", "deeedddddddddedeededeeEdcDcecDcdcececdcdbdbDce"],
+  58: [25, "dF..", "ddedddddeeeedddddedeeeEdcdcebebebdbdcecebdbdcd"],
+  59: [33, "cF..", "ededdedeededddddeeeeeeeedddddeDebebebdbdcecececebdbdcdcdbebecd"],
+  60: [33, "cf..", "ededeeeeededededddddeeeeeeeedeDebebececececebdbdcdcdcdcdcececd"],
+  61: [33, "ce..", "eeeeeeeeddddeeeeeeeeddddeeeeeeeececececebdbdcecececebdbdcecece"],
+  62: [33, "ce..", "eeeeddddeeeeededededeeeeddddeeEecEcebdbdcececdcdcdcdcecebdbdce"],
+  63: [33, "cf..", "ededededeeeededededeeeeeeeeeeeEececececececebebEbebecececdcdcd"],
+  64: [33, "cF..", "ededeeeedddddedeeeeededeeeeedeDebebececebebececebebebdbdcececd"],
+  65: [33, "df..", "ddedededededddddddddeeeeeeeedeDdbdbececececebdbdbdbdcdcdcdcdcd"],
+  66: [33, "de..", "deeeededdedeeeeedddddededddddeDdbdbebdbdbebecdcdbebebebecdcdce"],
+  67: [33, "de..", "deeeddddddddededdddddededdddeeEdcDcebdbdbebebdbdcdcdbdbdbdbdce"],
+  68: [33, "dE..", "deeeeeeeeeeeeeeeddddeeeeeeeeeeEdcdcececececebdbdcecececececece"],
+  69: [33, "df..", "ddedededdedeeeeeddddededededdeDdbdbecdcdcdcdbdbdcecebebecdcdcd"],
+  70: [33, "dF..", "ddeddddddddddddddededededddddeDdbdbebdbdbebebebebdbdbdbdbdbDcd"],
+  71: [33, "ce..", "eeeeddddeeeededeeeeededeededdeDebebecdcdbebececebebececebdbdce"],
+  72: [33, "ce..", "eeeededededeededededddddddddeeEececebdbdbdbdcdcdcdcdbebebebece"],
+  73: [33, "ce..", "eeeeededededddddededdedeeeeeeeEececececebebecdcdbdbdcdcDcdcdce"],
+  74: [33, "cf..", "ededddddededededededdededddddeDebebebdbdbebecdcDcdcdcdcdbdbdcd"],
+  75: [33, "cF..", "ededdededededdddddddeeeedddddeDebebebdbdcececdcdcdcdbebebebecd"],
+  76: [33, "ce..", "eeeeeeeeeeeeeeeeeeeededeeeeedeDebebececebebecececececececececE"],
+  77: [33, "ce..", "eeeeeeeedededddddededdddedededEdcDcdcdcdbdbdbebebdbdbebececece"],
+  78: [33, "de..", "dedeededdedededeeeeeeeeededeedEdcdcdbebececececebebebebecdcdbe"],
+  79: [33, "dF..", "ddddddddededdededdddeeeeedededEdcDcdcdcdcecebdbdbebecdcdbdbdbd"],
+  80: [33, "dF..", "dddddededdddeeeeddddddddededddDdbdbdcdcdbdbdbdbDcecebdbdbebEbd"],
+  81: [33, "de..", "dedeeeeeeeeededeededeeeedededdDdbdbdbebecececdcdbebececececebe"],
+  82: [33, "de..", "dedeededdedeededdedededeedededEdcdcdcdcdbebebebecdcdbebecdcDbe"],
+  83: [33, "de..", "dededededddddededdddeeeededeeeEececebebececebdbdbebebdbdbebebe"],
+  84: [33, "cF..", "ededddddeeeeddddeeeeeeeeededeeEecececdcdcecebebecdcdcecebdbdcd"],
+  85: [33, "cf..", "ededdddddededddddddddedeeeeedeDebebececebebebdbdbdbdbebebdbdcd"],
+  86: [33, "ce..", "eeeeededddddeeeeeeeedededededeDebebebebebebebebebebebdbdcdcdce"],
+  87: [33, "ce..", "eeeeddddeeeeddddddddeeeeddddeeeececebdbdcecebdbDbdbdcecebdbdce"],
+  88: [33, "ce..", "eeeedededdddeeeeededededededeeeecececdcdcdcdcdcdcecebdbdbebece"],
+  89: [33, "cF..", "ededeeeeddddddddededdedededeeeEecEcebebEbebecdcdbdbdbdbdcececd"],
+  90: [33, "dF..", "ddddededeeeeededeeeedededededdDdbdbdbebebEbecececdcdcececdcdbd"],
+  91: [33, "df..", "ddddeeeededededeededdddddededdDdbdbdbebebdbdcdcdbebebebececebd"],
+  92: [33, "de..", "dedededeededdddddededededdddedEdcdcdbdbdbebebebebdbdcdcdbebebe"],
+  93: [33, "de..", "dededddddddddedeededeeeeeeeeededcdcdcececececdcdbebebdbdbdbdbe"],
+  94: [33, "dF..", "ddddeeeeddddeeeeddddeeeededeedEdcDcdbebececebdbDcecebdbdcecebd"],
+  95: [33, "df..", "ddddddddededeeeedddddededdddddDdbdbDbdbdbebecdcdbebecdcdbdbdbd"],
+  96: [33, "cf..", "ededeeeededeeeeedededdddeeeedeDebebececebdbdbebececebebecececd"],
+  97: [33, "ce..", "eeeedededededededdddeeeedddddeDebebebdbdcEcebdbdbebebEbebebece"],
+  98: [33, "ce..", "eeeeededededeeeeeeeededededeeeEececebebebebecececececdcdcdcdce"],
+  99: [33, "cf..", "ededededddddddddddddededdedeeeEececebebecdcdbdbdbdbdbdbdcdcdcd"],
+  100: [33, "cf..", "ededdedeeeeededededeeeeeededdeDebebecdcdcecebebebebececebebecd"]
+};
+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);
@@ -28739,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) {
@@ -28805,13 +28917,20 @@ function perpendicularVectors(width, dx0, dy0) {
   const [B, hB, hS] = hP >= hN ? [P, hP, hN] : [N, hN, hP];
   const den = 2 * (bh - hB + (bh - hS));
   const w = den === 0 ? 0 : (hB - hS) / den;
-  const off = width % 16 === 0 && width >= HOBBY_LIMIT ? FLAT_VECTOR_OFFSET[width / 16] : void 0;
-  const sgn = best < n / 2 ? 1 : -1;
-  const ox = off ? sgn * off[0] : 0;
-  const oy = off ? sgn * off[1] : 0;
   const r = (v) => 8 * Math.floor((v + 4) / 8);
   const x = D[0] + (B[0] - D[0]) * w, y = D[1] + (B[1] - D[1]) * w;
-  const vx = r(x + 0.5 * Math.sign(dy) + ox), vy = r(y + 0.5 * Math.sign(dx) + oy);
+  let cx = 0.5 * Math.sign(dy), cy = 0.5 * Math.sign(dx);
+  const table = width % 16 === 0 ? FLAT_SECTOR_BIAS[width / 16] : void 0;
+  if (table) {
+    const key = best * 2 + (hP >= hN ? 0 : 1);
+    const pair = key === 0 ? table[1].slice(0, 2) : key >= table[0] ? table[2].slice((key - table[0]) * 2, (key - table[0]) * 2 + 2) : "..";
+    if (pair[0] !== ".") {
+      cx = sectorBias(pair.charCodeAt(0));
+      cy = sectorBias(pair.charCodeAt(1));
+    }
+  }
+  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) {
@@ -29465,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));
@@ -29475,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);
@@ -29490,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;
   }
@@ -29807,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);
@@ -38712,7 +38841,7 @@ function compatCorner(p, w, h, box) {
   if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
     const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
-    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+    return [Math.floor(Math.min(cw, width + penWidth) * width / (width + penWidth)), Math.floor(Math.min(ch, height + penWidth) * height / (height + penWidth))];
   }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;

package/dist/index.js

@@ -28729,7 +28729,119 @@ var HOBBY = [
   [[8, -48], [-8, -48], [-24, -40], [-40, -24], [-48, -8], [-48, 8], [-40, 24], [-24, 40], [-8, 48], [8, 48], [24, 40], [40, 24], [48, 8], [48, -8], [40, -24], [24, -40]]
 ];
 var HOBBY_LIMIT = 104;
-var FLAT_VECTOR_OFFSET = { 7: [0, 0.5], 8: [0, 0.5], 9: [0.5, 0.5], 10: [0.5, 0] };
+var FLAT_SECTOR_BIAS = {
+  7: [9, "cf..", "edededEdcDcdcd"],
+  8: [9, "dFee", "ededededbdbdbd"],
+  9: [9, "df..", "ddddddddbDbdbd"],
+  10: [9, "de..", "dededeDebEbebE"],
+  11: [9, "ce..", "eeeeeeEececece"],
+  12: [13, "ce..", "eeeeeeeeeeeececEcecece"],
+  13: [17, "ce..", "eeeeededdddddeDebebebdbdcdcdce"],
+  14: [17, "df..", "ddedeeeededeeeedcDcebebecececd"],
+  15: [17, "dF..", "ddedeeeeeeeedeDdbdbecececececd"],
+  16: [17, "ce..", "eeeededededeeeeececebebebebece"],
+  17: [17, "df..", "ddedededededdeddbdbebdbdbdbdcd"],
+  18: [17, "de..", "deeededeededeeEdcDcecdcdbebece"],
+  19: [17, "cf..", "ededeeeedddddeDebEbecdcdbebecd"],
+  20: [17, "ce..", "eeeeddddeeeeddDdbdbdcecebdbdce"],
+  21: [17, "dF..", "ddddededededddDdbdbdcdcdcdcdbd"],
+  22: [17, "ce..", "eeeededeeeeedeDebebececebebece"],
+  23: [17, "cf..", "edededededededEdcDcdcdcdcdcdcD"],
+  24: [17, "dF..", "ddddddddddddddDdbdbdbdbdbdbdbd"],
+  25: [17, "cE..", "eeeeededededeeEecEcecdcdcdcdce"],
+  26: [17, "cf..", "ededdedeededdedebEbecdcdbebecd"],
+  27: [17, "de..", "dedeededdedeededcDcdbebecdcdbe"],
+  28: [17, "cf..", "ededddddeeeedeDebEbebebecdcdcd"],
+  29: [17, "ce..", "eeeeeeeededededebebebebececece"],
+  30: [17, "dF..", "dddddedeeeeeedEdcdcdcecebebebd"],
+  31: [17, "de..", "dedeededededdeDebebecdcdcdcdbe"],
+  32: [17, "cf..", "ededdededdddeeeecEcebdbdbebecd"],
+  33: [17, "de..", "dedeeeeeededddDdbdbdcdcdcecebe"],
+  34: [17, "de..", "dedeeeeeddddedEdcdcdbdbdcecebe"],
+  35: [17, "cf..", "ededededdededeDebebebebecdcdcd"],
+  36: [17, "deee", "eeeeeeeeddddddDdcdcdcdcDbebebe"],
+  37: [17, "dF..", "dddddededededdDdbdbdcecececebd"],
+  38: [17, "ce..", "eeeeddddddddeeEececebdbdbdbdce"],
+  39: [17, "cF..", "ededddddddddededcdcdbdbDbdbdcd"],
+  40: [17, "de..", "dededededdddddddbdbdbdbdbebebe"],
+  41: [17, "ce..", "eeeeeeeeeeeeeeEececececececece"],
+  42: [17, "cf..", "ededeeeedddddedebebebdbdcececd"],
+  43: [17, "df..", "ddddeeeededeedEdcdcdbebececebd"],
+  44: [17, "cF..", "ededdedeededdeDebebecdcdbebecd"],
+  45: [17, "ce..", "eeeededededeeeeecEcebebebebece"],
+  46: [17, "dF..", "ddddededddddedEdcDcdcdcdbdbdbd"],
+  47: [17, "ce..", "dedededededededececececececece"],
+  48: [25, "cf..", "ededeeeeeeeeededeeeeeeEecececececdcdcececececd"],
+  49: [25, "cF..", "ededddddededeeeeededdeDebebecdcdcececdcdbdbdcd"],
+  50: [25, "ce..", "eeeeddddededdededededeDebebebebebEbecdcdbdbdce"],
+  51: [25, "ce..", "eeeeededddddeeeededeeeEececebebececebdbdcdcdce"],
+  52: [25, "ce..", "eeeededededeededededeeEecececdcdcdcdbebebebece"],
+  53: [25, "dF..", "ddedeeeedddddddddedeeeEdcdcebebebdbDbdbdcececd"],
+  54: [25, "dF..", "ddedddddededededdddddEDdbdbebdbdcdcdcdcdbdbdcd"],
+  55: [25, "dF..", "ddeddedeeeeeeeeedededeDdbdbebebebebebebebebecd"],
+  56: [25, "dE..", "deeeeeeeededeeeededeeEedcdcebebecececdcdcecece"],
+  57: [25, "de..", "deeedddddddddedeededeeEdcDcecDcdcececdcdbdbDce"],
+  58: [25, "dF..", "ddedddddeeeedddddedeeeEdcdcebebebdbdcecebdbdcd"],
+  59: [33, "cF..", "ededdedeededddddeeeeeeeedddddeDebebebdbdcecececebdbdcdcdbebecd"],
+  60: [33, "cf..", "ededeeeeededededddddeeeeeeeedeDebebececececebdbdcdcdcdcdcececd"],
+  61: [33, "ce..", "eeeeeeeeddddeeeeeeeeddddeeeeeeeececececebdbdcecececebdbdcecece"],
+  62: [33, "ce..", "eeeeddddeeeeededededeeeeddddeeEecEcebdbdcececdcdcdcdcecebdbdce"],
+  63: [33, "cf..", "ededededeeeededededeeeeeeeeeeeEececececececebebEbebecececdcdcd"],
+  64: [33, "cF..", "ededeeeedddddedeeeeededeeeeedeDebebececebebececebebebdbdcececd"],
+  65: [33, "df..", "ddedededededddddddddeeeeeeeedeDdbdbececececebdbdbdbdcdcdcdcdcd"],
+  66: [33, "de..", "deeeededdedeeeeedddddededddddeDdbdbebdbdbebecdcdbebebebecdcdce"],
+  67: [33, "de..", "deeeddddddddededdddddededdddeeEdcDcebdbdbebebdbdcdcdbdbdbdbdce"],
+  68: [33, "dE..", "deeeeeeeeeeeeeeeddddeeeeeeeeeeEdcdcececececebdbdcecececececece"],
+  69: [33, "df..", "ddedededdedeeeeeddddededededdeDdbdbecdcdcdcdbdbdcecebebecdcdcd"],
+  70: [33, "dF..", "ddeddddddddddddddededededddddeDdbdbebdbdbebebebebdbdbdbdbdbDcd"],
+  71: [33, "ce..", "eeeeddddeeeededeeeeededeededdeDebebecdcdbebececebebececebdbdce"],
+  72: [33, "ce..", "eeeededededeededededddddddddeeEececebdbdbdbdcdcdcdcdbebebebece"],
+  73: [33, "ce..", "eeeeededededddddededdedeeeeeeeEececececebebecdcdbdbdcdcDcdcdce"],
+  74: [33, "cf..", "ededddddededededededdededddddeDebebebdbdbebecdcDcdcdcdcdbdbdcd"],
+  75: [33, "cF..", "ededdededededdddddddeeeedddddeDebebebdbdcececdcdcdcdbebebebecd"],
+  76: [33, "ce..", "eeeeeeeeeeeeeeeeeeeededeeeeedeDebebececebebecececececececececE"],
+  77: [33, "ce..", "eeeeeeeedededddddededdddedededEdcDcdcdcdbdbdbebebdbdbebececece"],
+  78: [33, "de..", "dedeededdedededeeeeeeeeededeedEdcdcdbebececececebebebebecdcdbe"],
+  79: [33, "dF..", "ddddddddededdededdddeeeeedededEdcDcdcdcdcecebdbdbebecdcdbdbdbd"],
+  80: [33, "dF..", "dddddededdddeeeeddddddddededddDdbdbdcdcdbdbdbdbDcecebdbdbebEbd"],
+  81: [33, "de..", "dedeeeeeeeeededeededeeeedededdDdbdbdbebecececdcdbebececececebe"],
+  82: [33, "de..", "dedeededdedeededdedededeedededEdcdcdcdcdbebebebecdcdbebecdcDbe"],
+  83: [33, "de..", "dededededddddededdddeeeededeeeEececebebececebdbdbebebdbdbebebe"],
+  84: [33, "cF..", "ededddddeeeeddddeeeeeeeeededeeEecececdcdcecebebecdcdcecebdbdcd"],
+  85: [33, "cf..", "ededdddddededddddddddedeeeeedeDebebececebebebdbdbdbdbebebdbdcd"],
+  86: [33, "ce..", "eeeeededddddeeeeeeeedededededeDebebebebebebebebebebebdbdcdcdce"],
+  87: [33, "ce..", "eeeeddddeeeeddddddddeeeeddddeeeececebdbdcecebdbDbdbdcecebdbdce"],
+  88: [33, "ce..", "eeeedededdddeeeeededededededeeeecececdcdcdcdcdcdcecebdbdbebece"],
+  89: [33, "cF..", "ededeeeeddddddddededdedededeeeEecEcebebEbebecdcdbdbdbdbdcececd"],
+  90: [33, "dF..", "ddddededeeeeededeeeedededededdDdbdbdbebebEbecececdcdcececdcdbd"],
+  91: [33, "df..", "ddddeeeededededeededdddddededdDdbdbdbebebdbdcdcdbebebebececebd"],
+  92: [33, "de..", "dedededeededdddddededededdddedEdcdcdbdbdbebebebebdbdcdcdbebebe"],
+  93: [33, "de..", "dededddddddddedeededeeeeeeeeededcdcdcececececdcdbebebdbdbdbdbe"],
+  94: [33, "dF..", "ddddeeeeddddeeeeddddeeeededeedEdcDcdbebececebdbDcecebdbdcecebd"],
+  95: [33, "df..", "ddddddddededeeeedddddededdddddDdbdbDbdbdbebecdcdbebecdcdbdbdbd"],
+  96: [33, "cf..", "ededeeeededeeeeedededdddeeeedeDebebececebdbdbebececebebecececd"],
+  97: [33, "ce..", "eeeedededededededdddeeeedddddeDebebebdbdcEcebdbdbebebEbebebece"],
+  98: [33, "ce..", "eeeeededededeeeeeeeededededeeeEececebebebebecececececdcdcdcdce"],
+  99: [33, "cf..", "ededededddddddddddddededdedeeeEececebebecdcdbdbdbdbdbdbdcdcdcd"],
+  100: [33, "cf..", "ededdedeeeeededededeeeeeededdeDebebecdcdcecebebebebececebebecd"]
+};
+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);
@@ -28742,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) {
@@ -28808,13 +28920,20 @@ function perpendicularVectors(width, dx0, dy0) {
   const [B, hB, hS] = hP >= hN ? [P, hP, hN] : [N, hN, hP];
   const den = 2 * (bh - hB + (bh - hS));
   const w = den === 0 ? 0 : (hB - hS) / den;
-  const off = width % 16 === 0 && width >= HOBBY_LIMIT ? FLAT_VECTOR_OFFSET[width / 16] : void 0;
-  const sgn = best < n / 2 ? 1 : -1;
-  const ox = off ? sgn * off[0] : 0;
-  const oy = off ? sgn * off[1] : 0;
   const r = (v) => 8 * Math.floor((v + 4) / 8);
   const x = D[0] + (B[0] - D[0]) * w, y = D[1] + (B[1] - D[1]) * w;
-  const vx = r(x + 0.5 * Math.sign(dy) + ox), vy = r(y + 0.5 * Math.sign(dx) + oy);
+  let cx = 0.5 * Math.sign(dy), cy = 0.5 * Math.sign(dx);
+  const table = width % 16 === 0 ? FLAT_SECTOR_BIAS[width / 16] : void 0;
+  if (table) {
+    const key = best * 2 + (hP >= hN ? 0 : 1);
+    const pair = key === 0 ? table[1].slice(0, 2) : key >= table[0] ? table[2].slice((key - table[0]) * 2, (key - table[0]) * 2 + 2) : "..";
+    if (pair[0] !== ".") {
+      cx = sectorBias(pair.charCodeAt(0));
+      cy = sectorBias(pair.charCodeAt(1));
+    }
+  }
+  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) {
@@ -29468,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));
@@ -29478,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);
@@ -29493,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;
   }
@@ -29810,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);
@@ -38715,7 +38844,7 @@ function compatCorner(p, w, h, box) {
   if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
     const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
-    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+    return [Math.floor(Math.min(cw, width + penWidth) * width / (width + penWidth)), Math.floor(Math.min(ch, height + penWidth) * height / (height + penWidth))];
   }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;

package/dist/index.mjs

@@ -28727,7 +28727,119 @@ var HOBBY = [
   [[8, -48], [-8, -48], [-24, -40], [-40, -24], [-48, -8], [-48, 8], [-40, 24], [-24, 40], [-8, 48], [8, 48], [24, 40], [40, 24], [48, 8], [48, -8], [40, -24], [24, -40]]
 ];
 var HOBBY_LIMIT = 104;
-var FLAT_VECTOR_OFFSET = { 7: [0, 0.5], 8: [0, 0.5], 9: [0.5, 0.5], 10: [0.5, 0] };
+var FLAT_SECTOR_BIAS = {
+  7: [9, "cf..", "edededEdcDcdcd"],
+  8: [9, "dFee", "ededededbdbdbd"],
+  9: [9, "df..", "ddddddddbDbdbd"],
+  10: [9, "de..", "dededeDebEbebE"],
+  11: [9, "ce..", "eeeeeeEececece"],
+  12: [13, "ce..", "eeeeeeeeeeeececEcecece"],
+  13: [17, "ce..", "eeeeededdddddeDebebebdbdcdcdce"],
+  14: [17, "df..", "ddedeeeededeeeedcDcebebecececd"],
+  15: [17, "dF..", "ddedeeeeeeeedeDdbdbecececececd"],
+  16: [17, "ce..", "eeeededededeeeeececebebebebece"],
+  17: [17, "df..", "ddedededededdeddbdbebdbdbdbdcd"],
+  18: [17, "de..", "deeededeededeeEdcDcecdcdbebece"],
+  19: [17, "cf..", "ededeeeedddddeDebEbecdcdbebecd"],
+  20: [17, "ce..", "eeeeddddeeeeddDdbdbdcecebdbdce"],
+  21: [17, "dF..", "ddddededededddDdbdbdcdcdcdcdbd"],
+  22: [17, "ce..", "eeeededeeeeedeDebebececebebece"],
+  23: [17, "cf..", "edededededededEdcDcdcdcdcdcdcD"],
+  24: [17, "dF..", "ddddddddddddddDdbdbdbdbdbdbdbd"],
+  25: [17, "cE..", "eeeeededededeeEecEcecdcdcdcdce"],
+  26: [17, "cf..", "ededdedeededdedebEbecdcdbebecd"],
+  27: [17, "de..", "dedeededdedeededcDcdbebecdcdbe"],
+  28: [17, "cf..", "ededddddeeeedeDebEbebebecdcdcd"],
+  29: [17, "ce..", "eeeeeeeededededebebebebececece"],
+  30: [17, "dF..", "dddddedeeeeeedEdcdcdcecebebebd"],
+  31: [17, "de..", "dedeededededdeDebebecdcdcdcdbe"],
+  32: [17, "cf..", "ededdededdddeeeecEcebdbdbebecd"],
+  33: [17, "de..", "dedeeeeeededddDdbdbdcdcdcecebe"],
+  34: [17, "de..", "dedeeeeeddddedEdcdcdbdbdcecebe"],
+  35: [17, "cf..", "ededededdededeDebebebebecdcdcd"],
+  36: [17, "deee", "eeeeeeeeddddddDdcdcdcdcDbebebe"],
+  37: [17, "dF..", "dddddededededdDdbdbdcecececebd"],
+  38: [17, "ce..", "eeeeddddddddeeEececebdbdbdbdce"],
+  39: [17, "cF..", "ededddddddddededcdcdbdbDbdbdcd"],
+  40: [17, "de..", "dededededdddddddbdbdbdbdbebebe"],
+  41: [17, "ce..", "eeeeeeeeeeeeeeEececececececece"],
+  42: [17, "cf..", "ededeeeedddddedebebebdbdcececd"],
+  43: [17, "df..", "ddddeeeededeedEdcdcdbebececebd"],
+  44: [17, "cF..", "ededdedeededdeDebebecdcdbebecd"],
+  45: [17, "ce..", "eeeededededeeeeecEcebebebebece"],
+  46: [17, "dF..", "ddddededddddedEdcDcdcdcdbdbdbd"],
+  47: [17, "ce..", "dedededededededececececececece"],
+  48: [25, "cf..", "ededeeeeeeeeededeeeeeeEecececececdcdcececececd"],
+  49: [25, "cF..", "ededddddededeeeeededdeDebebecdcdcececdcdbdbdcd"],
+  50: [25, "ce..", "eeeeddddededdededededeDebebebebebEbecdcdbdbdce"],
+  51: [25, "ce..", "eeeeededddddeeeededeeeEececebebececebdbdcdcdce"],
+  52: [25, "ce..", "eeeededededeededededeeEecececdcdcdcdbebebebece"],
+  53: [25, "dF..", "ddedeeeedddddddddedeeeEdcdcebebebdbDbdbdcececd"],
+  54: [25, "dF..", "ddedddddededededdddddEDdbdbebdbdcdcdcdcdbdbdcd"],
+  55: [25, "dF..", "ddeddedeeeeeeeeedededeDdbdbebebebebebebebebecd"],
+  56: [25, "dE..", "deeeeeeeededeeeededeeEedcdcebebecececdcdcecece"],
+  57: [25, "de..", "deeedddddddddedeededeeEdcDcecDcdcececdcdbdbDce"],
+  58: [25, "dF..", "ddedddddeeeedddddedeeeEdcdcebebebdbdcecebdbdcd"],
+  59: [33, "cF..", "ededdedeededddddeeeeeeeedddddeDebebebdbdcecececebdbdcdcdbebecd"],
+  60: [33, "cf..", "ededeeeeededededddddeeeeeeeedeDebebececececebdbdcdcdcdcdcececd"],
+  61: [33, "ce..", "eeeeeeeeddddeeeeeeeeddddeeeeeeeececececebdbdcecececebdbdcecece"],
+  62: [33, "ce..", "eeeeddddeeeeededededeeeeddddeeEecEcebdbdcececdcdcdcdcecebdbdce"],
+  63: [33, "cf..", "ededededeeeededededeeeeeeeeeeeEececececececebebEbebecececdcdcd"],
+  64: [33, "cF..", "ededeeeedddddedeeeeededeeeeedeDebebececebebececebebebdbdcececd"],
+  65: [33, "df..", "ddedededededddddddddeeeeeeeedeDdbdbececececebdbdbdbdcdcdcdcdcd"],
+  66: [33, "de..", "deeeededdedeeeeedddddededddddeDdbdbebdbdbebecdcdbebebebecdcdce"],
+  67: [33, "de..", "deeeddddddddededdddddededdddeeEdcDcebdbdbebebdbdcdcdbdbdbdbdce"],
+  68: [33, "dE..", "deeeeeeeeeeeeeeeddddeeeeeeeeeeEdcdcececececebdbdcecececececece"],
+  69: [33, "df..", "ddedededdedeeeeeddddededededdeDdbdbecdcdcdcdbdbdcecebebecdcdcd"],
+  70: [33, "dF..", "ddeddddddddddddddededededddddeDdbdbebdbdbebebebebdbdbdbdbdbDcd"],
+  71: [33, "ce..", "eeeeddddeeeededeeeeededeededdeDebebecdcdbebececebebececebdbdce"],
+  72: [33, "ce..", "eeeededededeededededddddddddeeEececebdbdbdbdcdcdcdcdbebebebece"],
+  73: [33, "ce..", "eeeeededededddddededdedeeeeeeeEececececebebecdcdbdbdcdcDcdcdce"],
+  74: [33, "cf..", "ededddddededededededdededddddeDebebebdbdbebecdcDcdcdcdcdbdbdcd"],
+  75: [33, "cF..", "ededdededededdddddddeeeedddddeDebebebdbdcececdcdcdcdbebebebecd"],
+  76: [33, "ce..", "eeeeeeeeeeeeeeeeeeeededeeeeedeDebebececebebecececececececececE"],
+  77: [33, "ce..", "eeeeeeeedededddddededdddedededEdcDcdcdcdbdbdbebebdbdbebececece"],
+  78: [33, "de..", "dedeededdedededeeeeeeeeededeedEdcdcdbebececececebebebebecdcdbe"],
+  79: [33, "dF..", "ddddddddededdededdddeeeeedededEdcDcdcdcdcecebdbdbebecdcdbdbdbd"],
+  80: [33, "dF..", "dddddededdddeeeeddddddddededddDdbdbdcdcdbdbdbdbDcecebdbdbebEbd"],
+  81: [33, "de..", "dedeeeeeeeeededeededeeeedededdDdbdbdbebecececdcdbebececececebe"],
+  82: [33, "de..", "dedeededdedeededdedededeedededEdcdcdcdcdbebebebecdcdbebecdcDbe"],
+  83: [33, "de..", "dededededddddededdddeeeededeeeEececebebececebdbdbebebdbdbebebe"],
+  84: [33, "cF..", "ededddddeeeeddddeeeeeeeeededeeEecececdcdcecebebecdcdcecebdbdcd"],
+  85: [33, "cf..", "ededdddddededddddddddedeeeeedeDebebececebebebdbdbdbdbebebdbdcd"],
+  86: [33, "ce..", "eeeeededddddeeeeeeeedededededeDebebebebebebebebebebebdbdcdcdce"],
+  87: [33, "ce..", "eeeeddddeeeeddddddddeeeeddddeeeececebdbdcecebdbDbdbdcecebdbdce"],
+  88: [33, "ce..", "eeeedededdddeeeeededededededeeeecececdcdcdcdcdcdcecebdbdbebece"],
+  89: [33, "cF..", "ededeeeeddddddddededdedededeeeEecEcebebEbebecdcdbdbdbdbdcececd"],
+  90: [33, "dF..", "ddddededeeeeededeeeedededededdDdbdbdbebebEbecececdcdcececdcdbd"],
+  91: [33, "df..", "ddddeeeededededeededdddddededdDdbdbdbebebdbdcdcdbebebebececebd"],
+  92: [33, "de..", "dedededeededdddddededededdddedEdcdcdbdbdbebebebebdbdcdcdbebebe"],
+  93: [33, "de..", "dededddddddddedeededeeeeeeeeededcdcdcececececdcdbebebdbdbdbdbe"],
+  94: [33, "dF..", "ddddeeeeddddeeeeddddeeeededeedEdcDcdbebececebdbDcecebdbdcecebd"],
+  95: [33, "df..", "ddddddddededeeeedddddededdddddDdbdbDbdbdbebecdcdbebecdcdbdbdbd"],
+  96: [33, "cf..", "ededeeeededeeeeedededdddeeeedeDebebececebdbdbebececebebecececd"],
+  97: [33, "ce..", "eeeedededededededdddeeeedddddeDebebebdbdcEcebdbdbebebEbebebece"],
+  98: [33, "ce..", "eeeeededededeeeeeeeededededeeeEececebebebebecececececdcdcdcdce"],
+  99: [33, "cf..", "ededededddddddddddddededdedeeeEececebebecdcdbdbdbdbdbdbdcdcdcd"],
+  100: [33, "cf..", "ededdedeeeeededededeeeeeededdeDebebecdcdcecebebebebececebebecd"]
+};
+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);
@@ -28740,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) {
@@ -28806,13 +28918,20 @@ function perpendicularVectors(width, dx0, dy0) {
   const [B, hB, hS] = hP >= hN ? [P, hP, hN] : [N, hN, hP];
   const den = 2 * (bh - hB + (bh - hS));
   const w = den === 0 ? 0 : (hB - hS) / den;
-  const off = width % 16 === 0 && width >= HOBBY_LIMIT ? FLAT_VECTOR_OFFSET[width / 16] : void 0;
-  const sgn = best < n / 2 ? 1 : -1;
-  const ox = off ? sgn * off[0] : 0;
-  const oy = off ? sgn * off[1] : 0;
   const r = (v) => 8 * Math.floor((v + 4) / 8);
   const x = D[0] + (B[0] - D[0]) * w, y = D[1] + (B[1] - D[1]) * w;
-  const vx = r(x + 0.5 * Math.sign(dy) + ox), vy = r(y + 0.5 * Math.sign(dx) + oy);
+  let cx = 0.5 * Math.sign(dy), cy = 0.5 * Math.sign(dx);
+  const table = width % 16 === 0 ? FLAT_SECTOR_BIAS[width / 16] : void 0;
+  if (table) {
+    const key = best * 2 + (hP >= hN ? 0 : 1);
+    const pair = key === 0 ? table[1].slice(0, 2) : key >= table[0] ? table[2].slice((key - table[0]) * 2, (key - table[0]) * 2 + 2) : "..";
+    if (pair[0] !== ".") {
+      cx = sectorBias(pair.charCodeAt(0));
+      cy = sectorBias(pair.charCodeAt(1));
+    }
+  }
+  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) {
@@ -29466,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));
@@ -29476,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);
@@ -29491,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;
   }
@@ -29808,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);
@@ -38713,7 +38842,7 @@ function compatCorner(p, w, h, box) {
   if ((p.rCtx.state.penStyle & 15) === PS_INSIDEFRAME && !penIsCosmetic(p.rCtx)) {
     const penWidth = p.rCtx.state.penWidth * Math.sqrt(Math.abs(m[0] * m[3] - m[1] * m[2])) * 16;
     const width = box.x1 - box.x0, height = box.y1 - box.y0;
-    return [Math.min(cw, width + penWidth) * width / (width + penWidth), Math.min(ch, height + penWidth) * height / (height + penWidth)];
+    return [Math.floor(Math.min(cw, width + penWidth) * width / (width + penWidth)), Math.floor(Math.min(ch, height + penWidth) * height / (height + penWidth))];
   }
   if (!penIsNull(p) && penIsCosmetic(p.rCtx)) {
     const width = box.x1 - box.x0, height = box.y1 - box.y0;

package/package.json

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