emf-converter 4.18.1 → 4.18.2

package/README.md

@@ -144,6 +144,11 @@ Without `fonts`, text is drawn by the host's canvas font engine (supply `fontFam
 
 #### `EmfConvertOptions`
 
+`wmfAnsiCodePage` sets the known ANSI code page of a WMF playback device
+(for example, `936` from Windows `GetACP()`). It applies to ANSI/DEFAULT text
+and ANSI font face names. Its default is `1252`; explicit text charsets and
+EMF text are unchanged. See the [API reference](docs/api.md) for supported values.
+
 | Field                | Type                                  | Default           | Description |
 | -------------------- | ------------------------------------- | ----------------- | ----------- |
 | `maxWidth`           | `number`                              | None              | Maximum output width in pixels (aspect ratio preserved) |

package/dist/browser.js

@@ -36223,7 +36223,25 @@ var CHARSET_ENCODING = {
   238: "windows-1250",
   255: "ibm437"
 };
-function decodeAnsiRecord(bytes, charSet) {
+var ANSI_CODE_PAGE_ENCODING = {
+  874: "windows-874",
+  932: "shift_jis",
+  936: "gbk",
+  949: "euc-kr",
+  950: "big5",
+  1250: "windows-1250",
+  1251: "windows-1251",
+  1252: "windows-1252",
+  1253: "windows-1253",
+  1254: "windows-1254",
+  1255: "windows-1255",
+  1256: "windows-1256",
+  1257: "windows-1257",
+  1258: "windows-1258",
+  54936: "gb18030",
+  65001: "utf-8"
+};
+function decodeAnsiRecord(bytes, charSet, ansiCodePage) {
   if (charSet === 2) {
     return { codes: [...bytes], byteLengths: bytes.map(() => 1) };
   }
@@ -36244,10 +36262,13 @@ function decodeAnsiRecord(bytes, charSet) {
     }
     return { codes, byteLengths };
   }
-  const label = CHARSET_ENCODING[charSet] ?? "windows-1252";
+  const label = (charSet === 0 || charSet === 1) && ansiCodePage !== void 0 ? ANSI_CODE_PAGE_ENCODING[ansiCodePage] ?? "windows-1252" : CHARSET_ENCODING[charSet] ?? "windows-1252";
+  if (label === "windows-1252") {
+    return { codes: bytes.map((b) => ansiToCode(b, charSet)), byteLengths: bytes.map(() => 1) };
+  }
   try {
-    const decoder = new TextDecoder(label, { fatal: true });
-    const replacementDecoder = new TextDecoder(label);
+    const decoder = new TextDecoder(label, { fatal: true, ignoreBOM: true });
+    const replacementDecoder = new TextDecoder(label, { ignoreBOM: true });
     const source = new Uint8Array(bytes);
     const codes = [];
     const byteLengths = [];
@@ -41506,14 +41527,15 @@ function createFont(p, dataOff, recSize, recEnd) {
     addObject(p, { kind: "other" });
     return;
   }
-  let family = "";
+  const faceBytes = [];
   for (let i = 0; i < 32 && dataOff + 18 + i < recEnd; i++) {
     const ch = view.getUint8(dataOff + 18 + i);
     if (ch === 0) {
       break;
     }
-    family += String.fromCharCode(ch);
+    faceBytes.push(ch);
   }
+  const family = String.fromCharCode(...decodeAnsiRecord(faceBytes, 1, p.ansiCodePage).codes);
   const font = {
     kind: "font",
     // Sign kept: resolveFontPixelHeight() tells cell from character height by it.
@@ -42540,7 +42562,7 @@ function drawWithFontEngine2(p, call, codes, dx) {
 }
 function playText(p, call) {
   const charSet = p.rCtx.state.fontDetails?.charSet ?? 1;
-  const { codes, byteLengths } = decodeAnsiRecord(call.bytes, charSet);
+  const { codes, byteLengths } = decodeAnsiRecord(call.bytes, charSet, p.ansiCodePage);
   const n = codes.length;
   if (n === 0) {
     return;
@@ -42672,6 +42694,7 @@ function createWmfPlayer(view, ctx, header, canvasW, canvasH, replayOptions = {}
   };
   const p = {
     rCtx,
+    ansiCodePage: replayOptions.wmfAnsiCodePage,
     view,
     kx,
     ky,
@@ -43203,6 +43226,7 @@ async function replayMetafile(buffer, options2, createSurface) {
     surface.ctx.save();
     replayWmfRecords(view, surface.ctx, header, surface.width, surface.height, {
       wmfReferenceDpi: opts.wmfReferenceDpi,
+      wmfAnsiCodePage: opts.wmfAnsiCodePage,
       maxRecords: opts.maxRecords,
       fontFamilyMap: opts.fontFamilyMap,
       gdiAntialias: opts.gdiAntialias,

package/dist/browser.mjs

@@ -36221,7 +36221,25 @@ var CHARSET_ENCODING = {
   238: "windows-1250",
   255: "ibm437"
 };
-function decodeAnsiRecord(bytes, charSet) {
+var ANSI_CODE_PAGE_ENCODING = {
+  874: "windows-874",
+  932: "shift_jis",
+  936: "gbk",
+  949: "euc-kr",
+  950: "big5",
+  1250: "windows-1250",
+  1251: "windows-1251",
+  1252: "windows-1252",
+  1253: "windows-1253",
+  1254: "windows-1254",
+  1255: "windows-1255",
+  1256: "windows-1256",
+  1257: "windows-1257",
+  1258: "windows-1258",
+  54936: "gb18030",
+  65001: "utf-8"
+};
+function decodeAnsiRecord(bytes, charSet, ansiCodePage) {
   if (charSet === 2) {
     return { codes: [...bytes], byteLengths: bytes.map(() => 1) };
   }
@@ -36242,10 +36260,13 @@ function decodeAnsiRecord(bytes, charSet) {
     }
     return { codes, byteLengths };
   }
-  const label = CHARSET_ENCODING[charSet] ?? "windows-1252";
+  const label = (charSet === 0 || charSet === 1) && ansiCodePage !== void 0 ? ANSI_CODE_PAGE_ENCODING[ansiCodePage] ?? "windows-1252" : CHARSET_ENCODING[charSet] ?? "windows-1252";
+  if (label === "windows-1252") {
+    return { codes: bytes.map((b) => ansiToCode(b, charSet)), byteLengths: bytes.map(() => 1) };
+  }
   try {
-    const decoder = new TextDecoder(label, { fatal: true });
-    const replacementDecoder = new TextDecoder(label);
+    const decoder = new TextDecoder(label, { fatal: true, ignoreBOM: true });
+    const replacementDecoder = new TextDecoder(label, { ignoreBOM: true });
     const source = new Uint8Array(bytes);
     const codes = [];
     const byteLengths = [];
@@ -41504,14 +41525,15 @@ function createFont(p, dataOff, recSize, recEnd) {
     addObject(p, { kind: "other" });
     return;
   }
-  let family = "";
+  const faceBytes = [];
   for (let i = 0; i < 32 && dataOff + 18 + i < recEnd; i++) {
     const ch = view.getUint8(dataOff + 18 + i);
     if (ch === 0) {
       break;
     }
-    family += String.fromCharCode(ch);
+    faceBytes.push(ch);
   }
+  const family = String.fromCharCode(...decodeAnsiRecord(faceBytes, 1, p.ansiCodePage).codes);
   const font = {
     kind: "font",
     // Sign kept: resolveFontPixelHeight() tells cell from character height by it.
@@ -42538,7 +42560,7 @@ function drawWithFontEngine2(p, call, codes, dx) {
 }
 function playText(p, call) {
   const charSet = p.rCtx.state.fontDetails?.charSet ?? 1;
-  const { codes, byteLengths } = decodeAnsiRecord(call.bytes, charSet);
+  const { codes, byteLengths } = decodeAnsiRecord(call.bytes, charSet, p.ansiCodePage);
   const n = codes.length;
   if (n === 0) {
     return;
@@ -42670,6 +42692,7 @@ function createWmfPlayer(view, ctx, header, canvasW, canvasH, replayOptions = {}
   };
   const p = {
     rCtx,
+    ansiCodePage: replayOptions.wmfAnsiCodePage,
     view,
     kx,
     ky,
@@ -43201,6 +43224,7 @@ async function replayMetafile(buffer, options2, createSurface) {
     surface.ctx.save();
     replayWmfRecords(view, surface.ctx, header, surface.width, surface.height, {
       wmfReferenceDpi: opts.wmfReferenceDpi,
+      wmfAnsiCodePage: opts.wmfAnsiCodePage,
       maxRecords: opts.maxRecords,
       fontFamilyMap: opts.fontFamilyMap,
       gdiAntialias: opts.gdiAntialias,

package/dist/index.d.mts

@@ -113,6 +113,14 @@ interface EmfConvertOptions {
         x: number;
         y: number;
     };
+    /**
+     * ANSI code page of the WMF playback device. Used for ANSI/DEFAULT
+     * charset text and LOGFONT face names. Defaults to 1252; supply the
+     * original Windows device's GetACP() value when known. Supported values:
+     * 874, 932, 936, 949, 950, 1250..1258, 54936 and 65001. Other values
+     * fall back to 1252. Explicit text charsets and EMF text are unchanged.
+     */
+    wmfAnsiCodePage?: number;
     /** Maximum output width in pixels. */
     maxWidth?: number;
     /** Maximum output height in pixels. */

package/dist/index.d.ts

@@ -113,6 +113,14 @@ interface EmfConvertOptions {
         x: number;
         y: number;
     };
+    /**
+     * ANSI code page of the WMF playback device. Used for ANSI/DEFAULT
+     * charset text and LOGFONT face names. Defaults to 1252; supply the
+     * original Windows device's GetACP() value when known. Supported values:
+     * 874, 932, 936, 949, 950, 1250..1258, 54936 and 65001. Other values
+     * fall back to 1252. Explicit text charsets and EMF text are unchanged.
+     */
+    wmfAnsiCodePage?: number;
     /** Maximum output width in pixels. */
     maxWidth?: number;
     /** Maximum output height in pixels. */

package/dist/index.js

@@ -36224,7 +36224,25 @@ var CHARSET_ENCODING = {
   238: "windows-1250",
   255: "ibm437"
 };
-function decodeAnsiRecord(bytes, charSet) {
+var ANSI_CODE_PAGE_ENCODING = {
+  874: "windows-874",
+  932: "shift_jis",
+  936: "gbk",
+  949: "euc-kr",
+  950: "big5",
+  1250: "windows-1250",
+  1251: "windows-1251",
+  1252: "windows-1252",
+  1253: "windows-1253",
+  1254: "windows-1254",
+  1255: "windows-1255",
+  1256: "windows-1256",
+  1257: "windows-1257",
+  1258: "windows-1258",
+  54936: "gb18030",
+  65001: "utf-8"
+};
+function decodeAnsiRecord(bytes, charSet, ansiCodePage) {
   if (charSet === 2) {
     return { codes: [...bytes], byteLengths: bytes.map(() => 1) };
   }
@@ -36245,10 +36263,13 @@ function decodeAnsiRecord(bytes, charSet) {
     }
     return { codes, byteLengths };
   }
-  const label = CHARSET_ENCODING[charSet] ?? "windows-1252";
+  const label = (charSet === 0 || charSet === 1) && ansiCodePage !== void 0 ? ANSI_CODE_PAGE_ENCODING[ansiCodePage] ?? "windows-1252" : CHARSET_ENCODING[charSet] ?? "windows-1252";
+  if (label === "windows-1252") {
+    return { codes: bytes.map((b) => ansiToCode(b, charSet)), byteLengths: bytes.map(() => 1) };
+  }
   try {
-    const decoder = new TextDecoder(label, { fatal: true });
-    const replacementDecoder = new TextDecoder(label);
+    const decoder = new TextDecoder(label, { fatal: true, ignoreBOM: true });
+    const replacementDecoder = new TextDecoder(label, { ignoreBOM: true });
     const source = new Uint8Array(bytes);
     const codes = [];
     const byteLengths = [];
@@ -41507,14 +41528,15 @@ function createFont(p, dataOff, recSize, recEnd) {
     addObject(p, { kind: "other" });
     return;
   }
-  let family = "";
+  const faceBytes = [];
   for (let i = 0; i < 32 && dataOff + 18 + i < recEnd; i++) {
     const ch = view.getUint8(dataOff + 18 + i);
     if (ch === 0) {
       break;
     }
-    family += String.fromCharCode(ch);
+    faceBytes.push(ch);
   }
+  const family = String.fromCharCode(...decodeAnsiRecord(faceBytes, 1, p.ansiCodePage).codes);
   const font = {
     kind: "font",
     // Sign kept: resolveFontPixelHeight() tells cell from character height by it.
@@ -42541,7 +42563,7 @@ function drawWithFontEngine2(p, call, codes, dx) {
 }
 function playText(p, call) {
   const charSet = p.rCtx.state.fontDetails?.charSet ?? 1;
-  const { codes, byteLengths } = decodeAnsiRecord(call.bytes, charSet);
+  const { codes, byteLengths } = decodeAnsiRecord(call.bytes, charSet, p.ansiCodePage);
   const n = codes.length;
   if (n === 0) {
     return;
@@ -42673,6 +42695,7 @@ function createWmfPlayer(view, ctx, header, canvasW, canvasH, replayOptions = {}
   };
   const p = {
     rCtx,
+    ansiCodePage: replayOptions.wmfAnsiCodePage,
     view,
     kx,
     ky,
@@ -43204,6 +43227,7 @@ async function replayMetafile(buffer, options2, createSurface) {
     surface.ctx.save();
     replayWmfRecords(view, surface.ctx, header, surface.width, surface.height, {
       wmfReferenceDpi: opts.wmfReferenceDpi,
+      wmfAnsiCodePage: opts.wmfAnsiCodePage,
       maxRecords: opts.maxRecords,
       fontFamilyMap: opts.fontFamilyMap,
       gdiAntialias: opts.gdiAntialias,

package/dist/index.mjs

@@ -36222,7 +36222,25 @@ var CHARSET_ENCODING = {
   238: "windows-1250",
   255: "ibm437"
 };
-function decodeAnsiRecord(bytes, charSet) {
+var ANSI_CODE_PAGE_ENCODING = {
+  874: "windows-874",
+  932: "shift_jis",
+  936: "gbk",
+  949: "euc-kr",
+  950: "big5",
+  1250: "windows-1250",
+  1251: "windows-1251",
+  1252: "windows-1252",
+  1253: "windows-1253",
+  1254: "windows-1254",
+  1255: "windows-1255",
+  1256: "windows-1256",
+  1257: "windows-1257",
+  1258: "windows-1258",
+  54936: "gb18030",
+  65001: "utf-8"
+};
+function decodeAnsiRecord(bytes, charSet, ansiCodePage) {
   if (charSet === 2) {
     return { codes: [...bytes], byteLengths: bytes.map(() => 1) };
   }
@@ -36243,10 +36261,13 @@ function decodeAnsiRecord(bytes, charSet) {
     }
     return { codes, byteLengths };
   }
-  const label = CHARSET_ENCODING[charSet] ?? "windows-1252";
+  const label = (charSet === 0 || charSet === 1) && ansiCodePage !== void 0 ? ANSI_CODE_PAGE_ENCODING[ansiCodePage] ?? "windows-1252" : CHARSET_ENCODING[charSet] ?? "windows-1252";
+  if (label === "windows-1252") {
+    return { codes: bytes.map((b) => ansiToCode(b, charSet)), byteLengths: bytes.map(() => 1) };
+  }
   try {
-    const decoder = new TextDecoder(label, { fatal: true });
-    const replacementDecoder = new TextDecoder(label);
+    const decoder = new TextDecoder(label, { fatal: true, ignoreBOM: true });
+    const replacementDecoder = new TextDecoder(label, { ignoreBOM: true });
     const source = new Uint8Array(bytes);
     const codes = [];
     const byteLengths = [];
@@ -41505,14 +41526,15 @@ function createFont(p, dataOff, recSize, recEnd) {
     addObject(p, { kind: "other" });
     return;
   }
-  let family = "";
+  const faceBytes = [];
   for (let i = 0; i < 32 && dataOff + 18 + i < recEnd; i++) {
     const ch = view.getUint8(dataOff + 18 + i);
     if (ch === 0) {
       break;
     }
-    family += String.fromCharCode(ch);
+    faceBytes.push(ch);
   }
+  const family = String.fromCharCode(...decodeAnsiRecord(faceBytes, 1, p.ansiCodePage).codes);
   const font = {
     kind: "font",
     // Sign kept: resolveFontPixelHeight() tells cell from character height by it.
@@ -42539,7 +42561,7 @@ function drawWithFontEngine2(p, call, codes, dx) {
 }
 function playText(p, call) {
   const charSet = p.rCtx.state.fontDetails?.charSet ?? 1;
-  const { codes, byteLengths } = decodeAnsiRecord(call.bytes, charSet);
+  const { codes, byteLengths } = decodeAnsiRecord(call.bytes, charSet, p.ansiCodePage);
   const n = codes.length;
   if (n === 0) {
     return;
@@ -42671,6 +42693,7 @@ function createWmfPlayer(view, ctx, header, canvasW, canvasH, replayOptions = {}
   };
   const p = {
     rCtx,
+    ansiCodePage: replayOptions.wmfAnsiCodePage,
     view,
     kx,
     ky,
@@ -43202,6 +43225,7 @@ async function replayMetafile(buffer, options2, createSurface) {
     surface.ctx.save();
     replayWmfRecords(view, surface.ctx, header, surface.width, surface.height, {
       wmfReferenceDpi: opts.wmfReferenceDpi,
+      wmfAnsiCodePage: opts.wmfAnsiCodePage,
       maxRecords: opts.maxRecords,
       fontFamilyMap: opts.fontFamilyMap,
       gdiAntialias: opts.gdiAntialias,

package/package.json

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