emf-converter 4.20.1 → 4.20.2

package/dist/browser.js

@@ -29076,16 +29076,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);
@@ -29152,7 +29147,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);
               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 +29208,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);
                 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 +29572,7 @@ var RasterRealizedFont = class {
       fsSelection: face.italic ? 1 : 0,
       macStyle: 0,
       winAscent: this.ascent,
+      winDescent: this.descent,
       unitsPerEm: this.ppem || 1
     };
   }
@@ -29764,6 +29760,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 +40452,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 +40749,32 @@ 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] === 1 && m[3] === 1 && emPx === realized.ppem) {
+    const aligned = layoutPlusAlignedString(
+      realized,
+      codes,
+      format,
+      layoutX + m[4],
+      layoutY + m[5],
+      layoutW,
+      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);
   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 +40856,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 +40873,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
               text,
               layoutX,
               layoutY,
+              layoutW,
+              layoutH,
               paint,
               alignment,
               format,

package/dist/browser.mjs

@@ -29074,16 +29074,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);
@@ -29150,7 +29145,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);
               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 +29206,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);
                 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 +29570,7 @@ var RasterRealizedFont = class {
       fsSelection: face.italic ? 1 : 0,
       macStyle: 0,
       winAscent: this.ascent,
+      winDescent: this.descent,
       unitsPerEm: this.ppem || 1
     };
   }
@@ -29762,6 +29758,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 +40450,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 +40747,32 @@ 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] === 1 && m[3] === 1 && emPx === realized.ppem) {
+    const aligned = layoutPlusAlignedString(
+      realized,
+      codes,
+      format,
+      layoutX + m[4],
+      layoutY + m[5],
+      layoutW,
+      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);
   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 +40854,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 +40871,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
               text,
               layoutX,
               layoutY,
+              layoutW,
+              layoutH,
               paint,
               alignment,
               format,

package/dist/index.js

@@ -29077,16 +29077,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);
@@ -29153,7 +29148,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);
               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 +29209,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);
                 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 +29573,7 @@ var RasterRealizedFont = class {
       fsSelection: face.italic ? 1 : 0,
       macStyle: 0,
       winAscent: this.ascent,
+      winDescent: this.descent,
       unitsPerEm: this.ppem || 1
     };
   }
@@ -29765,6 +29761,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 +40453,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 +40750,32 @@ 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] === 1 && m[3] === 1 && emPx === realized.ppem) {
+    const aligned = layoutPlusAlignedString(
+      realized,
+      codes,
+      format,
+      layoutX + m[4],
+      layoutY + m[5],
+      layoutW,
+      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);
   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 +40857,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 +40874,8 @@ function handleEmfPlusTextImageRecord(rCtx, recType, recFlags, dataOff, recDataS
               text,
               layoutX,
               layoutY,
+              layoutW,
+              layoutH,
               paint,
               alignment,
               format,

package/dist/index.mjs

@@ -29075,16 +29075,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);
@@ -29151,7 +29146,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);
               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 +29207,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);
                 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 +29571,7 @@ var RasterRealizedFont = class {
       fsSelection: face.italic ? 1 : 0,
       macStyle: 0,
       winAscent: this.ascent,
+      winDescent: this.descent,
       unitsPerEm: this.ppem || 1
     };
   }
@@ -29763,6 +29759,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 +40451,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 +40748,32 @@ 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] === 1 && m[3] === 1 && emPx === realized.ppem) {
+    const aligned = layoutPlusAlignedString(
+      realized,
+      codes,
+      format,
+      layoutX + m[4],
+      layoutY + m[5],
+      layoutW,
+      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);
   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 +40855,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 +40872,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.2",
 	"description": "Convert EMF/WMF metafile binaries to PNG or JPEG data URLs, or SVG (markup, data URL, React/JSX)",
 	"keywords": [
 		"canvas",