emf-converter 4.20.2 → 4.20.3

package/dist/browser.js

@@ -29019,7 +29019,7 @@ var MonoStubContour = class {
   constructor(o) {
     this.points = Array.from(o.xs, (x, i) => [x / 64 - 0.5, o.ys[i] / 64 - 0.5]);
   }
-  isStub(flipped, scan, crossing, lo, hi, precision) {
+  isStub(flipped, scan, crossing, lo, hi, precision, _opposite) {
     const points = this.points;
     const n = points.length;
     const point = (i) => flipped ? [points[i][1], points[i][0]] : points[i];
@@ -29055,6 +29055,82 @@ var MonoStubContour = class {
     return !(a.side * b.side < 0 && a.continues && b.continues);
   }
 };
+function convexContour(o) {
+  const edges = [];
+  for (let i = 0; i < o.xs.length; i++) {
+    const j = (i + 1) % o.xs.length;
+    const dx = o.xs[j] - o.xs[i], dy = o.ys[j] - o.ys[i];
+    if (dx || dy) edges.push([dx, dy]);
+  }
+  if (edges.length < 3) return false;
+  const half = (p) => p[1] > 0 || p[1] === 0 && p[0] >= 0 ? 0 : 1;
+  let direction = 0, revolutions = 0;
+  for (let i = 0; i < edges.length; i++) {
+    const a = edges[i], b = edges[(i + 1) % edges.length];
+    const cross = a[0] * b[1] - a[1] * b[0];
+    if (!cross) {
+      if (a[0] * b[0] + a[1] * b[1] < 0) return false;
+      continue;
+    }
+    const turn = Math.sign(cross);
+    if (direction && direction !== turn) return false;
+    direction = turn;
+    if (half(a) !== half(b) && half(a) === (turn > 0 ? 1 : 0)) revolutions++;
+  }
+  return direction !== 0 && revolutions === 1;
+}
+var MonoStubContours = class _MonoStubContours {
+  constructor(contours) {
+    this.contours = contours;
+  }
+  static create(o) {
+    if (o.endPts.length > 64) return null;
+    if (Array.from(o.onCurve).some((p) => !p)) return null;
+    if (o.endPts.length === 1) return new MonoStubContour(o);
+    const contours = [];
+    const boxes = [];
+    let start = 0;
+    for (const end of o.endPts) {
+      const xs = [], ys = [], onCurve = [];
+      for (let i = start; i <= end; i++) {
+        xs.push(o.xs[i]);
+        ys.push(o.ys[i]);
+        onCurve.push(o.onCurve[i]);
+      }
+      const part = { xs, ys, onCurve, endPts: [end - start] };
+      start = end + 1;
+      if (!convexContour(part)) return null;
+      const box = { xMin: Infinity, xMax: -Infinity, yMin: Infinity, yMax: -Infinity };
+      for (let i = 0; i < part.xs.length; i++) {
+        box.xMin = Math.min(box.xMin, part.xs[i]);
+        box.xMax = Math.max(box.xMax, part.xs[i]);
+        box.yMin = Math.min(box.yMin, part.ys[i]);
+        box.yMax = Math.max(box.yMax, part.ys[i]);
+      }
+      if (boxes.some((b) => box.xMin <= b.xMax + 64 && b.xMin <= box.xMax + 64 && box.yMin <= b.yMax + 64 && b.yMin <= box.yMax + 64)) return null;
+      boxes.push(box);
+      contours.push(new MonoStubContour(part));
+    }
+    return new _MonoStubContours(contours);
+  }
+  isStub(flipped, scan, crossing, lo, hi, precision, opposite) {
+    let owner = -1, otherOwner = -1, result = null;
+    for (let i = 0; i < this.contours.length; i++) {
+      const a = this.contours[i].isStub(flipped, scan, crossing, lo, hi, precision);
+      const b = this.contours[i].isStub(flipped, scan, opposite, lo, hi, precision);
+      if (a !== null) {
+        if (owner >= 0) return null;
+        owner = i;
+        result = a;
+      }
+      if (b !== null) {
+        if (otherOwner >= 0) return null;
+        otherOwner = i;
+      }
+    }
+    return owner >= 0 && owner === otherOwner ? result : null;
+  }
+};
 function monoBox(o) {
   const n = o.xs.length;
   if (n === 0) {
@@ -29104,7 +29180,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
   const at = (col, row2) => (height - 1 - row2) * width + col;
   const r = new Raster(dropout);
   const P = r.precision;
-  const monoContour = stubOvershoot && (dropout === 1 || dropout === 4 || dropout === 5) && local.endPts.length === 1 && Array.from(local.onCurve).every(Boolean) ? new MonoStubContour(local) : null;
+  const monoContour = stubOvershoot && (dropout === 1 || dropout === 4 || dropout === 5) ? MonoStubContours.create(local) : null;
   const smartPixel = (raster, x1, x2) => {
     if (monoContour && smartCrossings26Dot6) {
       const step = P / 64;
@@ -29147,7 +29223,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
               break;
             case 1:
             case 5:
-              const stub = monoContour && box.collapsedX ? false : monoContour?.isStub(false, y, x1 / P, e2 / P, e1 / P, P);
+              const stub = monoContour && box.collapsedX ? false : monoContour?.isStub(false, y, x1 / P, e2 / P, e1 / P, P, x2 / P);
               if (stub === true) return;
               if (stub == null && left.next === right && left.height <= 0 && !(stubOvershoot && left.flags & OVERSHOOT_TOP && x2 - x1 >= r.half)) {
                 return;
@@ -29208,7 +29284,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
                 break;
               case 1:
               case 5:
-                const stub = monoContour && box.collapsedY ? false : monoContour?.isStub(true, col, x1 / P, e2 / P, e1 / P, P);
+                const stub = monoContour && box.collapsedY ? false : monoContour?.isStub(true, col, x1 / P, e2 / P, e1 / P, P, x2 / P);
                 if (stub === true) return;
                 if (stub == null && left.next === right && left.height <= 0 && !(stubOvershoot && left.flags & OVERSHOOT_TOP && x2 - x1 >= h.half)) {
                   return;
@@ -40756,22 +40832,23 @@ function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, layoutW, l
   }
   const { realized, emPx, m, unhinted } = ef;
   const codes = Array.from(text, (character) => character.codePointAt(0));
-  if (format && (alignment !== 0 || format.lineAlignment !== 0) && unhinted && m[0] === 1 && m[3] === 1 && emPx === realized.ppem) {
+  if (format && (alignment !== 0 || format.lineAlignment !== 0) && unhinted && m[0] === m[3] && Math.fround(emPx) === realized.ppem) {
     const aligned = layoutPlusAlignedString(
       realized,
       codes,
       format,
-      layoutX + m[4],
-      layoutY + m[5],
-      layoutW,
-      layoutH
+      m[0] * layoutX + m[4],
+      m[3] * layoutY + m[5],
+      m[0] * layoutW,
+      m[3] * layoutH
     );
     if (aligned) return paintPlusEngineRun(rCtx, ef, { codes, glyphIndices: false, ...aligned, dy: null });
   }
   if (alignment !== 0) return false;
   const ttf = realized.ttf;
   const exactAscent = emPx * ttf.winAscent / ttf.unitsPerEm;
-  const ascent = unhinted ? Math.round(exactAscent) : Math.ceil(exactAscent);
+  const clearTypeCell = realized.mode === "cleartype" && !realized.syntheticBold && !realized.syntheticItalic && emPx === realized.ppem && m[0] === 1 && m[3] === 1 && Number.isInteger(layoutY + m[5]) && (format?.lineAlignment ?? 0) === 0;
+  const ascent = unhinted ? Math.round(exactAscent) : clearTypeCell ? Math.max(Math.round(exactAscent), realized.ascent) : Math.ceil(exactAscent);
   let x = m[0] * layoutX + m[4] + emPx * (format?.leadingMargin ?? PLUS_LEADING_EM);
   if (!unhinted) x = Math.round(x);
   const y = m[3] * layoutY + m[5] + ascent;

package/dist/browser.mjs

@@ -29017,7 +29017,7 @@ var MonoStubContour = class {
   constructor(o) {
     this.points = Array.from(o.xs, (x, i) => [x / 64 - 0.5, o.ys[i] / 64 - 0.5]);
   }
-  isStub(flipped, scan, crossing, lo, hi, precision) {
+  isStub(flipped, scan, crossing, lo, hi, precision, _opposite) {
     const points = this.points;
     const n = points.length;
     const point = (i) => flipped ? [points[i][1], points[i][0]] : points[i];
@@ -29053,6 +29053,82 @@ var MonoStubContour = class {
     return !(a.side * b.side < 0 && a.continues && b.continues);
   }
 };
+function convexContour(o) {
+  const edges = [];
+  for (let i = 0; i < o.xs.length; i++) {
+    const j = (i + 1) % o.xs.length;
+    const dx = o.xs[j] - o.xs[i], dy = o.ys[j] - o.ys[i];
+    if (dx || dy) edges.push([dx, dy]);
+  }
+  if (edges.length < 3) return false;
+  const half = (p) => p[1] > 0 || p[1] === 0 && p[0] >= 0 ? 0 : 1;
+  let direction = 0, revolutions = 0;
+  for (let i = 0; i < edges.length; i++) {
+    const a = edges[i], b = edges[(i + 1) % edges.length];
+    const cross = a[0] * b[1] - a[1] * b[0];
+    if (!cross) {
+      if (a[0] * b[0] + a[1] * b[1] < 0) return false;
+      continue;
+    }
+    const turn = Math.sign(cross);
+    if (direction && direction !== turn) return false;
+    direction = turn;
+    if (half(a) !== half(b) && half(a) === (turn > 0 ? 1 : 0)) revolutions++;
+  }
+  return direction !== 0 && revolutions === 1;
+}
+var MonoStubContours = class _MonoStubContours {
+  constructor(contours) {
+    this.contours = contours;
+  }
+  static create(o) {
+    if (o.endPts.length > 64) return null;
+    if (Array.from(o.onCurve).some((p) => !p)) return null;
+    if (o.endPts.length === 1) return new MonoStubContour(o);
+    const contours = [];
+    const boxes = [];
+    let start = 0;
+    for (const end of o.endPts) {
+      const xs = [], ys = [], onCurve = [];
+      for (let i = start; i <= end; i++) {
+        xs.push(o.xs[i]);
+        ys.push(o.ys[i]);
+        onCurve.push(o.onCurve[i]);
+      }
+      const part = { xs, ys, onCurve, endPts: [end - start] };
+      start = end + 1;
+      if (!convexContour(part)) return null;
+      const box = { xMin: Infinity, xMax: -Infinity, yMin: Infinity, yMax: -Infinity };
+      for (let i = 0; i < part.xs.length; i++) {
+        box.xMin = Math.min(box.xMin, part.xs[i]);
+        box.xMax = Math.max(box.xMax, part.xs[i]);
+        box.yMin = Math.min(box.yMin, part.ys[i]);
+        box.yMax = Math.max(box.yMax, part.ys[i]);
+      }
+      if (boxes.some((b) => box.xMin <= b.xMax + 64 && b.xMin <= box.xMax + 64 && box.yMin <= b.yMax + 64 && b.yMin <= box.yMax + 64)) return null;
+      boxes.push(box);
+      contours.push(new MonoStubContour(part));
+    }
+    return new _MonoStubContours(contours);
+  }
+  isStub(flipped, scan, crossing, lo, hi, precision, opposite) {
+    let owner = -1, otherOwner = -1, result = null;
+    for (let i = 0; i < this.contours.length; i++) {
+      const a = this.contours[i].isStub(flipped, scan, crossing, lo, hi, precision);
+      const b = this.contours[i].isStub(flipped, scan, opposite, lo, hi, precision);
+      if (a !== null) {
+        if (owner >= 0) return null;
+        owner = i;
+        result = a;
+      }
+      if (b !== null) {
+        if (otherOwner >= 0) return null;
+        otherOwner = i;
+      }
+    }
+    return owner >= 0 && owner === otherOwner ? result : null;
+  }
+};
 function monoBox(o) {
   const n = o.xs.length;
   if (n === 0) {
@@ -29102,7 +29178,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
   const at = (col, row2) => (height - 1 - row2) * width + col;
   const r = new Raster(dropout);
   const P = r.precision;
-  const monoContour = stubOvershoot && (dropout === 1 || dropout === 4 || dropout === 5) && local.endPts.length === 1 && Array.from(local.onCurve).every(Boolean) ? new MonoStubContour(local) : null;
+  const monoContour = stubOvershoot && (dropout === 1 || dropout === 4 || dropout === 5) ? MonoStubContours.create(local) : null;
   const smartPixel = (raster, x1, x2) => {
     if (monoContour && smartCrossings26Dot6) {
       const step = P / 64;
@@ -29145,7 +29221,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
               break;
             case 1:
             case 5:
-              const stub = monoContour && box.collapsedX ? false : monoContour?.isStub(false, y, x1 / P, e2 / P, e1 / P, P);
+              const stub = monoContour && box.collapsedX ? false : monoContour?.isStub(false, y, x1 / P, e2 / P, e1 / P, P, x2 / P);
               if (stub === true) return;
               if (stub == null && left.next === right && left.height <= 0 && !(stubOvershoot && left.flags & OVERSHOOT_TOP && x2 - x1 >= r.half)) {
                 return;
@@ -29206,7 +29282,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
                 break;
               case 1:
               case 5:
-                const stub = monoContour && box.collapsedY ? false : monoContour?.isStub(true, col, x1 / P, e2 / P, e1 / P, P);
+                const stub = monoContour && box.collapsedY ? false : monoContour?.isStub(true, col, x1 / P, e2 / P, e1 / P, P, x2 / P);
                 if (stub === true) return;
                 if (stub == null && left.next === right && left.height <= 0 && !(stubOvershoot && left.flags & OVERSHOOT_TOP && x2 - x1 >= h.half)) {
                   return;
@@ -40754,22 +40830,23 @@ function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, layoutW, l
   }
   const { realized, emPx, m, unhinted } = ef;
   const codes = Array.from(text, (character) => character.codePointAt(0));
-  if (format && (alignment !== 0 || format.lineAlignment !== 0) && unhinted && m[0] === 1 && m[3] === 1 && emPx === realized.ppem) {
+  if (format && (alignment !== 0 || format.lineAlignment !== 0) && unhinted && m[0] === m[3] && Math.fround(emPx) === realized.ppem) {
     const aligned = layoutPlusAlignedString(
       realized,
       codes,
       format,
-      layoutX + m[4],
-      layoutY + m[5],
-      layoutW,
-      layoutH
+      m[0] * layoutX + m[4],
+      m[3] * layoutY + m[5],
+      m[0] * layoutW,
+      m[3] * layoutH
     );
     if (aligned) return paintPlusEngineRun(rCtx, ef, { codes, glyphIndices: false, ...aligned, dy: null });
   }
   if (alignment !== 0) return false;
   const ttf = realized.ttf;
   const exactAscent = emPx * ttf.winAscent / ttf.unitsPerEm;
-  const ascent = unhinted ? Math.round(exactAscent) : Math.ceil(exactAscent);
+  const clearTypeCell = realized.mode === "cleartype" && !realized.syntheticBold && !realized.syntheticItalic && emPx === realized.ppem && m[0] === 1 && m[3] === 1 && Number.isInteger(layoutY + m[5]) && (format?.lineAlignment ?? 0) === 0;
+  const ascent = unhinted ? Math.round(exactAscent) : clearTypeCell ? Math.max(Math.round(exactAscent), realized.ascent) : Math.ceil(exactAscent);
   let x = m[0] * layoutX + m[4] + emPx * (format?.leadingMargin ?? PLUS_LEADING_EM);
   if (!unhinted) x = Math.round(x);
   const y = m[3] * layoutY + m[5] + ascent;

package/dist/index.js

@@ -29020,7 +29020,7 @@ var MonoStubContour = class {
   constructor(o) {
     this.points = Array.from(o.xs, (x, i) => [x / 64 - 0.5, o.ys[i] / 64 - 0.5]);
   }
-  isStub(flipped, scan, crossing, lo, hi, precision) {
+  isStub(flipped, scan, crossing, lo, hi, precision, _opposite) {
     const points = this.points;
     const n = points.length;
     const point = (i) => flipped ? [points[i][1], points[i][0]] : points[i];
@@ -29056,6 +29056,82 @@ var MonoStubContour = class {
     return !(a.side * b.side < 0 && a.continues && b.continues);
   }
 };
+function convexContour(o) {
+  const edges = [];
+  for (let i = 0; i < o.xs.length; i++) {
+    const j = (i + 1) % o.xs.length;
+    const dx = o.xs[j] - o.xs[i], dy = o.ys[j] - o.ys[i];
+    if (dx || dy) edges.push([dx, dy]);
+  }
+  if (edges.length < 3) return false;
+  const half = (p) => p[1] > 0 || p[1] === 0 && p[0] >= 0 ? 0 : 1;
+  let direction = 0, revolutions = 0;
+  for (let i = 0; i < edges.length; i++) {
+    const a = edges[i], b = edges[(i + 1) % edges.length];
+    const cross = a[0] * b[1] - a[1] * b[0];
+    if (!cross) {
+      if (a[0] * b[0] + a[1] * b[1] < 0) return false;
+      continue;
+    }
+    const turn = Math.sign(cross);
+    if (direction && direction !== turn) return false;
+    direction = turn;
+    if (half(a) !== half(b) && half(a) === (turn > 0 ? 1 : 0)) revolutions++;
+  }
+  return direction !== 0 && revolutions === 1;
+}
+var MonoStubContours = class _MonoStubContours {
+  constructor(contours) {
+    this.contours = contours;
+  }
+  static create(o) {
+    if (o.endPts.length > 64) return null;
+    if (Array.from(o.onCurve).some((p) => !p)) return null;
+    if (o.endPts.length === 1) return new MonoStubContour(o);
+    const contours = [];
+    const boxes = [];
+    let start = 0;
+    for (const end of o.endPts) {
+      const xs = [], ys = [], onCurve = [];
+      for (let i = start; i <= end; i++) {
+        xs.push(o.xs[i]);
+        ys.push(o.ys[i]);
+        onCurve.push(o.onCurve[i]);
+      }
+      const part = { xs, ys, onCurve, endPts: [end - start] };
+      start = end + 1;
+      if (!convexContour(part)) return null;
+      const box = { xMin: Infinity, xMax: -Infinity, yMin: Infinity, yMax: -Infinity };
+      for (let i = 0; i < part.xs.length; i++) {
+        box.xMin = Math.min(box.xMin, part.xs[i]);
+        box.xMax = Math.max(box.xMax, part.xs[i]);
+        box.yMin = Math.min(box.yMin, part.ys[i]);
+        box.yMax = Math.max(box.yMax, part.ys[i]);
+      }
+      if (boxes.some((b) => box.xMin <= b.xMax + 64 && b.xMin <= box.xMax + 64 && box.yMin <= b.yMax + 64 && b.yMin <= box.yMax + 64)) return null;
+      boxes.push(box);
+      contours.push(new MonoStubContour(part));
+    }
+    return new _MonoStubContours(contours);
+  }
+  isStub(flipped, scan, crossing, lo, hi, precision, opposite) {
+    let owner = -1, otherOwner = -1, result = null;
+    for (let i = 0; i < this.contours.length; i++) {
+      const a = this.contours[i].isStub(flipped, scan, crossing, lo, hi, precision);
+      const b = this.contours[i].isStub(flipped, scan, opposite, lo, hi, precision);
+      if (a !== null) {
+        if (owner >= 0) return null;
+        owner = i;
+        result = a;
+      }
+      if (b !== null) {
+        if (otherOwner >= 0) return null;
+        otherOwner = i;
+      }
+    }
+    return owner >= 0 && owner === otherOwner ? result : null;
+  }
+};
 function monoBox(o) {
   const n = o.xs.length;
   if (n === 0) {
@@ -29105,7 +29181,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
   const at = (col, row2) => (height - 1 - row2) * width + col;
   const r = new Raster(dropout);
   const P = r.precision;
-  const monoContour = stubOvershoot && (dropout === 1 || dropout === 4 || dropout === 5) && local.endPts.length === 1 && Array.from(local.onCurve).every(Boolean) ? new MonoStubContour(local) : null;
+  const monoContour = stubOvershoot && (dropout === 1 || dropout === 4 || dropout === 5) ? MonoStubContours.create(local) : null;
   const smartPixel = (raster, x1, x2) => {
     if (monoContour && smartCrossings26Dot6) {
       const step = P / 64;
@@ -29148,7 +29224,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
               break;
             case 1:
             case 5:
-              const stub = monoContour && box.collapsedX ? false : monoContour?.isStub(false, y, x1 / P, e2 / P, e1 / P, P);
+              const stub = monoContour && box.collapsedX ? false : monoContour?.isStub(false, y, x1 / P, e2 / P, e1 / P, P, x2 / P);
               if (stub === true) return;
               if (stub == null && left.next === right && left.height <= 0 && !(stubOvershoot && left.flags & OVERSHOOT_TOP && x2 - x1 >= r.half)) {
                 return;
@@ -29209,7 +29285,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
                 break;
               case 1:
               case 5:
-                const stub = monoContour && box.collapsedY ? false : monoContour?.isStub(true, col, x1 / P, e2 / P, e1 / P, P);
+                const stub = monoContour && box.collapsedY ? false : monoContour?.isStub(true, col, x1 / P, e2 / P, e1 / P, P, x2 / P);
                 if (stub === true) return;
                 if (stub == null && left.next === right && left.height <= 0 && !(stubOvershoot && left.flags & OVERSHOOT_TOP && x2 - x1 >= h.half)) {
                   return;
@@ -40757,22 +40833,23 @@ function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, layoutW, l
   }
   const { realized, emPx, m, unhinted } = ef;
   const codes = Array.from(text, (character) => character.codePointAt(0));
-  if (format && (alignment !== 0 || format.lineAlignment !== 0) && unhinted && m[0] === 1 && m[3] === 1 && emPx === realized.ppem) {
+  if (format && (alignment !== 0 || format.lineAlignment !== 0) && unhinted && m[0] === m[3] && Math.fround(emPx) === realized.ppem) {
     const aligned = layoutPlusAlignedString(
       realized,
       codes,
       format,
-      layoutX + m[4],
-      layoutY + m[5],
-      layoutW,
-      layoutH
+      m[0] * layoutX + m[4],
+      m[3] * layoutY + m[5],
+      m[0] * layoutW,
+      m[3] * layoutH
     );
     if (aligned) return paintPlusEngineRun(rCtx, ef, { codes, glyphIndices: false, ...aligned, dy: null });
   }
   if (alignment !== 0) return false;
   const ttf = realized.ttf;
   const exactAscent = emPx * ttf.winAscent / ttf.unitsPerEm;
-  const ascent = unhinted ? Math.round(exactAscent) : Math.ceil(exactAscent);
+  const clearTypeCell = realized.mode === "cleartype" && !realized.syntheticBold && !realized.syntheticItalic && emPx === realized.ppem && m[0] === 1 && m[3] === 1 && Number.isInteger(layoutY + m[5]) && (format?.lineAlignment ?? 0) === 0;
+  const ascent = unhinted ? Math.round(exactAscent) : clearTypeCell ? Math.max(Math.round(exactAscent), realized.ascent) : Math.ceil(exactAscent);
   let x = m[0] * layoutX + m[4] + emPx * (format?.leadingMargin ?? PLUS_LEADING_EM);
   if (!unhinted) x = Math.round(x);
   const y = m[3] * layoutY + m[5] + ascent;

package/dist/index.mjs

@@ -29018,7 +29018,7 @@ var MonoStubContour = class {
   constructor(o) {
     this.points = Array.from(o.xs, (x, i) => [x / 64 - 0.5, o.ys[i] / 64 - 0.5]);
   }
-  isStub(flipped, scan, crossing, lo, hi, precision) {
+  isStub(flipped, scan, crossing, lo, hi, precision, _opposite) {
     const points = this.points;
     const n = points.length;
     const point = (i) => flipped ? [points[i][1], points[i][0]] : points[i];
@@ -29054,6 +29054,82 @@ var MonoStubContour = class {
     return !(a.side * b.side < 0 && a.continues && b.continues);
   }
 };
+function convexContour(o) {
+  const edges = [];
+  for (let i = 0; i < o.xs.length; i++) {
+    const j = (i + 1) % o.xs.length;
+    const dx = o.xs[j] - o.xs[i], dy = o.ys[j] - o.ys[i];
+    if (dx || dy) edges.push([dx, dy]);
+  }
+  if (edges.length < 3) return false;
+  const half = (p) => p[1] > 0 || p[1] === 0 && p[0] >= 0 ? 0 : 1;
+  let direction = 0, revolutions = 0;
+  for (let i = 0; i < edges.length; i++) {
+    const a = edges[i], b = edges[(i + 1) % edges.length];
+    const cross = a[0] * b[1] - a[1] * b[0];
+    if (!cross) {
+      if (a[0] * b[0] + a[1] * b[1] < 0) return false;
+      continue;
+    }
+    const turn = Math.sign(cross);
+    if (direction && direction !== turn) return false;
+    direction = turn;
+    if (half(a) !== half(b) && half(a) === (turn > 0 ? 1 : 0)) revolutions++;
+  }
+  return direction !== 0 && revolutions === 1;
+}
+var MonoStubContours = class _MonoStubContours {
+  constructor(contours) {
+    this.contours = contours;
+  }
+  static create(o) {
+    if (o.endPts.length > 64) return null;
+    if (Array.from(o.onCurve).some((p) => !p)) return null;
+    if (o.endPts.length === 1) return new MonoStubContour(o);
+    const contours = [];
+    const boxes = [];
+    let start = 0;
+    for (const end of o.endPts) {
+      const xs = [], ys = [], onCurve = [];
+      for (let i = start; i <= end; i++) {
+        xs.push(o.xs[i]);
+        ys.push(o.ys[i]);
+        onCurve.push(o.onCurve[i]);
+      }
+      const part = { xs, ys, onCurve, endPts: [end - start] };
+      start = end + 1;
+      if (!convexContour(part)) return null;
+      const box = { xMin: Infinity, xMax: -Infinity, yMin: Infinity, yMax: -Infinity };
+      for (let i = 0; i < part.xs.length; i++) {
+        box.xMin = Math.min(box.xMin, part.xs[i]);
+        box.xMax = Math.max(box.xMax, part.xs[i]);
+        box.yMin = Math.min(box.yMin, part.ys[i]);
+        box.yMax = Math.max(box.yMax, part.ys[i]);
+      }
+      if (boxes.some((b) => box.xMin <= b.xMax + 64 && b.xMin <= box.xMax + 64 && box.yMin <= b.yMax + 64 && b.yMin <= box.yMax + 64)) return null;
+      boxes.push(box);
+      contours.push(new MonoStubContour(part));
+    }
+    return new _MonoStubContours(contours);
+  }
+  isStub(flipped, scan, crossing, lo, hi, precision, opposite) {
+    let owner = -1, otherOwner = -1, result = null;
+    for (let i = 0; i < this.contours.length; i++) {
+      const a = this.contours[i].isStub(flipped, scan, crossing, lo, hi, precision);
+      const b = this.contours[i].isStub(flipped, scan, opposite, lo, hi, precision);
+      if (a !== null) {
+        if (owner >= 0) return null;
+        owner = i;
+        result = a;
+      }
+      if (b !== null) {
+        if (otherOwner >= 0) return null;
+        otherOwner = i;
+      }
+    }
+    return owner >= 0 && owner === otherOwner ? result : null;
+  }
+};
 function monoBox(o) {
   const n = o.xs.length;
   if (n === 0) {
@@ -29103,7 +29179,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
   const at = (col, row2) => (height - 1 - row2) * width + col;
   const r = new Raster(dropout);
   const P = r.precision;
-  const monoContour = stubOvershoot && (dropout === 1 || dropout === 4 || dropout === 5) && local.endPts.length === 1 && Array.from(local.onCurve).every(Boolean) ? new MonoStubContour(local) : null;
+  const monoContour = stubOvershoot && (dropout === 1 || dropout === 4 || dropout === 5) ? MonoStubContours.create(local) : null;
   const smartPixel = (raster, x1, x2) => {
     if (monoContour && smartCrossings26Dot6) {
       const step = P / 64;
@@ -29146,7 +29222,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
               break;
             case 1:
             case 5:
-              const stub = monoContour && box.collapsedX ? false : monoContour?.isStub(false, y, x1 / P, e2 / P, e1 / P, P);
+              const stub = monoContour && box.collapsedX ? false : monoContour?.isStub(false, y, x1 / P, e2 / P, e1 / P, P, x2 / P);
               if (stub === true) return;
               if (stub == null && left.next === right && left.height <= 0 && !(stubOvershoot && left.flags & OVERSHOOT_TOP && x2 - x1 >= r.half)) {
                 return;
@@ -29207,7 +29283,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
                 break;
               case 1:
               case 5:
-                const stub = monoContour && box.collapsedY ? false : monoContour?.isStub(true, col, x1 / P, e2 / P, e1 / P, P);
+                const stub = monoContour && box.collapsedY ? false : monoContour?.isStub(true, col, x1 / P, e2 / P, e1 / P, P, x2 / P);
                 if (stub === true) return;
                 if (stub == null && left.next === right && left.height <= 0 && !(stubOvershoot && left.flags & OVERSHOOT_TOP && x2 - x1 >= h.half)) {
                   return;
@@ -40755,22 +40831,23 @@ function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, layoutW, l
   }
   const { realized, emPx, m, unhinted } = ef;
   const codes = Array.from(text, (character) => character.codePointAt(0));
-  if (format && (alignment !== 0 || format.lineAlignment !== 0) && unhinted && m[0] === 1 && m[3] === 1 && emPx === realized.ppem) {
+  if (format && (alignment !== 0 || format.lineAlignment !== 0) && unhinted && m[0] === m[3] && Math.fround(emPx) === realized.ppem) {
     const aligned = layoutPlusAlignedString(
       realized,
       codes,
       format,
-      layoutX + m[4],
-      layoutY + m[5],
-      layoutW,
-      layoutH
+      m[0] * layoutX + m[4],
+      m[3] * layoutY + m[5],
+      m[0] * layoutW,
+      m[3] * layoutH
     );
     if (aligned) return paintPlusEngineRun(rCtx, ef, { codes, glyphIndices: false, ...aligned, dy: null });
   }
   if (alignment !== 0) return false;
   const ttf = realized.ttf;
   const exactAscent = emPx * ttf.winAscent / ttf.unitsPerEm;
-  const ascent = unhinted ? Math.round(exactAscent) : Math.ceil(exactAscent);
+  const clearTypeCell = realized.mode === "cleartype" && !realized.syntheticBold && !realized.syntheticItalic && emPx === realized.ppem && m[0] === 1 && m[3] === 1 && Number.isInteger(layoutY + m[5]) && (format?.lineAlignment ?? 0) === 0;
+  const ascent = unhinted ? Math.round(exactAscent) : clearTypeCell ? Math.max(Math.round(exactAscent), realized.ascent) : Math.ceil(exactAscent);
   let x = m[0] * layoutX + m[4] + emPx * (format?.leadingMargin ?? PLUS_LEADING_EM);
   if (!unhinted) x = Math.round(x);
   const y = m[3] * layoutY + m[5] + ascent;

package/package.json

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