emf-converter 2.0.0 → 2.0.2

package/dist/index.js

@@ -423,19 +423,22 @@ function mapFontFamily(face, map) {
   }
   return resolved;
 }
-function applyFont(ctx, state) {
+function fontSizePx(state, scale = 1) {
+  return Math.max(Math.abs(state.fontHeight) * Math.abs(scale || 1), 8);
+}
+function applyFont(ctx, state, scale = 1) {
   const italic = state.fontItalic ? "italic " : "";
   const weight = cssFontWeight(state.fontWeight);
   const weightPart = weight ? `${weight} ` : "";
-  const size = Math.max(Math.abs(state.fontHeight), 8);
+  const size = fontSizePx(state, scale);
   const family = mapFontFamily(state.fontFamily, state.fontFamilyMap);
   ctx.font = `${italic}${weightPart}${size}px ${family}`;
 }
-function drawTextDecorations(ctx, state, x, y, width) {
+function drawTextDecorations(ctx, state, x, y, width, scale = 1) {
   if (!state.fontUnderline && !state.fontStrikeOut) {
     return;
   }
-  const size = Math.max(Math.abs(state.fontHeight), 8);
+  const size = fontSizePx(state, scale);
   const thickness = Math.max(1, Math.round(size / 14));
   const prevFill = ctx.fillStyle;
   ctx.fillStyle = state.textColor;
@@ -1400,7 +1403,8 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
     if (nChars > 0 && offString > 0 && offset + offString + nChars * 2 <= maxOffset) {
       const text = readUtf16LE(view, offset + offString, nChars);
       if (text.length > 0) {
-        applyFont(ctx, state);
+        const fontScale = Math.abs(gmh(rCtx, 1));
+        applyFont(ctx, state, fontScale);
         ctx.fillStyle = state.textColor;
         const vAlign = state.textAlign & 24;
         const alignBaseline = vAlign === 24 ? "alphabetic" : vAlign === 8 ? "bottom" : "top";
@@ -1415,7 +1419,7 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
         ctx.textAlign = alignHoriz;
         if (state.bkMode === 2) {
           const measured = ctx.measureText(text);
-          const bgH = state.fontHeight || 12;
+          const bgH = fontSizePx(state, fontScale);
           ctx.fillStyle = state.bkColor;
           ctx.fillRect(gmx(rCtx, refX), gmy(rCtx, refY) - bgH, measured.width, bgH);
           ctx.fillStyle = state.textColor;
@@ -1425,7 +1429,7 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
           const w = ctx.measureText(text).width;
           const baseX = gmx(rCtx, refX);
           const startX = alignHoriz === "center" ? baseX - w / 2 : alignHoriz === "right" ? baseX - w : baseX;
-          drawTextDecorations(ctx, state, startX, gmy(rCtx, refY), w);
+          drawTextDecorations(ctx, state, startX, gmy(rCtx, refY), w, fontScale);
         }
       }
     }
@@ -4616,7 +4620,7 @@ function handleWmfDrawRecord(wCtx, recType, offset, dataOff, recSize) {
           if (txOff + 4 <= offset + recSize) {
             const ty2 = view.getInt16(txOff, true);
             const txCoord = view.getInt16(txOff + 2, true);
-            applyFont(ctx, state);
+            applyFont(ctx, state, Math.abs(mh(1)));
             ctx.fillStyle = state.textColor;
             ctx.fillText(text, mx(txCoord), my(ty2));
           }
@@ -4639,7 +4643,7 @@ function handleWmfDrawRecord(wCtx, recType, offset, dataOff, recSize) {
             }
             text += String.fromCharCode(ch);
           }
-          applyFont(ctx, state);
+          applyFont(ctx, state, Math.abs(mh(1)));
           ctx.fillStyle = state.textColor;
           ctx.fillText(text, mx(txCoord), my(ty2));
         }

package/dist/index.mjs

@@ -421,19 +421,22 @@ function mapFontFamily(face, map) {
   }
   return resolved;
 }
-function applyFont(ctx, state) {
+function fontSizePx(state, scale = 1) {
+  return Math.max(Math.abs(state.fontHeight) * Math.abs(scale || 1), 8);
+}
+function applyFont(ctx, state, scale = 1) {
   const italic = state.fontItalic ? "italic " : "";
   const weight = cssFontWeight(state.fontWeight);
   const weightPart = weight ? `${weight} ` : "";
-  const size = Math.max(Math.abs(state.fontHeight), 8);
+  const size = fontSizePx(state, scale);
   const family = mapFontFamily(state.fontFamily, state.fontFamilyMap);
   ctx.font = `${italic}${weightPart}${size}px ${family}`;
 }
-function drawTextDecorations(ctx, state, x, y, width) {
+function drawTextDecorations(ctx, state, x, y, width, scale = 1) {
   if (!state.fontUnderline && !state.fontStrikeOut) {
     return;
   }
-  const size = Math.max(Math.abs(state.fontHeight), 8);
+  const size = fontSizePx(state, scale);
   const thickness = Math.max(1, Math.round(size / 14));
   const prevFill = ctx.fillStyle;
   ctx.fillStyle = state.textColor;
@@ -1398,7 +1401,8 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
     if (nChars > 0 && offString > 0 && offset + offString + nChars * 2 <= maxOffset) {
       const text = readUtf16LE(view, offset + offString, nChars);
       if (text.length > 0) {
-        applyFont(ctx, state);
+        const fontScale = Math.abs(gmh(rCtx, 1));
+        applyFont(ctx, state, fontScale);
         ctx.fillStyle = state.textColor;
         const vAlign = state.textAlign & 24;
         const alignBaseline = vAlign === 24 ? "alphabetic" : vAlign === 8 ? "bottom" : "top";
@@ -1413,7 +1417,7 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
         ctx.textAlign = alignHoriz;
         if (state.bkMode === 2) {
           const measured = ctx.measureText(text);
-          const bgH = state.fontHeight || 12;
+          const bgH = fontSizePx(state, fontScale);
           ctx.fillStyle = state.bkColor;
           ctx.fillRect(gmx(rCtx, refX), gmy(rCtx, refY) - bgH, measured.width, bgH);
           ctx.fillStyle = state.textColor;
@@ -1423,7 +1427,7 @@ function handleExtTextOutW(rCtx, offset, dataOff, recSize) {
           const w = ctx.measureText(text).width;
           const baseX = gmx(rCtx, refX);
           const startX = alignHoriz === "center" ? baseX - w / 2 : alignHoriz === "right" ? baseX - w : baseX;
-          drawTextDecorations(ctx, state, startX, gmy(rCtx, refY), w);
+          drawTextDecorations(ctx, state, startX, gmy(rCtx, refY), w, fontScale);
         }
       }
     }
@@ -4614,7 +4618,7 @@ function handleWmfDrawRecord(wCtx, recType, offset, dataOff, recSize) {
           if (txOff + 4 <= offset + recSize) {
             const ty2 = view.getInt16(txOff, true);
             const txCoord = view.getInt16(txOff + 2, true);
-            applyFont(ctx, state);
+            applyFont(ctx, state, Math.abs(mh(1)));
             ctx.fillStyle = state.textColor;
             ctx.fillText(text, mx(txCoord), my(ty2));
           }
@@ -4637,7 +4641,7 @@ function handleWmfDrawRecord(wCtx, recType, offset, dataOff, recSize) {
             }
             text += String.fromCharCode(ch);
           }
-          applyFont(ctx, state);
+          applyFont(ctx, state, Math.abs(mh(1)));
           ctx.fillStyle = state.textColor;
           ctx.fillText(text, mx(txCoord), my(ty2));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "emf-converter",
-	"version": "2.0.0",
+	"version": "2.0.2",
 	"description": "Convert EMF/WMF metafile binaries to PNG data URLs using Canvas",
 	"keywords": [
 		"canvas",