emf-converter 3.5.1 → 4.1.0

package/README.md

@@ -206,7 +206,7 @@ Everything below is verified against output painted by Windows itself; `src/gdi-
 
 ### Supported records
 
-- **EMF**: 115 of the 119 record types defined in MS-EMF, including logical palettes (`PALETTEINDEX`, `DIBPALETTEINDEX`, `PALETTERGB`, `DIB_PAL_COLORS`), `EMR_ALPHABLEND` (Windows' exact integer blend), `EMR_TRANSPARENTBLT`, `EMR_MASKBLT`, `EMR_PLGBLT`, `EMR_SETDIBITSTODEVICE`, `EMR_GRADIENTFILL` (rectangles and triangles), `EMR_FILLRGN` / `EMR_FRAMERGN` / `EMR_INVERTRGN` / `EMR_PAINTRGN`, `EMR_EXTFLOODFILL`, `EMR_ANGLEARC`, `EMR_POLYDRAW(16)`, `EMR_FLATTENPATH` / `EMR_WIDENPATH` / `EMR_ABORTPATH`, alongside shapes, paths, `EMR_EXTTEXTOUTW`, blits, clipping and transforms. Colour space, ICM, OpenGL, escape and font-driver records are consumed without effect, as on a Windows display.
+- **EMF**: Record playback includes logical palettes (`PALETTEINDEX`, `DIBPALETTEINDEX`, `PALETTERGB`, `DIB_PAL_COLORS`), `EMR_ALPHABLEND` (Windows' exact integer blend), `EMR_TRANSPARENTBLT`, `EMR_MASKBLT`, `EMR_PLGBLT`, `EMR_SETDIBITSTODEVICE`, `EMR_GRADIENTFILL` (rectangles and triangles), `EMR_FILLRGN` / `EMR_FRAMERGN` / `EMR_INVERTRGN` / `EMR_PAINTRGN`, `EMR_EXTFLOODFILL`, `EMR_ANGLEARC`, `EMR_POLYDRAW(16)`, `EMR_FLATTENPATH` / `EMR_WIDENPATH` / `EMR_ABORTPATH`, alongside shapes, paths, `EMR_EXTTEXTOUTA/W`, `EMR_POLYTEXTOUTA/W`, `EMR_SMALLTEXTOUT`, text justification, blits, clipping and transforms. Colour space, ICM, OpenGL, escape and font-driver records are consumed without effect, as on a Windows display.
 - **EMF+**: every record in MS-EMFPLUS (Beziers, cardinal curves, regions, containers, save/restore, compositing mode, rendering origin, text contrast, `StrokeFillPath`, the terminal-server `SetTSGraphics` / `SetTSClip`, `MultiFormat*` played as GDI+ plays them), with 32-bit, compressed 16-bit and relative point data, and every object type (solid, hatch, texture and gradient brushes; pens with caps, joins, dash styles, dash caps, compound lines and custom line caps; paths, regions, bitmap and metafile images, fonts, string formats, image attributes). Several encodings follow what GDI+ actually does where it differs from MS-EMFPLUS (relative points, `StrokeFillPath`, `SetTSGraphics`, `SetTSClip`).
 - **WMF**: META_ANIMATEPALETTE, META_ARC, META_BITBLT, META_CHORD, META_CREATEBITMAP, META_CREATEBITMAPINDIRECT, META_CREATEBRUSH, META_CREATEBRUSHINDIRECT, META_CREATEFONTINDIRECT, META_CREATEPALETTE, META_CREATEPATTERNBRUSH, META_CREATEPENINDIRECT, META_CREATEREGION, META_DELETEOBJECT, META_DIBBITBLT, META_DIBCREATEPATTERNBRUSH, META_DIBSTRETCHBLT, META_ELLIPSE, META_EOF, META_ESCAPE, META_EXCLUDECLIPRECT, META_EXTFLOODFILL, META_EXTTEXTOUT, META_FILLREGION, META_FLOODFILL, META_FRAMEREGION, META_INTERSECTCLIPRECT, META_INVERTREGION, META_LINETO, META_MOVETO, META_OFFSETCLIPRGN, META_OFFSETVIEWPORTORG, META_OFFSETWINDOWORG, META_PAINTREGION, META_PATBLT, META_PIE, META_POLYGON, META_POLYLINE, META_POLYPOLYGON, META_REALIZEPALETTE, META_RECTANGLE, META_RESIZEPALETTE, META_RESTOREDC, META_ROUNDRECT, META_SAVEDC, META_SCALEVIEWPORTEXT, META_SCALEWINDOWEXT, META_SELECTCLIPREGION, META_SELECTOBJECT, META_SELECTPALETTE, META_SETBKCOLOR, META_SETBKMODE, META_SETDIBTODEV, META_SETLAYOUT, META_SETMAPMODE, META_SETMAPPERFLAGS, META_SETPALENTRIES, META_SETPIXEL, META_SETPOLYFILLMODE, META_SETRELABS, META_SETROP2, META_SETSTRETCHBLTMODE, META_SETTEXTALIGN, META_SETTEXTCHAREXTRA, META_SETTEXTCOLOR, META_SETTEXTJUSTIFICATION, META_SETVIEWPORTEXT, META_SETVIEWPORTORG, META_SETWINDOWEXT, META_SETWINDOWORG, META_STRETCHBLT, META_STRETCHDIB, META_TEXTOUT. Where Windows no longer plays a record the way MS-WMF describes it (Win16 device bitmaps in META_BITBLT / META_STRETCHBLT, META_CREATEPATTERNBRUSH, banded META_SETDIBTODEV), the converter follows Windows.
 
@@ -214,7 +214,9 @@ Everything below is verified against output painted by Windows itself; `src/gdi-
 
 Everything is measured against output painted by Windows itself; `src/gdi-parity.fixture.test.ts` holds the exact per-fixture bounds.
 
-- **Unhandled records**: `EMR_EXTTEXTOUTA`, `EMR_POLYTEXTOUTA`, `EMR_POLYTEXTOUTW` and `EMR_SMALLTEXTOUT` (ANSI, multi-string and small-glyph text records, rarely written by modern recorders) are skipped with a console warning. `EMR_SETTEXTJUSTIFICATION` and `EMR_SETCOLORADJUSTMENT` are read but not yet applied (Windows' own recorder bakes justification into `EMR_EXTTEXTOUTW` spacing arrays, so only other writers emit the former), and the `HALFTONE` stretch mode is not bit-exact. EMF+ image effects (`SerializableObject`: blur, sharpen, colour matrix and the like) are not applied, so the image is drawn without the effect, and an EMF+ pen's own transform is ignored.
+- **Colour adjustment and image effects**: `EMR_SETCOLORADJUSTMENT` is read but not yet applied, and the `HALFTONE` stretch mode is not bit-exact. EMF+ image effects (`SerializableObject`: blur, sharpen, colour matrix and the like) are not applied, so the image is drawn without the effect.
+- **Pen transforms**: EMF+ pen transforms support uniform scaling with rotation and translation; nonuniform scaling and skew remain unsupported.
+- **Text**: ANSI, multi-string and small-text records now render; the Windows text fixtures retain a few glyph-edge differences and a `PolyTextOut` C1 control-glyph difference (under 0.1% of pixels; bounds in `src/emf-text-records.fixture.test.ts`). ANSI decoding uses the host's `TextDecoder` for common Windows code pages; unsupported encodings (including Johab and OEM on standard runtimes) fall back to Windows-1252. Vertical `ETO_PDY` advances require the `fonts` engine. Without `fonts`, SVG text measurements use deterministic estimates, so precise justification requires supplying the matching fonts.
 - **Wide pens and paths**: flat-capped GDI pens 7 px and wider can differ by a few pixels at round joins, and dashed wide Bezier curves follow `WidenPath` (which Windows' direct drawing does not quite match); at most 0.2% of pixels on the fixtures. `EMR_WIDENPATH` does not reproduce the extra inner join triangles GDI's own `WidenPath` emits (visible only when the widened outline is itself stroked). EMF+ 1-pixel antialiased lines can differ by one antialiasing sample at their ends, some closed widened outlines by one sample along an edge, and Inset or compound pens on closed figures are approximate.
 - **GM_COMPATIBLE recordings**: EMF files do not record the graphics mode, and Windows plays RoundRect, Arc, Chord, Pie and null-pen Ellipse records back differently from how a GM_COMPATIBLE application drew them on screen; the converter follows Windows' playback.
 - **Small EMF+ residuals**: rotated `HighQualityBicubic` `DrawImage` edge pixels (0.14%), one-level differences at exact half-level `Blend` knots, and a few pixels of a metafile nested in `DrawImage` under a scale.

package/dist/index.js

@@ -493,6 +493,23 @@ function totalGlyphAdvance(dx) {
   }
   return sum;
 }
+function applyTextJustification(advances, characters, extra, count) {
+  const result = advances.slice();
+  if (extra === 0 || count <= 0) {
+    return result;
+  }
+  let seen = 0;
+  for (let i = 0; i < result.length && i < characters.length; i++) {
+    if (characters[i] !== 32) {
+      continue;
+    }
+    const before = Math.round(seen * extra / count);
+    seen++;
+    const after = Math.round(seen * extra / count);
+    result[i] += after - before;
+  }
+  return result;
+}
 function alignmentStartOffset(totalWidth, align) {
   if (align === "center") {
     return -totalWidth / 2;
@@ -629,8 +646,11 @@ var EMR_PAINTRGN = 74;
 var EMR_MASKBLT = 78;
 var EMR_PLGBLT = 79;
 var EMR_SETDIBITSTODEVICE = 80;
+var EMR_EXTTEXTOUTA = 83;
 var EMR_POLYPOLYLINE16 = 90;
 var EMR_POLYDRAW16 = 92;
+var EMR_POLYTEXTOUTA = 96;
+var EMR_POLYTEXTOUTW = 97;
 var EMR_CREATECOLORSPACE = 99;
 var EMR_SETCOLORSPACE = 100;
 var EMR_DELETECOLORSPACE = 101;
@@ -639,6 +659,7 @@ var EMR_GLSBOUNDEDRECORD = 103;
 var EMR_PIXELFORMAT = 104;
 var EMR_DRAWESCAPE = 105;
 var EMR_EXTESCAPE = 106;
+var EMR_SMALLTEXTOUT = 108;
 var EMR_FORCEUFIMAPPING = 109;
 var EMR_NAMEDESCAPE = 110;
 var EMR_COLORCORRECTPALETTE = 111;
@@ -13102,7 +13123,7 @@ function parseEmfPlusPenObject(view, dataOff, recDataSize, textureCache, cacheKe
     o += 4;
     return v;
   };
-  const pen = { kind: "plus-pen", color: "rgba(0,0,0,1)", width: penWidth || 1, dashStyle: 0 };
+  const pen = { kind: "plus-pen", color: "rgba(0,0,0,1)", width: penWidth, dashStyle: 0 };
   if (penFlags & PEN_TRANSFORM) {
     if (o + 24 <= end) {
       pen.transform = [0, 4, 8, 12, 16, 20].map((k) => view.getFloat32(o + k, true));
@@ -14938,19 +14959,7 @@ var SvgContext = class {
     }
   }
   // ---- text ---------------------------------------------------------------
-  measurer() {
-    if (this.measureCtx === void 0) {
-      const temp = createTempCanvas(1, 1);
-      this.measureCtx = temp && !isSoftwareRaster(temp.canvas) ? temp.ctx : null;
-    }
-    return this.measureCtx;
-  }
   measureText(text) {
-    const real = this.shadow ?? this.measurer();
-    if (real) {
-      real.font = this.state.font;
-      return real.measureText(text);
-    }
     const size = parseFont(this.state.font).size;
     return { width: estimateTextWidth(text, size) };
   }
@@ -20955,10 +20964,109 @@ function handleEmfGdiBlendBlitRecord(rCtx, recType, offset, dataOff, recSize) {
   }
 }
 
+// src/emf-ansi.ts
+var CP1252_HIGH2 = [
+  8364,
+  129,
+  8218,
+  402,
+  8222,
+  8230,
+  8224,
+  8225,
+  710,
+  8240,
+  352,
+  8249,
+  338,
+  141,
+  381,
+  143,
+  144,
+  8216,
+  8217,
+  8220,
+  8221,
+  8226,
+  8211,
+  8212,
+  732,
+  8482,
+  353,
+  8250,
+  339,
+  157,
+  382,
+  376
+];
+function ansiToCode(b, charSet) {
+  return charSet === 2 ? b : b >= 128 && b <= 159 ? CP1252_HIGH2[b - 128] : b;
+}
+var CHARSET_ENCODING = {
+  0: "windows-1252",
+  1: "windows-1252",
+  128: "shift_jis",
+  129: "euc-kr",
+  130: "johab",
+  134: "gbk",
+  136: "big5",
+  161: "windows-1253",
+  162: "windows-1254",
+  163: "windows-1258",
+  177: "windows-1255",
+  178: "windows-1256",
+  186: "windows-1257",
+  204: "windows-1251",
+  222: "windows-874",
+  238: "windows-1250",
+  255: "ibm437"
+};
+function decodeAnsiRecord(bytes, charSet) {
+  if (charSet === 2) {
+    return { codes: [...bytes], byteLengths: bytes.map(() => 1) };
+  }
+  const label = CHARSET_ENCODING[charSet] ?? "windows-1252";
+  try {
+    const decoder = new TextDecoder(label, { fatal: true });
+    const replacementDecoder = new TextDecoder(label);
+    const source = new Uint8Array(bytes);
+    const codes = [];
+    const byteLengths = [];
+    let i = 0;
+    while (i < bytes.length) {
+      let decoded = null;
+      let consumed = 1;
+      for (let n = 1; n <= Math.min(4, bytes.length - i); n++) {
+        try {
+          const candidate = decoder.decode(source.subarray(i, i + n));
+          if (candidate.length > 0) {
+            decoded = candidate;
+            consumed = n;
+            break;
+          }
+        } catch {
+        }
+      }
+      if (decoded === null) {
+        decoded = replacementDecoder.decode(source.subarray(i, i + 1));
+      }
+      for (let j = 0; j < decoded.length; j++) {
+        codes.push(decoded.charCodeAt(j));
+        byteLengths.push(j === decoded.length - 1 ? consumed : 0);
+      }
+      i += consumed;
+    }
+    return { codes, byteLengths };
+  } catch {
+    return { codes: bytes.map((b) => ansiToCode(b, charSet)), byteLengths: bytes.map(() => 1) };
+  }
+}
+
 // src/gdi-text-render.ts
 var ETO_OPAQUE = 2;
 var ETO_CLIPPED = 4;
 var ETO_GLYPH_INDEX = 16;
+var ETO_IGNORELANGUAGE = 4096;
 var ETO_PDY = 8192;
 var GRAY_INV_GAMMA = 0.43;
 var GRAY_BLACK_ON_WHITE = [255, 255, 240, 233, 225, 217, 208, 199, 189, 178, 167, 154, 140, 124, 104, 77, 0];
@@ -21039,15 +21147,24 @@ function fillDeviceQuad(ctx, pts, color, clip) {
   ctx.fill();
   ctx.restore();
 }
+function isC1Control(code) {
+  return code >= 128 && code <= 159;
+}
+function suppressC1Glyph(run, index) {
+  return !run.glyphIndices && !(run.options & ETO_IGNORELANGUAGE) && isC1Control(run.codes[index]);
+}
 function layoutGdiRun(font, run) {
   const n = run.codes.length;
   const glyphs = run.codes.map((c) => run.glyphIndices ? c : font.glyphIndex(c));
-  const adv = [];
+  let adv = [];
   for (let i = 0; i < n; i++) {
     adv.push(
-      run.dx && i < run.dx.length ? run.dx[i] : run.matrix ? font.rotatedAdvance(glyphs[i]) : font.advance(glyphs[i])
+      suppressC1Glyph(run, i) && !run.dx ? 0 : run.dx && i < run.dx.length ? run.dx[i] : run.matrix ? font.rotatedAdvance(glyphs[i]) : font.advance(glyphs[i])
     );
   }
+  if (!run.dx && run.textJustification && !run.glyphIndices) {
+    adv = applyTextJustification(adv, run.codes, run.textJustification.extra, run.textJustification.count);
+  }
   const advY = [];
   for (let i = 0; i < n; i++) {
     advY.push(run.dy && i < run.dy.length ? run.dy[i] : 0);
@@ -21090,9 +21207,11 @@ function layoutGdiRun(font, run) {
     const subX = font.gridFit ? 0 : Math.round((origin.x - ox) * 64);
     const oy = Math.round(origin.y);
     origins.push({ x: ox + subX / 64, y: oy, along, down });
-    const g = font.glyph(glyphs[i], gm, subX);
-    if (g.bitmap) {
-      placed.push({ x: ox + g.bitmap.left, y: oy - g.bitmap.top, bitmap: g.bitmap });
+    if (!suppressC1Glyph(run, i)) {
+      const g = font.glyph(glyphs[i], gm, subX);
+      if (g.bitmap) {
+        placed.push({ x: ox + g.bitmap.left, y: oy - g.bitmap.top, bitmap: g.bitmap });
+      }
     }
     along += adv[i];
     down += advY[i];
@@ -21177,21 +21296,25 @@ function paintGdiTextRun(ctx, font, run, fontFamilyMap) {
 }
 function emitSvgRun(ctx, font, run, glyphs, origins, fontFamilyMap) {
   let text = "";
+  const visibleOrigins = [];
   for (let i = 0; i < origins.length; i++) {
     const code = run.glyphIndices ? font.charForGlyph(glyphs[i]) : run.codes[i];
+    if (!run.glyphIndices && !(run.options & ETO_IGNORELANGUAGE) && isC1Control(code)) continue;
     text += String.fromCharCode(code);
+    visibleOrigins.push(origins[i]);
   }
+  if (text.length === 0) return;
   const m = run.matrix;
   const ttf = font.ttf;
   const bold = font.syntheticBold || ttf.weightClass >= 600;
   const italic = font.syntheticItalic || (ttf.fsSelection & 1) !== 0 || (ttf.macStyle & 2) !== 0;
-  const first = origins[0];
+  const first = visibleOrigins[0];
   ctx.fillGlyphRun({
     text,
     // Upright runs: device positions. Rotated runs: offsets along/across
     // the baseline from the first glyph, under the frame matrix.
-    xs: origins.map((o) => m ? o.along - first.along : o.x),
-    ys: origins.map((o) => m ? o.down - first.down : o.y),
+    xs: visibleOrigins.map((o) => m ? o.along - first.along : o.x),
+    ys: visibleOrigins.map((o) => m ? o.down - first.down : o.y),
     matrix: m ? [m[0], m[1], m[2], m[3], first.x, first.y] : null,
     scaleX: font.ppemX !== font.ppem ? font.ppemX / font.ppem : 1,
     fontFamily: mapFontFamily(ttf.family, fontFamilyMap),
@@ -21362,6 +21485,7 @@ function drawGdiTextCall(ctx, fonts, state, call) {
     y: ref.y,
     dx: call.dx ? call.dx.map((v) => v * advanceScale) : null,
     dy: call.dy ? call.dy.map((v) => -v * fontScale) : null,
+    textJustification: call.textJustification ? { ...call.textJustification, extra: call.textJustification.extra * advanceScale } : void 0,
     textAlign: state.textAlign,
     textColor: state.textColor,
     bkColor: state.bkColor,
@@ -21498,11 +21622,11 @@ function readDxArray(view, offset, dataOff, nChars, viewEnd) {
   }
   const dx = [];
   for (let i = 0; i < nChars; i++) {
-    dx.push(view.getUint32(start + i * 4, true));
+    dx.push(view.getInt32(start + i * 4, true));
   }
   return dx;
 }
-function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString) {
+function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString, viewEnd) {
   const { ctx, view, state } = rCtx;
   const fonts = rCtx.fonts;
   if (!fonts) {
@@ -21514,7 +21638,7 @@ function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString) {
     codes.push(view.getUint16(offset + offString + i * 2, true));
   }
   const pdy = (options & ETO_PDY) !== 0;
-  const raw = readDxArray(view, offset, dataOff, pdy ? nChars * 2 : nChars, view.byteLength);
+  const raw = readDxArray(view, offset, dataOff, pdy ? nChars * 2 : nChars, viewEnd);
   let dx = raw;
   let dy = null;
   if (raw && pdy) {
@@ -21539,7 +21663,8 @@ function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString) {
     },
     dx,
     dy,
-    matrix: gdiDeviceMatrix(rCtx)
+    matrix: gdiDeviceMatrix(rCtx),
+    textJustification: state.textJustification
   });
   if (!adv) {
     return false;
@@ -21551,12 +21676,12 @@ function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString) {
   return true;
 }
 function horizontalAlign(textAlign) {
+  if ((textAlign & 6) === 6) {
+    return "center";
+  }
   if (textAlign & 2) {
     return "right";
   }
-  if (textAlign & 6) {
-    return "center";
-  }
   return "left";
 }
 function verticalBaseline(textAlign) {
@@ -21598,11 +21723,11 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
   const refY = view.getInt32(dataOff + 32, true);
   const nChars = view.getUint32(dataOff + 36, true);
   const offString = view.getUint32(dataOff + 40, true);
-  const viewEnd = view.byteLength;
-  if (nChars === 0 || offString === 0 || offset + offString + nChars * 2 > viewEnd) {
+  const viewEnd = Math.min(view.byteLength, offset + recSize);
+  if (nChars === 0 || offString === 0 || nChars > Math.floor((viewEnd - offset - offString) / 2)) {
     return true;
   }
-  if (drawWithFontEngine(rCtx, offset, dataOff, nChars, offString)) {
+  if (drawWithFontEngine(rCtx, offset, dataOff, nChars, offString, viewEnd)) {
     return true;
   }
   const text = readUtf16LE(view, offset + offString, nChars);
@@ -21617,8 +21742,16 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
   const align = horizontalAlign(state.textAlign);
   ctx.textBaseline = verticalBaseline(state.textAlign);
   ctx.textAlign = align === "center" ? "center" : align === "right" ? "right" : "left";
-  const dxLogical = readDxArray(view, offset, dataOff, nChars, viewEnd);
-  const dxDevice = dxLogical ? dxLogical.map((v) => advanceScale !== null ? v * advanceScale : gmw(rCtx, v)) : null;
+  const pdy = (view.getUint32(dataOff + 44, true) & ETO_PDY) !== 0;
+  const dxRaw = readDxArray(view, offset, dataOff, pdy ? nChars * 2 : nChars, viewEnd);
+  const dxLogical = dxRaw && pdy ? dxRaw.filter((_, i) => i % 2 === 0) : dxRaw;
+  let dxDevice = dxLogical ? dxLogical.map((v) => advanceScale !== null ? v * advanceScale : gmw(rCtx, v)) : null;
+  if (!dxDevice && state.textJustification && !pdy) {
+    const units = text.split("");
+    const natural = units.map((ch) => ctx.measureText(ch).width);
+    const scale = advanceScale ?? gmw(rCtx, 1);
+    dxDevice = applyTextJustification(natural, units.map((ch) => ch.charCodeAt(0)), state.textJustification.extra * scale, state.textJustification.count);
+  }
   if (dxDevice) {
     ctx.textAlign = "left";
   }
@@ -21651,10 +21784,118 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
   }
   return true;
 }
+function drawTextCall(rCtx, x, y, codes, options, rect, dx) {
+  const n = codes.length;
+  const offString = 76;
+  const offDx = offString + n * 2 + 3 & -4;
+  const dxCount = dx ? dx.length : 0;
+  const size = offDx + dxCount * 4;
+  const view = new DataView(new ArrayBuffer(size));
+  view.setUint32(44, n, true);
+  view.setUint32(48, offString, true);
+  view.setUint32(52, options, true);
+  view.setInt32(36, x, true);
+  view.setInt32(40, y, true);
+  view.setInt32(56, rect[0], true);
+  view.setInt32(60, rect[1], true);
+  view.setInt32(64, rect[2], true);
+  view.setInt32(68, rect[3], true);
+  view.setUint32(72, dx ? offDx : 0, true);
+  for (let i = 0; i < n; i++) view.setUint16(offString + i * 2, codes[i], true);
+  if (dx) for (let i = 0; i < dxCount; i++) view.setInt32(offDx + i * 4, dx[i], true);
+  const child = { ...rCtx, view };
+  handleExtTextOutW(child, 0, 8, size);
+}
+function readAnsiRecord(view, start, count, charSet) {
+  return decodeAnsiRecord(Array.from({ length: count }, (_, i) => view.getUint8(start + i)), charSet);
+}
+function collapseAnsiDx(dx, byteLengths, pdy) {
+  if (!dx) return null;
+  const result = [];
+  let at = 0;
+  for (const bytes of byteLengths) {
+    let x = 0, y = 0;
+    for (let i = 0; i < bytes; i++) {
+      x += dx[at + i * (pdy ? 2 : 1)] ?? 0;
+      if (pdy) y += dx[at + i * 2 + 1] ?? 0;
+    }
+    result.push(x);
+    if (pdy) result.push(y);
+    at += bytes * (pdy ? 2 : 1);
+  }
+  return result;
+}
+function handlePolyText(rCtx, offset, dataOff, recSize, wide) {
+  const { view, state } = rCtx;
+  const end = Math.min(view.byteLength, offset + recSize);
+  if (recSize < 40) return true;
+  const count = view.getUint32(dataOff + 28, true);
+  const arrayStart = dataOff + 32;
+  if (count > Math.floor((end - arrayStart) / 40)) return true;
+  const charSet = state.fontDetails?.charSet ?? 1;
+  for (let i = 0; i < count; i++) {
+    const e = arrayStart + i * 40;
+    const x = view.getInt32(e, true), y = view.getInt32(e + 4, true);
+    const n = view.getUint32(e + 8, true), offString = view.getUint32(e + 12, true);
+    const options = view.getUint32(e + 16, true);
+    const rect = [view.getInt32(e + 20, true), view.getInt32(e + 24, true), view.getInt32(e + 28, true), view.getInt32(e + 32, true)];
+    const offDx = view.getUint32(e + 36, true);
+    const unit = wide ? 2 : 1;
+    if (!offString || offString > end - offset || n > Math.floor((end - (offset + offString)) / unit)) continue;
+    const ansi = wide ? null : readAnsiRecord(view, offset + offString, n, charSet);
+    const codes = wide ? Array.from({ length: n }, (_, j) => view.getUint16(offset + offString + j * 2, true)) : ansi.codes;
+    let dx = null;
+    const pdy = (options & ETO_PDY) !== 0;
+    const dxCount = n * (pdy ? 2 : 1);
+    if (offDx && offDx <= end - offset && dxCount <= Math.floor((end - (offset + offDx)) / 4)) {
+      dx = Array.from({ length: dxCount }, (_, j) => view.getInt32(offset + offDx + j * 4, true));
+      if (!wide) dx = collapseAnsiDx(dx, ansi.byteLengths, pdy);
+    }
+    drawTextCall(rCtx, x, y, codes, options, rect, dx);
+  }
+  return true;
+}
+function handleSmallTextOut(rCtx, offset, dataOff, recSize) {
+  const { view } = rCtx;
+  const end = Math.min(view.byteLength, offset + recSize);
+  if (recSize < 36) return true;
+  const x = view.getInt32(dataOff, true), y = view.getInt32(dataOff + 4, true);
+  const n = view.getUint32(dataOff + 8, true), options = view.getUint32(dataOff + 12, true);
+  const small = (options & 512) !== 0, noRect = (options & 256) !== 0;
+  const base = dataOff + 28 + (noRect ? 0 : 16);
+  if (base > end || n > Math.floor((end - base) / (small ? 1 : 2))) return true;
+  const rect = noRect ? [0, 0, 0, 0] : [view.getInt32(dataOff + 28, true), view.getInt32(dataOff + 32, true), view.getInt32(dataOff + 36, true), view.getInt32(dataOff + 40, true)];
+  const codes = small ? Array.from({ length: n }, (_, i) => view.getUint8(base + i)) : Array.from({ length: n }, (_, i) => view.getUint16(base + i * 2, true));
+  drawTextCall(rCtx, x, y, codes, options, rect, null);
+  return true;
+}
 function handleEmfGdiDrawTextRecord(rCtx, recType, offset, dataOff, recSize) {
   if (recType === EMR_EXTTEXTOUTW) {
     return handleExtTextOutW(rCtx, offset, dataOff, recSize);
   }
+  if (recType === EMR_EXTTEXTOUTA || recType === EMR_POLYTEXTOUTA || recType === EMR_POLYTEXTOUTW || recType === EMR_SMALLTEXTOUT) {
+    if (recType === EMR_POLYTEXTOUTA || recType === EMR_POLYTEXTOUTW) return handlePolyText(rCtx, offset, dataOff, recSize, recType === EMR_POLYTEXTOUTW);
+    if (recType === EMR_SMALLTEXTOUT) return handleSmallTextOut(rCtx, offset, dataOff, recSize);
+    const { view, state } = rCtx;
+    const end = Math.min(view.byteLength, offset + recSize);
+    if (recSize < 76) return true;
+    const x = view.getInt32(dataOff + 28, true), y = view.getInt32(dataOff + 32, true);
+    const n = view.getUint32(dataOff + 36, true), strOff = view.getUint32(dataOff + 40, true), options = view.getUint32(dataOff + 44, true);
+    if (!strOff || strOff > end - offset) return true;
+    if (n > end - (offset + strOff)) return true;
+    const ansi = readAnsiRecord(view, offset + strOff, n, state.fontDetails?.charSet ?? 1);
+    const rect = [view.getInt32(dataOff + 48, true), view.getInt32(dataOff + 52, true), view.getInt32(dataOff + 56, true), view.getInt32(dataOff + 60, true)];
+    const offDx = view.getUint32(dataOff + 64, true);
+    let dx = null;
+    const pdy = (options & ETO_PDY) !== 0;
+    const dxCount = n * (pdy ? 2 : 1);
+    if (offDx && offDx <= end - offset && dxCount <= Math.floor((end - (offset + offDx)) / 4)) {
+      dx = Array.from({ length: dxCount }, (_, i) => view.getInt32(offset + offDx + i * 4, true));
+      dx = collapseAnsiDx(dx, ansi.byteLengths, pdy);
+    }
+    drawTextCall(rCtx, x, y, ansi.codes, options, rect, dx);
+    return true;
+  }
   return false;
 }
 
@@ -23667,7 +23908,7 @@ function penDashArray(pen) {
   return pattern.map((v) => v * w);
 }
 function applyPlusPenStyle(ctx, pen, widthScale = 1) {
-  ctx.lineWidth = pen.width * widthScale;
+  ctx.lineWidth = (pen.width || 1) * widthScale;
   const dashes = penDashArray(pen);
   ctx.lineCap = canvasLineCap(dashes.length > 0 ? pen.dashCap ?? 0 : pen.startCap ?? pen.endCap);
   ctx.lineJoin = canvasLineJoin(pen.lineJoin);
@@ -23679,6 +23920,7 @@ function applyPlusPenStyle(ctx, pen, widthScale = 1) {
 }
 function strokePlusGeometry(rCtx, pen, buildPath, points, closedFigure = false) {
   const { ctx } = rCtx;
+  pen = applySimilarityPenTransform(pen);
   const inset = !!pen && pen.alignment === 1 && closedFigure;
   const widthScale = inset ? 2 : 1;
   const stroke = (c) => {
@@ -23740,6 +23982,22 @@ function strokePlusGeometry(rCtx, pen, buildPath, points, closedFigure = false)
   applyPlusWorldTransform(rCtx);
   stroke(ctx);
 }
+function applySimilarityPenTransform(pen) {
+  if (!pen?.transform) {
+    return pen;
+  }
+  if (isIdentity2(pen.transform)) {
+    return { ...pen, transform: null };
+  }
+  const [a, b, c, d] = pen.transform;
+  const sx = Math.hypot(a, b);
+  const sy = Math.hypot(c, d);
+  const dot = a * c + b * d;
+  if (!Number.isFinite(sx + sy + dot) || !(sx > 0) || Math.abs(sx - sy) > 1e-6 * sx || Math.abs(dot) > 1e-6 * sx * sy) {
+    return pen;
+  }
+  return { ...pen, width: pen.width === 0 ? 1 : pen.width * sx, transform: null };
+}
 function strokeGdiplus(rCtx, pen, sampler, buildPath, device, size, mode, closedFigure) {
   if (pen.transform && !isIdentity2(pen.transform)) {
     return false;
@@ -24153,6 +24411,7 @@ function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, paint, ali
       dx,
       dy: null,
       textAlign: 24,
+      options: 0,
       matrix: null});
     if (!cov) {
       return true;
@@ -26867,46 +27126,6 @@ function penIsNull(p) {
 }
 
 // src/wmf-text.ts
-var CP1252_HIGH2 = [
-  8364,
-  129,
-  8218,
-  402,
-  8222,
-  8230,
-  8224,
-  8225,
-  710,
-  8240,
-  352,
-  8249,
-  338,
-  141,
-  381,
-  143,
-  144,
-  8216,
-  8217,
-  8220,
-  8221,
-  8226,
-  8211,
-  8212,
-  732,
-  8482,
-  353,
-  8250,
-  339,
-  157,
-  382,
-  376
-];
-function ansiToCode(b, charSet) {
-  if (charSet === 2) {
-    return b;
-  }
-  return b >= 128 && b <= 159 ? CP1252_HIGH2[b - 128] : b;
-}
 function fontAdvances(p, codes) {
   const fonts = p.rCtx.fonts;
   if (!fonts) {

package/dist/index.mjs

@@ -491,6 +491,23 @@ function totalGlyphAdvance(dx) {
   }
   return sum;
 }
+function applyTextJustification(advances, characters, extra, count) {
+  const result = advances.slice();
+  if (extra === 0 || count <= 0) {
+    return result;
+  }
+  let seen = 0;
+  for (let i = 0; i < result.length && i < characters.length; i++) {
+    if (characters[i] !== 32) {
+      continue;
+    }
+    const before = Math.round(seen * extra / count);
+    seen++;
+    const after = Math.round(seen * extra / count);
+    result[i] += after - before;
+  }
+  return result;
+}
 function alignmentStartOffset(totalWidth, align) {
   if (align === "center") {
     return -totalWidth / 2;
@@ -627,8 +644,11 @@ var EMR_PAINTRGN = 74;
 var EMR_MASKBLT = 78;
 var EMR_PLGBLT = 79;
 var EMR_SETDIBITSTODEVICE = 80;
+var EMR_EXTTEXTOUTA = 83;
 var EMR_POLYPOLYLINE16 = 90;
 var EMR_POLYDRAW16 = 92;
+var EMR_POLYTEXTOUTA = 96;
+var EMR_POLYTEXTOUTW = 97;
 var EMR_CREATECOLORSPACE = 99;
 var EMR_SETCOLORSPACE = 100;
 var EMR_DELETECOLORSPACE = 101;
@@ -637,6 +657,7 @@ var EMR_GLSBOUNDEDRECORD = 103;
 var EMR_PIXELFORMAT = 104;
 var EMR_DRAWESCAPE = 105;
 var EMR_EXTESCAPE = 106;
+var EMR_SMALLTEXTOUT = 108;
 var EMR_FORCEUFIMAPPING = 109;
 var EMR_NAMEDESCAPE = 110;
 var EMR_COLORCORRECTPALETTE = 111;
@@ -13100,7 +13121,7 @@ function parseEmfPlusPenObject(view, dataOff, recDataSize, textureCache, cacheKe
     o += 4;
     return v;
   };
-  const pen = { kind: "plus-pen", color: "rgba(0,0,0,1)", width: penWidth || 1, dashStyle: 0 };
+  const pen = { kind: "plus-pen", color: "rgba(0,0,0,1)", width: penWidth, dashStyle: 0 };
   if (penFlags & PEN_TRANSFORM) {
     if (o + 24 <= end) {
       pen.transform = [0, 4, 8, 12, 16, 20].map((k) => view.getFloat32(o + k, true));
@@ -14936,19 +14957,7 @@ var SvgContext = class {
     }
   }
   // ---- text ---------------------------------------------------------------
-  measurer() {
-    if (this.measureCtx === void 0) {
-      const temp = createTempCanvas(1, 1);
-      this.measureCtx = temp && !isSoftwareRaster(temp.canvas) ? temp.ctx : null;
-    }
-    return this.measureCtx;
-  }
   measureText(text) {
-    const real = this.shadow ?? this.measurer();
-    if (real) {
-      real.font = this.state.font;
-      return real.measureText(text);
-    }
     const size = parseFont(this.state.font).size;
     return { width: estimateTextWidth(text, size) };
   }
@@ -20953,10 +20962,109 @@ function handleEmfGdiBlendBlitRecord(rCtx, recType, offset, dataOff, recSize) {
   }
 }
 
+// src/emf-ansi.ts
+var CP1252_HIGH2 = [
+  8364,
+  129,
+  8218,
+  402,
+  8222,
+  8230,
+  8224,
+  8225,
+  710,
+  8240,
+  352,
+  8249,
+  338,
+  141,
+  381,
+  143,
+  144,
+  8216,
+  8217,
+  8220,
+  8221,
+  8226,
+  8211,
+  8212,
+  732,
+  8482,
+  353,
+  8250,
+  339,
+  157,
+  382,
+  376
+];
+function ansiToCode(b, charSet) {
+  return charSet === 2 ? b : b >= 128 && b <= 159 ? CP1252_HIGH2[b - 128] : b;
+}
+var CHARSET_ENCODING = {
+  0: "windows-1252",
+  1: "windows-1252",
+  128: "shift_jis",
+  129: "euc-kr",
+  130: "johab",
+  134: "gbk",
+  136: "big5",
+  161: "windows-1253",
+  162: "windows-1254",
+  163: "windows-1258",
+  177: "windows-1255",
+  178: "windows-1256",
+  186: "windows-1257",
+  204: "windows-1251",
+  222: "windows-874",
+  238: "windows-1250",
+  255: "ibm437"
+};
+function decodeAnsiRecord(bytes, charSet) {
+  if (charSet === 2) {
+    return { codes: [...bytes], byteLengths: bytes.map(() => 1) };
+  }
+  const label = CHARSET_ENCODING[charSet] ?? "windows-1252";
+  try {
+    const decoder = new TextDecoder(label, { fatal: true });
+    const replacementDecoder = new TextDecoder(label);
+    const source = new Uint8Array(bytes);
+    const codes = [];
+    const byteLengths = [];
+    let i = 0;
+    while (i < bytes.length) {
+      let decoded = null;
+      let consumed = 1;
+      for (let n = 1; n <= Math.min(4, bytes.length - i); n++) {
+        try {
+          const candidate = decoder.decode(source.subarray(i, i + n));
+          if (candidate.length > 0) {
+            decoded = candidate;
+            consumed = n;
+            break;
+          }
+        } catch {
+        }
+      }
+      if (decoded === null) {
+        decoded = replacementDecoder.decode(source.subarray(i, i + 1));
+      }
+      for (let j = 0; j < decoded.length; j++) {
+        codes.push(decoded.charCodeAt(j));
+        byteLengths.push(j === decoded.length - 1 ? consumed : 0);
+      }
+      i += consumed;
+    }
+    return { codes, byteLengths };
+  } catch {
+    return { codes: bytes.map((b) => ansiToCode(b, charSet)), byteLengths: bytes.map(() => 1) };
+  }
+}
+
 // src/gdi-text-render.ts
 var ETO_OPAQUE = 2;
 var ETO_CLIPPED = 4;
 var ETO_GLYPH_INDEX = 16;
+var ETO_IGNORELANGUAGE = 4096;
 var ETO_PDY = 8192;
 var GRAY_INV_GAMMA = 0.43;
 var GRAY_BLACK_ON_WHITE = [255, 255, 240, 233, 225, 217, 208, 199, 189, 178, 167, 154, 140, 124, 104, 77, 0];
@@ -21037,15 +21145,24 @@ function fillDeviceQuad(ctx, pts, color, clip) {
   ctx.fill();
   ctx.restore();
 }
+function isC1Control(code) {
+  return code >= 128 && code <= 159;
+}
+function suppressC1Glyph(run, index) {
+  return !run.glyphIndices && !(run.options & ETO_IGNORELANGUAGE) && isC1Control(run.codes[index]);
+}
 function layoutGdiRun(font, run) {
   const n = run.codes.length;
   const glyphs = run.codes.map((c) => run.glyphIndices ? c : font.glyphIndex(c));
-  const adv = [];
+  let adv = [];
   for (let i = 0; i < n; i++) {
     adv.push(
-      run.dx && i < run.dx.length ? run.dx[i] : run.matrix ? font.rotatedAdvance(glyphs[i]) : font.advance(glyphs[i])
+      suppressC1Glyph(run, i) && !run.dx ? 0 : run.dx && i < run.dx.length ? run.dx[i] : run.matrix ? font.rotatedAdvance(glyphs[i]) : font.advance(glyphs[i])
     );
   }
+  if (!run.dx && run.textJustification && !run.glyphIndices) {
+    adv = applyTextJustification(adv, run.codes, run.textJustification.extra, run.textJustification.count);
+  }
   const advY = [];
   for (let i = 0; i < n; i++) {
     advY.push(run.dy && i < run.dy.length ? run.dy[i] : 0);
@@ -21088,9 +21205,11 @@ function layoutGdiRun(font, run) {
     const subX = font.gridFit ? 0 : Math.round((origin.x - ox) * 64);
     const oy = Math.round(origin.y);
     origins.push({ x: ox + subX / 64, y: oy, along, down });
-    const g = font.glyph(glyphs[i], gm, subX);
-    if (g.bitmap) {
-      placed.push({ x: ox + g.bitmap.left, y: oy - g.bitmap.top, bitmap: g.bitmap });
+    if (!suppressC1Glyph(run, i)) {
+      const g = font.glyph(glyphs[i], gm, subX);
+      if (g.bitmap) {
+        placed.push({ x: ox + g.bitmap.left, y: oy - g.bitmap.top, bitmap: g.bitmap });
+      }
     }
     along += adv[i];
     down += advY[i];
@@ -21175,21 +21294,25 @@ function paintGdiTextRun(ctx, font, run, fontFamilyMap) {
 }
 function emitSvgRun(ctx, font, run, glyphs, origins, fontFamilyMap) {
   let text = "";
+  const visibleOrigins = [];
   for (let i = 0; i < origins.length; i++) {
     const code = run.glyphIndices ? font.charForGlyph(glyphs[i]) : run.codes[i];
+    if (!run.glyphIndices && !(run.options & ETO_IGNORELANGUAGE) && isC1Control(code)) continue;
     text += String.fromCharCode(code);
+    visibleOrigins.push(origins[i]);
   }
+  if (text.length === 0) return;
   const m = run.matrix;
   const ttf = font.ttf;
   const bold = font.syntheticBold || ttf.weightClass >= 600;
   const italic = font.syntheticItalic || (ttf.fsSelection & 1) !== 0 || (ttf.macStyle & 2) !== 0;
-  const first = origins[0];
+  const first = visibleOrigins[0];
   ctx.fillGlyphRun({
     text,
     // Upright runs: device positions. Rotated runs: offsets along/across
     // the baseline from the first glyph, under the frame matrix.
-    xs: origins.map((o) => m ? o.along - first.along : o.x),
-    ys: origins.map((o) => m ? o.down - first.down : o.y),
+    xs: visibleOrigins.map((o) => m ? o.along - first.along : o.x),
+    ys: visibleOrigins.map((o) => m ? o.down - first.down : o.y),
     matrix: m ? [m[0], m[1], m[2], m[3], first.x, first.y] : null,
     scaleX: font.ppemX !== font.ppem ? font.ppemX / font.ppem : 1,
     fontFamily: mapFontFamily(ttf.family, fontFamilyMap),
@@ -21360,6 +21483,7 @@ function drawGdiTextCall(ctx, fonts, state, call) {
     y: ref.y,
     dx: call.dx ? call.dx.map((v) => v * advanceScale) : null,
     dy: call.dy ? call.dy.map((v) => -v * fontScale) : null,
+    textJustification: call.textJustification ? { ...call.textJustification, extra: call.textJustification.extra * advanceScale } : void 0,
     textAlign: state.textAlign,
     textColor: state.textColor,
     bkColor: state.bkColor,
@@ -21496,11 +21620,11 @@ function readDxArray(view, offset, dataOff, nChars, viewEnd) {
   }
   const dx = [];
   for (let i = 0; i < nChars; i++) {
-    dx.push(view.getUint32(start + i * 4, true));
+    dx.push(view.getInt32(start + i * 4, true));
   }
   return dx;
 }
-function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString) {
+function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString, viewEnd) {
   const { ctx, view, state } = rCtx;
   const fonts = rCtx.fonts;
   if (!fonts) {
@@ -21512,7 +21636,7 @@ function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString) {
     codes.push(view.getUint16(offset + offString + i * 2, true));
   }
   const pdy = (options & ETO_PDY) !== 0;
-  const raw = readDxArray(view, offset, dataOff, pdy ? nChars * 2 : nChars, view.byteLength);
+  const raw = readDxArray(view, offset, dataOff, pdy ? nChars * 2 : nChars, viewEnd);
   let dx = raw;
   let dy = null;
   if (raw && pdy) {
@@ -21537,7 +21661,8 @@ function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString) {
     },
     dx,
     dy,
-    matrix: gdiDeviceMatrix(rCtx)
+    matrix: gdiDeviceMatrix(rCtx),
+    textJustification: state.textJustification
   });
   if (!adv) {
     return false;
@@ -21549,12 +21674,12 @@ function drawWithFontEngine(rCtx, offset, dataOff, nChars, offString) {
   return true;
 }
 function horizontalAlign(textAlign) {
+  if ((textAlign & 6) === 6) {
+    return "center";
+  }
   if (textAlign & 2) {
     return "right";
   }
-  if (textAlign & 6) {
-    return "center";
-  }
   return "left";
 }
 function verticalBaseline(textAlign) {
@@ -21596,11 +21721,11 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
   const refY = view.getInt32(dataOff + 32, true);
   const nChars = view.getUint32(dataOff + 36, true);
   const offString = view.getUint32(dataOff + 40, true);
-  const viewEnd = view.byteLength;
-  if (nChars === 0 || offString === 0 || offset + offString + nChars * 2 > viewEnd) {
+  const viewEnd = Math.min(view.byteLength, offset + recSize);
+  if (nChars === 0 || offString === 0 || nChars > Math.floor((viewEnd - offset - offString) / 2)) {
     return true;
   }
-  if (drawWithFontEngine(rCtx, offset, dataOff, nChars, offString)) {
+  if (drawWithFontEngine(rCtx, offset, dataOff, nChars, offString, viewEnd)) {
     return true;
   }
   const text = readUtf16LE(view, offset + offString, nChars);
@@ -21615,8 +21740,16 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
   const align = horizontalAlign(state.textAlign);
   ctx.textBaseline = verticalBaseline(state.textAlign);
   ctx.textAlign = align === "center" ? "center" : align === "right" ? "right" : "left";
-  const dxLogical = readDxArray(view, offset, dataOff, nChars, viewEnd);
-  const dxDevice = dxLogical ? dxLogical.map((v) => advanceScale !== null ? v * advanceScale : gmw(rCtx, v)) : null;
+  const pdy = (view.getUint32(dataOff + 44, true) & ETO_PDY) !== 0;
+  const dxRaw = readDxArray(view, offset, dataOff, pdy ? nChars * 2 : nChars, viewEnd);
+  const dxLogical = dxRaw && pdy ? dxRaw.filter((_, i) => i % 2 === 0) : dxRaw;
+  let dxDevice = dxLogical ? dxLogical.map((v) => advanceScale !== null ? v * advanceScale : gmw(rCtx, v)) : null;
+  if (!dxDevice && state.textJustification && !pdy) {
+    const units = text.split("");
+    const natural = units.map((ch) => ctx.measureText(ch).width);
+    const scale = advanceScale ?? gmw(rCtx, 1);
+    dxDevice = applyTextJustification(natural, units.map((ch) => ch.charCodeAt(0)), state.textJustification.extra * scale, state.textJustification.count);
+  }
   if (dxDevice) {
     ctx.textAlign = "left";
   }
@@ -21649,10 +21782,118 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
   }
   return true;
 }
+function drawTextCall(rCtx, x, y, codes, options, rect, dx) {
+  const n = codes.length;
+  const offString = 76;
+  const offDx = offString + n * 2 + 3 & -4;
+  const dxCount = dx ? dx.length : 0;
+  const size = offDx + dxCount * 4;
+  const view = new DataView(new ArrayBuffer(size));
+  view.setUint32(44, n, true);
+  view.setUint32(48, offString, true);
+  view.setUint32(52, options, true);
+  view.setInt32(36, x, true);
+  view.setInt32(40, y, true);
+  view.setInt32(56, rect[0], true);
+  view.setInt32(60, rect[1], true);
+  view.setInt32(64, rect[2], true);
+  view.setInt32(68, rect[3], true);
+  view.setUint32(72, dx ? offDx : 0, true);
+  for (let i = 0; i < n; i++) view.setUint16(offString + i * 2, codes[i], true);
+  if (dx) for (let i = 0; i < dxCount; i++) view.setInt32(offDx + i * 4, dx[i], true);
+  const child = { ...rCtx, view };
+  handleExtTextOutW(child, 0, 8, size);
+}
+function readAnsiRecord(view, start, count, charSet) {
+  return decodeAnsiRecord(Array.from({ length: count }, (_, i) => view.getUint8(start + i)), charSet);
+}
+function collapseAnsiDx(dx, byteLengths, pdy) {
+  if (!dx) return null;
+  const result = [];
+  let at = 0;
+  for (const bytes of byteLengths) {
+    let x = 0, y = 0;
+    for (let i = 0; i < bytes; i++) {
+      x += dx[at + i * (pdy ? 2 : 1)] ?? 0;
+      if (pdy) y += dx[at + i * 2 + 1] ?? 0;
+    }
+    result.push(x);
+    if (pdy) result.push(y);
+    at += bytes * (pdy ? 2 : 1);
+  }
+  return result;
+}
+function handlePolyText(rCtx, offset, dataOff, recSize, wide) {
+  const { view, state } = rCtx;
+  const end = Math.min(view.byteLength, offset + recSize);
+  if (recSize < 40) return true;
+  const count = view.getUint32(dataOff + 28, true);
+  const arrayStart = dataOff + 32;
+  if (count > Math.floor((end - arrayStart) / 40)) return true;
+  const charSet = state.fontDetails?.charSet ?? 1;
+  for (let i = 0; i < count; i++) {
+    const e = arrayStart + i * 40;
+    const x = view.getInt32(e, true), y = view.getInt32(e + 4, true);
+    const n = view.getUint32(e + 8, true), offString = view.getUint32(e + 12, true);
+    const options = view.getUint32(e + 16, true);
+    const rect = [view.getInt32(e + 20, true), view.getInt32(e + 24, true), view.getInt32(e + 28, true), view.getInt32(e + 32, true)];
+    const offDx = view.getUint32(e + 36, true);
+    const unit = wide ? 2 : 1;
+    if (!offString || offString > end - offset || n > Math.floor((end - (offset + offString)) / unit)) continue;
+    const ansi = wide ? null : readAnsiRecord(view, offset + offString, n, charSet);
+    const codes = wide ? Array.from({ length: n }, (_, j) => view.getUint16(offset + offString + j * 2, true)) : ansi.codes;
+    let dx = null;
+    const pdy = (options & ETO_PDY) !== 0;
+    const dxCount = n * (pdy ? 2 : 1);
+    if (offDx && offDx <= end - offset && dxCount <= Math.floor((end - (offset + offDx)) / 4)) {
+      dx = Array.from({ length: dxCount }, (_, j) => view.getInt32(offset + offDx + j * 4, true));
+      if (!wide) dx = collapseAnsiDx(dx, ansi.byteLengths, pdy);
+    }
+    drawTextCall(rCtx, x, y, codes, options, rect, dx);
+  }
+  return true;
+}
+function handleSmallTextOut(rCtx, offset, dataOff, recSize) {
+  const { view } = rCtx;
+  const end = Math.min(view.byteLength, offset + recSize);
+  if (recSize < 36) return true;
+  const x = view.getInt32(dataOff, true), y = view.getInt32(dataOff + 4, true);
+  const n = view.getUint32(dataOff + 8, true), options = view.getUint32(dataOff + 12, true);
+  const small = (options & 512) !== 0, noRect = (options & 256) !== 0;
+  const base = dataOff + 28 + (noRect ? 0 : 16);
+  if (base > end || n > Math.floor((end - base) / (small ? 1 : 2))) return true;
+  const rect = noRect ? [0, 0, 0, 0] : [view.getInt32(dataOff + 28, true), view.getInt32(dataOff + 32, true), view.getInt32(dataOff + 36, true), view.getInt32(dataOff + 40, true)];
+  const codes = small ? Array.from({ length: n }, (_, i) => view.getUint8(base + i)) : Array.from({ length: n }, (_, i) => view.getUint16(base + i * 2, true));
+  drawTextCall(rCtx, x, y, codes, options, rect, null);
+  return true;
+}
 function handleEmfGdiDrawTextRecord(rCtx, recType, offset, dataOff, recSize) {
   if (recType === EMR_EXTTEXTOUTW) {
     return handleExtTextOutW(rCtx, offset, dataOff, recSize);
   }
+  if (recType === EMR_EXTTEXTOUTA || recType === EMR_POLYTEXTOUTA || recType === EMR_POLYTEXTOUTW || recType === EMR_SMALLTEXTOUT) {
+    if (recType === EMR_POLYTEXTOUTA || recType === EMR_POLYTEXTOUTW) return handlePolyText(rCtx, offset, dataOff, recSize, recType === EMR_POLYTEXTOUTW);
+    if (recType === EMR_SMALLTEXTOUT) return handleSmallTextOut(rCtx, offset, dataOff, recSize);
+    const { view, state } = rCtx;
+    const end = Math.min(view.byteLength, offset + recSize);
+    if (recSize < 76) return true;
+    const x = view.getInt32(dataOff + 28, true), y = view.getInt32(dataOff + 32, true);
+    const n = view.getUint32(dataOff + 36, true), strOff = view.getUint32(dataOff + 40, true), options = view.getUint32(dataOff + 44, true);
+    if (!strOff || strOff > end - offset) return true;
+    if (n > end - (offset + strOff)) return true;
+    const ansi = readAnsiRecord(view, offset + strOff, n, state.fontDetails?.charSet ?? 1);
+    const rect = [view.getInt32(dataOff + 48, true), view.getInt32(dataOff + 52, true), view.getInt32(dataOff + 56, true), view.getInt32(dataOff + 60, true)];
+    const offDx = view.getUint32(dataOff + 64, true);
+    let dx = null;
+    const pdy = (options & ETO_PDY) !== 0;
+    const dxCount = n * (pdy ? 2 : 1);
+    if (offDx && offDx <= end - offset && dxCount <= Math.floor((end - (offset + offDx)) / 4)) {
+      dx = Array.from({ length: dxCount }, (_, i) => view.getInt32(offset + offDx + i * 4, true));
+      dx = collapseAnsiDx(dx, ansi.byteLengths, pdy);
+    }
+    drawTextCall(rCtx, x, y, ansi.codes, options, rect, dx);
+    return true;
+  }
   return false;
 }
 
@@ -23665,7 +23906,7 @@ function penDashArray(pen) {
   return pattern.map((v) => v * w);
 }
 function applyPlusPenStyle(ctx, pen, widthScale = 1) {
-  ctx.lineWidth = pen.width * widthScale;
+  ctx.lineWidth = (pen.width || 1) * widthScale;
   const dashes = penDashArray(pen);
   ctx.lineCap = canvasLineCap(dashes.length > 0 ? pen.dashCap ?? 0 : pen.startCap ?? pen.endCap);
   ctx.lineJoin = canvasLineJoin(pen.lineJoin);
@@ -23677,6 +23918,7 @@ function applyPlusPenStyle(ctx, pen, widthScale = 1) {
 }
 function strokePlusGeometry(rCtx, pen, buildPath, points, closedFigure = false) {
   const { ctx } = rCtx;
+  pen = applySimilarityPenTransform(pen);
   const inset = !!pen && pen.alignment === 1 && closedFigure;
   const widthScale = inset ? 2 : 1;
   const stroke = (c) => {
@@ -23738,6 +23980,22 @@ function strokePlusGeometry(rCtx, pen, buildPath, points, closedFigure = false)
   applyPlusWorldTransform(rCtx);
   stroke(ctx);
 }
+function applySimilarityPenTransform(pen) {
+  if (!pen?.transform) {
+    return pen;
+  }
+  if (isIdentity2(pen.transform)) {
+    return { ...pen, transform: null };
+  }
+  const [a, b, c, d] = pen.transform;
+  const sx = Math.hypot(a, b);
+  const sy = Math.hypot(c, d);
+  const dot = a * c + b * d;
+  if (!Number.isFinite(sx + sy + dot) || !(sx > 0) || Math.abs(sx - sy) > 1e-6 * sx || Math.abs(dot) > 1e-6 * sx * sy) {
+    return pen;
+  }
+  return { ...pen, width: pen.width === 0 ? 1 : pen.width * sx, transform: null };
+}
 function strokeGdiplus(rCtx, pen, sampler, buildPath, device, size, mode, closedFigure) {
   if (pen.transform && !isIdentity2(pen.transform)) {
     return false;
@@ -24151,6 +24409,7 @@ function drawPlusStringWithEngine(rCtx, font, text, layoutX, layoutY, paint, ali
       dx,
       dy: null,
       textAlign: 24,
+      options: 0,
       matrix: null});
     if (!cov) {
       return true;
@@ -26865,46 +27124,6 @@ function penIsNull(p) {
 }
 
 // src/wmf-text.ts
-var CP1252_HIGH2 = [
-  8364,
-  129,
-  8218,
-  402,
-  8222,
-  8230,
-  8224,
-  8225,
-  710,
-  8240,
-  352,
-  8249,
-  338,
-  141,
-  381,
-  143,
-  144,
-  8216,
-  8217,
-  8220,
-  8221,
-  8226,
-  8211,
-  8212,
-  732,
-  8482,
-  353,
-  8250,
-  339,
-  157,
-  382,
-  376
-];
-function ansiToCode(b, charSet) {
-  if (charSet === 2) {
-    return b;
-  }
-  return b >= 128 && b <= 159 ? CP1252_HIGH2[b - 128] : b;
-}
 function fontAdvances(p, codes) {
   const fonts = p.rCtx.fonts;
   if (!fonts) {

package/package.json

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