emf-converter 4.20.1 → 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) {
@@ -29076,16 +29152,11 @@ function monoBox(o) {
   let xMax = Math.floor((cxMax + 32) / 64);
   let yMin = Math.floor((cyMin + 31) / 64);
   let yMax = Math.floor((cyMax + 32) / 64);
-  const rem = (v, add) => (v + add & 63) - add;
-  if (xMin === xMax) {
-    if (rem(cxMin, 31) + rem(cxMax, 32) < 0) xMin -= 1;
-    else xMax += 1;
-  }
-  if (yMin === yMax) {
-    if (rem(cyMin, 31) + rem(cyMax, 32) < 0) yMin -= 1;
-    else yMax += 1;
-  }
-  return { xMin, xMax, yMin, yMax };
+  const collapsedX = xMin === xMax;
+  const collapsedY = yMin === yMax;
+  if (collapsedX) xMax += 1;
+  if (collapsedY) yMax += 1;
+  return { xMin, xMax, yMin, yMax, collapsedX, collapsedY };
 }
 function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossings26Dot6 = false) {
   const box = fixedBox ?? monoBox(o);
@@ -29109,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;
@@ -29152,7 +29223,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
               break;
             case 1:
             case 5:
-              const stub = 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;
@@ -29213,7 +29284,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
                 break;
               case 1:
               case 5:
-                const stub = 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;
@@ -29577,6 +29648,7 @@ var RasterRealizedFont = class {
       fsSelection: face.italic ? 1 : 0,
       macStyle: 0,
       winAscent: this.ascent,
+      winDescent: this.descent,
       unitsPerEm: this.ppem || 1
     };
   }
@@ -29764,6 +29836,11 @@ var RealizedFont = class {
     }
     return base + (this.syntheticBold ? 1 : 0);
   }
+  /** GDI+ rounds tracked hmtx advances to font units before device scaling. */
+  designAdvance(index, tracking) {
+    const { advance } = this.ttf.hMetrics(index < this.ttf.numGlyphs ? index : NOTDEF);
+    return Math.round(advance * tracking) * this.ppemX / this.ttf.unitsPerEm + (this.syntheticBold ? 1 : 0);
+  }
   /**
    * Advance of glyph `index` in a font realised with an escapement: GDI
    * does not use the hinted/hdmx widths there but the linearly scaled
@@ -40451,6 +40528,35 @@ function surfaceSize5(ctx) {
   return typeof w === "number" && typeof h === "number" && w > 0 && h > 0 ? { w, h } : null;
 }
 
+// src/emf-plus-text-alignment.ts
+var SIMPLE_SCRIPT = /^(?:\p{Script=Latin}|\p{Script=Common}|\p{Co})$/u;
+var SHAPING_CHARACTER = /[\p{M}\p{Cf}\p{Emoji_Presentation}]/u;
+function layoutPlusAlignedString(font, codes, format, x, y, width, height) {
+  const horizontal = format.alignment, vertical = format.lineAlignment;
+  if (!horizontal && !vertical || horizontal < 0 || horizontal > 2 || vertical < 0 || vertical > 2 || font.gridFit || font.mode !== "gray" || !font.designAdvance || font.ttf.winDescent === void 0 || font.syntheticBold || font.syntheticItalic || format.flags & 3 || ![x, y, width, height].every(Number.isFinite) || width <= 0 || height <= 0 || codes.some((c) => !Number.isInteger(c) || c < 32 || c > 1114111 || c >= 127 && c <= 159 || c === 8232 || c === 8233)) return null;
+  if (codes.some((c) => {
+    const character = String.fromCodePoint(c);
+    return !SIMPLE_SCRIPT.test(character) || SHAPING_CHARACTER.test(character) || font.glyphIndex(c) === 0;
+  })) return null;
+  const em = font.ppem;
+  const tracking = format.tracking ?? 1.03;
+  const leading = em * (format.leadingMargin ?? 1 / 6);
+  const trailing = em * (format.trailingMargin ?? 1 / 6);
+  if (![tracking, leading, trailing].every((v) => Number.isFinite(v) && v >= 0)) return null;
+  if (!(format.flags & 4) && (font.ttf.fsSelection & 1 || font.ttf.macStyle & 2)) return null;
+  const dx = codes.map((c) => font.designAdvance(font.glyphIndex(c), tracking));
+  let measuredCount = codes.length;
+  if (!(format.flags & 2048)) while (measuredCount > 0 && codes[measuredCount - 1] === 32) measuredCount--;
+  const measuredWidth = dx.slice(0, measuredCount).reduce((a, b) => a + b, 0) + leading + trailing;
+  const measuredHeight = em * (font.ttf.winAscent + font.ttf.winDescent) / font.ttf.unitsPerEm + (format.flags & 4 ? 0 : em / 8);
+  if (measuredWidth > width || measuredHeight > height) return null;
+  return {
+    x: Math.fround(x + horizontal / 2 * (width - measuredWidth) + leading),
+    y: Math.fround(y + vertical / 2 * (height - measuredHeight)) + Math.round(em * font.ttf.winAscent / font.ttf.unitsPerEm),
+    dx
+  };
+}
+
 // src/emf-plus-text-image-handlers.ts
 function imageAttributesWrap(rCtx, attributesId) {
   const obj = attributesId <= 255 ? rCtx.objectTable.get(attributesId) : void 0;
@@ -40719,25 +40825,33 @@ function paintPlusEngineRun(rCtx, ef, run) {
   );
   return true;
 }
-function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, paint, alignment, format, brushSampler2 = null) {
-  if (alignment !== 0) {
-    return false;
-  }
+function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, layoutW, layoutH, paint, alignment, format, brushSampler2 = null) {
   const ef = realizePlusEngineFont(rCtx, font, paint, brushSampler2);
   if (!ef) {
     return false;
   }
   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] === m[3] && Math.fround(emPx) === realized.ppem) {
+    const aligned = layoutPlusAlignedString(
+      realized,
+      codes,
+      format,
+      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;
-  const codes = [];
-  for (const character of text) {
-    codes.push(character.codePointAt(0));
-  }
   const tracking = format?.tracking ?? PLUS_DEFAULT_TRACKING;
   const dx = unhinted ? codes.map((c) => realized.advance(realized.glyphIndex(c)) * tracking) : null;
   return paintPlusEngineRun(rCtx, ef, { codes, glyphIndices: false, x, y, dx, dy: null });
@@ -40819,8 +40933,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
         const strLen = view.getUint32(dataOff + 8, true);
         const layoutX = view.getFloat32(dataOff + 12, true);
         const layoutY = view.getFloat32(dataOff + 16, true);
-        view.getFloat32(dataOff + 20, true);
-        view.getFloat32(dataOff + 24, true);
+        const layoutW = view.getFloat32(dataOff + 20, true);
+        const layoutH = view.getFloat32(dataOff + 24, true);
         const fontId = recFlags & 255;
         const font = objectTable.get(fontId);
         if (strLen > 0 && dataOff + 28 + strLen * 2 <= dataOff + recDataSize) {
@@ -40836,6 +40950,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
               text,
               layoutX,
               layoutY,
+              layoutW,
+              layoutH,
               paint,
               alignment,
               format,

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) {
@@ -29074,16 +29150,11 @@ function monoBox(o) {
   let xMax = Math.floor((cxMax + 32) / 64);
   let yMin = Math.floor((cyMin + 31) / 64);
   let yMax = Math.floor((cyMax + 32) / 64);
-  const rem = (v, add) => (v + add & 63) - add;
-  if (xMin === xMax) {
-    if (rem(cxMin, 31) + rem(cxMax, 32) < 0) xMin -= 1;
-    else xMax += 1;
-  }
-  if (yMin === yMax) {
-    if (rem(cyMin, 31) + rem(cyMax, 32) < 0) yMin -= 1;
-    else yMax += 1;
-  }
-  return { xMin, xMax, yMin, yMax };
+  const collapsedX = xMin === xMax;
+  const collapsedY = yMin === yMax;
+  if (collapsedX) xMax += 1;
+  if (collapsedY) yMax += 1;
+  return { xMin, xMax, yMin, yMax, collapsedX, collapsedY };
 }
 function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossings26Dot6 = false) {
   const box = fixedBox ?? monoBox(o);
@@ -29107,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;
@@ -29150,7 +29221,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
               break;
             case 1:
             case 5:
-              const stub = 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;
@@ -29211,7 +29282,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
                 break;
               case 1:
               case 5:
-                const stub = 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;
@@ -29575,6 +29646,7 @@ var RasterRealizedFont = class {
       fsSelection: face.italic ? 1 : 0,
       macStyle: 0,
       winAscent: this.ascent,
+      winDescent: this.descent,
       unitsPerEm: this.ppem || 1
     };
   }
@@ -29762,6 +29834,11 @@ var RealizedFont = class {
     }
     return base + (this.syntheticBold ? 1 : 0);
   }
+  /** GDI+ rounds tracked hmtx advances to font units before device scaling. */
+  designAdvance(index, tracking) {
+    const { advance } = this.ttf.hMetrics(index < this.ttf.numGlyphs ? index : NOTDEF);
+    return Math.round(advance * tracking) * this.ppemX / this.ttf.unitsPerEm + (this.syntheticBold ? 1 : 0);
+  }
   /**
    * Advance of glyph `index` in a font realised with an escapement: GDI
    * does not use the hinted/hdmx widths there but the linearly scaled
@@ -40449,6 +40526,35 @@ function surfaceSize5(ctx) {
   return typeof w === "number" && typeof h === "number" && w > 0 && h > 0 ? { w, h } : null;
 }
 
+// src/emf-plus-text-alignment.ts
+var SIMPLE_SCRIPT = /^(?:\p{Script=Latin}|\p{Script=Common}|\p{Co})$/u;
+var SHAPING_CHARACTER = /[\p{M}\p{Cf}\p{Emoji_Presentation}]/u;
+function layoutPlusAlignedString(font, codes, format, x, y, width, height) {
+  const horizontal = format.alignment, vertical = format.lineAlignment;
+  if (!horizontal && !vertical || horizontal < 0 || horizontal > 2 || vertical < 0 || vertical > 2 || font.gridFit || font.mode !== "gray" || !font.designAdvance || font.ttf.winDescent === void 0 || font.syntheticBold || font.syntheticItalic || format.flags & 3 || ![x, y, width, height].every(Number.isFinite) || width <= 0 || height <= 0 || codes.some((c) => !Number.isInteger(c) || c < 32 || c > 1114111 || c >= 127 && c <= 159 || c === 8232 || c === 8233)) return null;
+  if (codes.some((c) => {
+    const character = String.fromCodePoint(c);
+    return !SIMPLE_SCRIPT.test(character) || SHAPING_CHARACTER.test(character) || font.glyphIndex(c) === 0;
+  })) return null;
+  const em = font.ppem;
+  const tracking = format.tracking ?? 1.03;
+  const leading = em * (format.leadingMargin ?? 1 / 6);
+  const trailing = em * (format.trailingMargin ?? 1 / 6);
+  if (![tracking, leading, trailing].every((v) => Number.isFinite(v) && v >= 0)) return null;
+  if (!(format.flags & 4) && (font.ttf.fsSelection & 1 || font.ttf.macStyle & 2)) return null;
+  const dx = codes.map((c) => font.designAdvance(font.glyphIndex(c), tracking));
+  let measuredCount = codes.length;
+  if (!(format.flags & 2048)) while (measuredCount > 0 && codes[measuredCount - 1] === 32) measuredCount--;
+  const measuredWidth = dx.slice(0, measuredCount).reduce((a, b) => a + b, 0) + leading + trailing;
+  const measuredHeight = em * (font.ttf.winAscent + font.ttf.winDescent) / font.ttf.unitsPerEm + (format.flags & 4 ? 0 : em / 8);
+  if (measuredWidth > width || measuredHeight > height) return null;
+  return {
+    x: Math.fround(x + horizontal / 2 * (width - measuredWidth) + leading),
+    y: Math.fround(y + vertical / 2 * (height - measuredHeight)) + Math.round(em * font.ttf.winAscent / font.ttf.unitsPerEm),
+    dx
+  };
+}
+
 // src/emf-plus-text-image-handlers.ts
 function imageAttributesWrap(rCtx, attributesId) {
   const obj = attributesId <= 255 ? rCtx.objectTable.get(attributesId) : void 0;
@@ -40717,25 +40823,33 @@ function paintPlusEngineRun(rCtx, ef, run) {
   );
   return true;
 }
-function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, paint, alignment, format, brushSampler2 = null) {
-  if (alignment !== 0) {
-    return false;
-  }
+function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, layoutW, layoutH, paint, alignment, format, brushSampler2 = null) {
   const ef = realizePlusEngineFont(rCtx, font, paint, brushSampler2);
   if (!ef) {
     return false;
   }
   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] === m[3] && Math.fround(emPx) === realized.ppem) {
+    const aligned = layoutPlusAlignedString(
+      realized,
+      codes,
+      format,
+      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;
-  const codes = [];
-  for (const character of text) {
-    codes.push(character.codePointAt(0));
-  }
   const tracking = format?.tracking ?? PLUS_DEFAULT_TRACKING;
   const dx = unhinted ? codes.map((c) => realized.advance(realized.glyphIndex(c)) * tracking) : null;
   return paintPlusEngineRun(rCtx, ef, { codes, glyphIndices: false, x, y, dx, dy: null });
@@ -40817,8 +40931,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
         const strLen = view.getUint32(dataOff + 8, true);
         const layoutX = view.getFloat32(dataOff + 12, true);
         const layoutY = view.getFloat32(dataOff + 16, true);
-        view.getFloat32(dataOff + 20, true);
-        view.getFloat32(dataOff + 24, true);
+        const layoutW = view.getFloat32(dataOff + 20, true);
+        const layoutH = view.getFloat32(dataOff + 24, true);
         const fontId = recFlags & 255;
         const font = objectTable.get(fontId);
         if (strLen > 0 && dataOff + 28 + strLen * 2 <= dataOff + recDataSize) {
@@ -40834,6 +40948,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
               text,
               layoutX,
               layoutY,
+              layoutW,
+              layoutH,
               paint,
               alignment,
               format,

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) {
@@ -29077,16 +29153,11 @@ function monoBox(o) {
   let xMax = Math.floor((cxMax + 32) / 64);
   let yMin = Math.floor((cyMin + 31) / 64);
   let yMax = Math.floor((cyMax + 32) / 64);
-  const rem = (v, add) => (v + add & 63) - add;
-  if (xMin === xMax) {
-    if (rem(cxMin, 31) + rem(cxMax, 32) < 0) xMin -= 1;
-    else xMax += 1;
-  }
-  if (yMin === yMax) {
-    if (rem(cyMin, 31) + rem(cyMax, 32) < 0) yMin -= 1;
-    else yMax += 1;
-  }
-  return { xMin, xMax, yMin, yMax };
+  const collapsedX = xMin === xMax;
+  const collapsedY = yMin === yMax;
+  if (collapsedX) xMax += 1;
+  if (collapsedY) yMax += 1;
+  return { xMin, xMax, yMin, yMax, collapsedX, collapsedY };
 }
 function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossings26Dot6 = false) {
   const box = fixedBox ?? monoBox(o);
@@ -29110,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;
@@ -29153,7 +29224,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
               break;
             case 1:
             case 5:
-              const stub = 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;
@@ -29214,7 +29285,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
                 break;
               case 1:
               case 5:
-                const stub = 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;
@@ -29578,6 +29649,7 @@ var RasterRealizedFont = class {
       fsSelection: face.italic ? 1 : 0,
       macStyle: 0,
       winAscent: this.ascent,
+      winDescent: this.descent,
       unitsPerEm: this.ppem || 1
     };
   }
@@ -29765,6 +29837,11 @@ var RealizedFont = class {
     }
     return base + (this.syntheticBold ? 1 : 0);
   }
+  /** GDI+ rounds tracked hmtx advances to font units before device scaling. */
+  designAdvance(index, tracking) {
+    const { advance } = this.ttf.hMetrics(index < this.ttf.numGlyphs ? index : NOTDEF);
+    return Math.round(advance * tracking) * this.ppemX / this.ttf.unitsPerEm + (this.syntheticBold ? 1 : 0);
+  }
   /**
    * Advance of glyph `index` in a font realised with an escapement: GDI
    * does not use the hinted/hdmx widths there but the linearly scaled
@@ -40452,6 +40529,35 @@ function surfaceSize5(ctx) {
   return typeof w === "number" && typeof h === "number" && w > 0 && h > 0 ? { w, h } : null;
 }
 
+// src/emf-plus-text-alignment.ts
+var SIMPLE_SCRIPT = /^(?:\p{Script=Latin}|\p{Script=Common}|\p{Co})$/u;
+var SHAPING_CHARACTER = /[\p{M}\p{Cf}\p{Emoji_Presentation}]/u;
+function layoutPlusAlignedString(font, codes, format, x, y, width, height) {
+  const horizontal = format.alignment, vertical = format.lineAlignment;
+  if (!horizontal && !vertical || horizontal < 0 || horizontal > 2 || vertical < 0 || vertical > 2 || font.gridFit || font.mode !== "gray" || !font.designAdvance || font.ttf.winDescent === void 0 || font.syntheticBold || font.syntheticItalic || format.flags & 3 || ![x, y, width, height].every(Number.isFinite) || width <= 0 || height <= 0 || codes.some((c) => !Number.isInteger(c) || c < 32 || c > 1114111 || c >= 127 && c <= 159 || c === 8232 || c === 8233)) return null;
+  if (codes.some((c) => {
+    const character = String.fromCodePoint(c);
+    return !SIMPLE_SCRIPT.test(character) || SHAPING_CHARACTER.test(character) || font.glyphIndex(c) === 0;
+  })) return null;
+  const em = font.ppem;
+  const tracking = format.tracking ?? 1.03;
+  const leading = em * (format.leadingMargin ?? 1 / 6);
+  const trailing = em * (format.trailingMargin ?? 1 / 6);
+  if (![tracking, leading, trailing].every((v) => Number.isFinite(v) && v >= 0)) return null;
+  if (!(format.flags & 4) && (font.ttf.fsSelection & 1 || font.ttf.macStyle & 2)) return null;
+  const dx = codes.map((c) => font.designAdvance(font.glyphIndex(c), tracking));
+  let measuredCount = codes.length;
+  if (!(format.flags & 2048)) while (measuredCount > 0 && codes[measuredCount - 1] === 32) measuredCount--;
+  const measuredWidth = dx.slice(0, measuredCount).reduce((a, b) => a + b, 0) + leading + trailing;
+  const measuredHeight = em * (font.ttf.winAscent + font.ttf.winDescent) / font.ttf.unitsPerEm + (format.flags & 4 ? 0 : em / 8);
+  if (measuredWidth > width || measuredHeight > height) return null;
+  return {
+    x: Math.fround(x + horizontal / 2 * (width - measuredWidth) + leading),
+    y: Math.fround(y + vertical / 2 * (height - measuredHeight)) + Math.round(em * font.ttf.winAscent / font.ttf.unitsPerEm),
+    dx
+  };
+}
+
 // src/emf-plus-text-image-handlers.ts
 function imageAttributesWrap(rCtx, attributesId) {
   const obj = attributesId <= 255 ? rCtx.objectTable.get(attributesId) : void 0;
@@ -40720,25 +40826,33 @@ function paintPlusEngineRun(rCtx, ef, run) {
   );
   return true;
 }
-function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, paint, alignment, format, brushSampler2 = null) {
-  if (alignment !== 0) {
-    return false;
-  }
+function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, layoutW, layoutH, paint, alignment, format, brushSampler2 = null) {
   const ef = realizePlusEngineFont(rCtx, font, paint, brushSampler2);
   if (!ef) {
     return false;
   }
   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] === m[3] && Math.fround(emPx) === realized.ppem) {
+    const aligned = layoutPlusAlignedString(
+      realized,
+      codes,
+      format,
+      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;
-  const codes = [];
-  for (const character of text) {
-    codes.push(character.codePointAt(0));
-  }
   const tracking = format?.tracking ?? PLUS_DEFAULT_TRACKING;
   const dx = unhinted ? codes.map((c) => realized.advance(realized.glyphIndex(c)) * tracking) : null;
   return paintPlusEngineRun(rCtx, ef, { codes, glyphIndices: false, x, y, dx, dy: null });
@@ -40820,8 +40934,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
         const strLen = view.getUint32(dataOff + 8, true);
         const layoutX = view.getFloat32(dataOff + 12, true);
         const layoutY = view.getFloat32(dataOff + 16, true);
-        view.getFloat32(dataOff + 20, true);
-        view.getFloat32(dataOff + 24, true);
+        const layoutW = view.getFloat32(dataOff + 20, true);
+        const layoutH = view.getFloat32(dataOff + 24, true);
         const fontId = recFlags & 255;
         const font = objectTable.get(fontId);
         if (strLen > 0 && dataOff + 28 + strLen * 2 <= dataOff + recDataSize) {
@@ -40837,6 +40951,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
               text,
               layoutX,
               layoutY,
+              layoutW,
+              layoutH,
               paint,
               alignment,
               format,

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) {
@@ -29075,16 +29151,11 @@ function monoBox(o) {
   let xMax = Math.floor((cxMax + 32) / 64);
   let yMin = Math.floor((cyMin + 31) / 64);
   let yMax = Math.floor((cyMax + 32) / 64);
-  const rem = (v, add) => (v + add & 63) - add;
-  if (xMin === xMax) {
-    if (rem(cxMin, 31) + rem(cxMax, 32) < 0) xMin -= 1;
-    else xMax += 1;
-  }
-  if (yMin === yMax) {
-    if (rem(cyMin, 31) + rem(cyMax, 32) < 0) yMin -= 1;
-    else yMax += 1;
-  }
-  return { xMin, xMax, yMin, yMax };
+  const collapsedX = xMin === xMax;
+  const collapsedY = yMin === yMax;
+  if (collapsedX) xMax += 1;
+  if (collapsedY) yMax += 1;
+  return { xMin, xMax, yMin, yMax, collapsedX, collapsedY };
 }
 function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossings26Dot6 = false) {
   const box = fixedBox ?? monoBox(o);
@@ -29108,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;
@@ -29151,7 +29222,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
               break;
             case 1:
             case 5:
-              const stub = 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;
@@ -29212,7 +29283,7 @@ function rasterizeMono(o, dropout, fixedBox, stubOvershoot = true, smartCrossing
                 break;
               case 1:
               case 5:
-                const stub = 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;
@@ -29576,6 +29647,7 @@ var RasterRealizedFont = class {
       fsSelection: face.italic ? 1 : 0,
       macStyle: 0,
       winAscent: this.ascent,
+      winDescent: this.descent,
       unitsPerEm: this.ppem || 1
     };
   }
@@ -29763,6 +29835,11 @@ var RealizedFont = class {
     }
     return base + (this.syntheticBold ? 1 : 0);
   }
+  /** GDI+ rounds tracked hmtx advances to font units before device scaling. */
+  designAdvance(index, tracking) {
+    const { advance } = this.ttf.hMetrics(index < this.ttf.numGlyphs ? index : NOTDEF);
+    return Math.round(advance * tracking) * this.ppemX / this.ttf.unitsPerEm + (this.syntheticBold ? 1 : 0);
+  }
   /**
    * Advance of glyph `index` in a font realised with an escapement: GDI
    * does not use the hinted/hdmx widths there but the linearly scaled
@@ -40450,6 +40527,35 @@ function surfaceSize5(ctx) {
   return typeof w === "number" && typeof h === "number" && w > 0 && h > 0 ? { w, h } : null;
 }
 
+// src/emf-plus-text-alignment.ts
+var SIMPLE_SCRIPT = /^(?:\p{Script=Latin}|\p{Script=Common}|\p{Co})$/u;
+var SHAPING_CHARACTER = /[\p{M}\p{Cf}\p{Emoji_Presentation}]/u;
+function layoutPlusAlignedString(font, codes, format, x, y, width, height) {
+  const horizontal = format.alignment, vertical = format.lineAlignment;
+  if (!horizontal && !vertical || horizontal < 0 || horizontal > 2 || vertical < 0 || vertical > 2 || font.gridFit || font.mode !== "gray" || !font.designAdvance || font.ttf.winDescent === void 0 || font.syntheticBold || font.syntheticItalic || format.flags & 3 || ![x, y, width, height].every(Number.isFinite) || width <= 0 || height <= 0 || codes.some((c) => !Number.isInteger(c) || c < 32 || c > 1114111 || c >= 127 && c <= 159 || c === 8232 || c === 8233)) return null;
+  if (codes.some((c) => {
+    const character = String.fromCodePoint(c);
+    return !SIMPLE_SCRIPT.test(character) || SHAPING_CHARACTER.test(character) || font.glyphIndex(c) === 0;
+  })) return null;
+  const em = font.ppem;
+  const tracking = format.tracking ?? 1.03;
+  const leading = em * (format.leadingMargin ?? 1 / 6);
+  const trailing = em * (format.trailingMargin ?? 1 / 6);
+  if (![tracking, leading, trailing].every((v) => Number.isFinite(v) && v >= 0)) return null;
+  if (!(format.flags & 4) && (font.ttf.fsSelection & 1 || font.ttf.macStyle & 2)) return null;
+  const dx = codes.map((c) => font.designAdvance(font.glyphIndex(c), tracking));
+  let measuredCount = codes.length;
+  if (!(format.flags & 2048)) while (measuredCount > 0 && codes[measuredCount - 1] === 32) measuredCount--;
+  const measuredWidth = dx.slice(0, measuredCount).reduce((a, b) => a + b, 0) + leading + trailing;
+  const measuredHeight = em * (font.ttf.winAscent + font.ttf.winDescent) / font.ttf.unitsPerEm + (format.flags & 4 ? 0 : em / 8);
+  if (measuredWidth > width || measuredHeight > height) return null;
+  return {
+    x: Math.fround(x + horizontal / 2 * (width - measuredWidth) + leading),
+    y: Math.fround(y + vertical / 2 * (height - measuredHeight)) + Math.round(em * font.ttf.winAscent / font.ttf.unitsPerEm),
+    dx
+  };
+}
+
 // src/emf-plus-text-image-handlers.ts
 function imageAttributesWrap(rCtx, attributesId) {
   const obj = attributesId <= 255 ? rCtx.objectTable.get(attributesId) : void 0;
@@ -40718,25 +40824,33 @@ function paintPlusEngineRun(rCtx, ef, run) {
   );
   return true;
 }
-function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, paint, alignment, format, brushSampler2 = null) {
-  if (alignment !== 0) {
-    return false;
-  }
+function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, layoutW, layoutH, paint, alignment, format, brushSampler2 = null) {
   const ef = realizePlusEngineFont(rCtx, font, paint, brushSampler2);
   if (!ef) {
     return false;
   }
   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] === m[3] && Math.fround(emPx) === realized.ppem) {
+    const aligned = layoutPlusAlignedString(
+      realized,
+      codes,
+      format,
+      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;
-  const codes = [];
-  for (const character of text) {
-    codes.push(character.codePointAt(0));
-  }
   const tracking = format?.tracking ?? PLUS_DEFAULT_TRACKING;
   const dx = unhinted ? codes.map((c) => realized.advance(realized.glyphIndex(c)) * tracking) : null;
   return paintPlusEngineRun(rCtx, ef, { codes, glyphIndices: false, x, y, dx, dy: null });
@@ -40818,8 +40932,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
         const strLen = view.getUint32(dataOff + 8, true);
         const layoutX = view.getFloat32(dataOff + 12, true);
         const layoutY = view.getFloat32(dataOff + 16, true);
-        view.getFloat32(dataOff + 20, true);
-        view.getFloat32(dataOff + 24, true);
+        const layoutW = view.getFloat32(dataOff + 20, true);
+        const layoutH = view.getFloat32(dataOff + 24, true);
         const fontId = recFlags & 255;
         const font = objectTable.get(fontId);
         if (strLen > 0 && dataOff + 28 + strLen * 2 <= dataOff + recDataSize) {
@@ -40835,6 +40949,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
               text,
               layoutX,
               layoutY,
+              layoutW,
+              layoutH,
               paint,
               alignment,
               format,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "emf-converter",
-	"version": "4.20.1",
+	"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",