npm - emf-converter - Versions diffs - 4.8.11 → 4.8.13 - Mend

emf-converter 4.8.11 → 4.8.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/browser.js CHANGED Viewed

@@ -15906,7 +15906,7 @@ function stopColorAt(stops, t) {
   }
   return stops[stops.length - 1].argb;
 }
-function pathGradientColorAt(shape, x, y) {
+function pathGradientColorAt(shape, x, y, focusPoint) {
   const { center, boundary, boundaryArgb } = shape;
   const n = boundary.length;
   const px = x - center.x;
@@ -15955,6 +15955,10 @@ function pathGradientColorAt(shape, x, y) {
         const ey = b.y - a.y;
         const cross = ax * ey - ay * ex;
         if (Math.abs(cross) < 1e-12) continue;
+        if (fx === 0 && fy > 0 && Math.abs((focusPoint?.x ?? x) - center.x) < eps && ex > 0 && Math.max(ax, ax + ex) > 0 && Math.abs(ey) > eps) {
+          const u = (((focusPoint?.y ?? y) - center.y) / fy - ay) / ey;
+          if (u >= -eps && u <= 1 + eps) inFocus = true;
+        }
         if ((fx > 0 || Math.abs(px) < eps) && (fy > 0 || Math.abs(py) < eps)) {
           const x2 = fx > 0 ? px / fx : 0;
           const y2 = fy > 0 ? py / fy : 0;
@@ -27507,7 +27511,7 @@ var RealizedFont = class {
           xs[i] = Math.round(m[0] * x - m[2] * y + subX);
           ys[i] = Math.round(-(m[1] * x - m[3] * y) - subY);
         } else {
-          xs[i] = Math.round(x + subX);
+          xs[i] = this.gdiPlus && this.mode === "cleartype" ? x + subX : Math.round(x + subX);
           ys[i] = y - subY;
         }
       }
@@ -30409,7 +30413,8 @@ function pathGradientSampler(shape, wrap, device) {
           by = foldIntoTile(by, box.y, box.h, mirrorY, lagY);
         }
         if (wrap === "clamp" && by >= box.y + box.h) continue;
-        const c = pathGradientColorAt(shape, bx, by);
+        const focusPoint = bias && shape.focus?.x === 0 ? { x: bx - inv2[0] * bias, y: by - inv2[1] * bias } : void 0;
+        const c = pathGradientColorAt(shape, bx, by, focusPoint);
         if (c === null) {
           continue;
         }
@@ -33788,7 +33793,7 @@ function layoutGdiRun(font, run) {
     const origin = at(along, down);
     const fractionalX = !font.gridFit || font.fractionalOrigins;
     const ox = fractionalX ? Math.floor(origin.x) : Math.round(origin.x);
-    const subX = !fractionalX ? 0 : font.fractionalOrigins === "xy" ? Math.round((origin.x - ox) * 4) * 16 : Math.round((origin.x - ox) * 64);
+    const subX = !fractionalX ? 0 : font.fractionalOrigins === "xy" ? Math.round((origin.x - ox) * 4) * 16 : font.fractionalOrigins === "x" ? Math.round((origin.x - ox) * 6) * (64 / 6) : Math.round((origin.x - ox) * 64);
     const oy = font.fractionalOrigins === "xy" ? Math.floor(origin.y) : Math.round(origin.y);
     const subY = font.fractionalOrigins === "xy" ? Math.round((origin.y - oy) * 4) * 16 : 0;
     origins.push({ x: ox + subX / 64, y: oy + subY / 64, along, down });

package/dist/browser.mjs CHANGED Viewed

@@ -15904,7 +15904,7 @@ function stopColorAt(stops, t) {
   }
   return stops[stops.length - 1].argb;
 }
-function pathGradientColorAt(shape, x, y) {
+function pathGradientColorAt(shape, x, y, focusPoint) {
   const { center, boundary, boundaryArgb } = shape;
   const n = boundary.length;
   const px = x - center.x;
@@ -15953,6 +15953,10 @@ function pathGradientColorAt(shape, x, y) {
         const ey = b.y - a.y;
         const cross = ax * ey - ay * ex;
         if (Math.abs(cross) < 1e-12) continue;
+        if (fx === 0 && fy > 0 && Math.abs((focusPoint?.x ?? x) - center.x) < eps && ex > 0 && Math.max(ax, ax + ex) > 0 && Math.abs(ey) > eps) {
+          const u = (((focusPoint?.y ?? y) - center.y) / fy - ay) / ey;
+          if (u >= -eps && u <= 1 + eps) inFocus = true;
+        }
         if ((fx > 0 || Math.abs(px) < eps) && (fy > 0 || Math.abs(py) < eps)) {
           const x2 = fx > 0 ? px / fx : 0;
           const y2 = fy > 0 ? py / fy : 0;
@@ -27505,7 +27509,7 @@ var RealizedFont = class {
           xs[i] = Math.round(m[0] * x - m[2] * y + subX);
           ys[i] = Math.round(-(m[1] * x - m[3] * y) - subY);
         } else {
-          xs[i] = Math.round(x + subX);
+          xs[i] = this.gdiPlus && this.mode === "cleartype" ? x + subX : Math.round(x + subX);
           ys[i] = y - subY;
         }
       }
@@ -30407,7 +30411,8 @@ function pathGradientSampler(shape, wrap, device) {
           by = foldIntoTile(by, box.y, box.h, mirrorY, lagY);
         }
         if (wrap === "clamp" && by >= box.y + box.h) continue;
-        const c = pathGradientColorAt(shape, bx, by);
+        const focusPoint = bias && shape.focus?.x === 0 ? { x: bx - inv2[0] * bias, y: by - inv2[1] * bias } : void 0;
+        const c = pathGradientColorAt(shape, bx, by, focusPoint);
         if (c === null) {
           continue;
         }
@@ -33786,7 +33791,7 @@ function layoutGdiRun(font, run) {
     const origin = at(along, down);
     const fractionalX = !font.gridFit || font.fractionalOrigins;
     const ox = fractionalX ? Math.floor(origin.x) : Math.round(origin.x);
-    const subX = !fractionalX ? 0 : font.fractionalOrigins === "xy" ? Math.round((origin.x - ox) * 4) * 16 : Math.round((origin.x - ox) * 64);
+    const subX = !fractionalX ? 0 : font.fractionalOrigins === "xy" ? Math.round((origin.x - ox) * 4) * 16 : font.fractionalOrigins === "x" ? Math.round((origin.x - ox) * 6) * (64 / 6) : Math.round((origin.x - ox) * 64);
     const oy = font.fractionalOrigins === "xy" ? Math.floor(origin.y) : Math.round(origin.y);
     const subY = font.fractionalOrigins === "xy" ? Math.round((origin.y - oy) * 4) * 16 : 0;
     origins.push({ x: ox + subX / 64, y: oy + subY / 64, along, down });

package/dist/index.js CHANGED Viewed

@@ -15907,7 +15907,7 @@ function stopColorAt(stops, t) {
   }
   return stops[stops.length - 1].argb;
 }
-function pathGradientColorAt(shape, x, y) {
+function pathGradientColorAt(shape, x, y, focusPoint) {
   const { center, boundary, boundaryArgb } = shape;
   const n = boundary.length;
   const px = x - center.x;
@@ -15956,6 +15956,10 @@ function pathGradientColorAt(shape, x, y) {
         const ey = b.y - a.y;
         const cross = ax * ey - ay * ex;
         if (Math.abs(cross) < 1e-12) continue;
+        if (fx === 0 && fy > 0 && Math.abs((focusPoint?.x ?? x) - center.x) < eps && ex > 0 && Math.max(ax, ax + ex) > 0 && Math.abs(ey) > eps) {
+          const u = (((focusPoint?.y ?? y) - center.y) / fy - ay) / ey;
+          if (u >= -eps && u <= 1 + eps) inFocus = true;
+        }
         if ((fx > 0 || Math.abs(px) < eps) && (fy > 0 || Math.abs(py) < eps)) {
           const x2 = fx > 0 ? px / fx : 0;
           const y2 = fy > 0 ? py / fy : 0;
@@ -27508,7 +27512,7 @@ var RealizedFont = class {
           xs[i] = Math.round(m[0] * x - m[2] * y + subX);
           ys[i] = Math.round(-(m[1] * x - m[3] * y) - subY);
         } else {
-          xs[i] = Math.round(x + subX);
+          xs[i] = this.gdiPlus && this.mode === "cleartype" ? x + subX : Math.round(x + subX);
           ys[i] = y - subY;
         }
       }
@@ -30410,7 +30414,8 @@ function pathGradientSampler(shape, wrap, device) {
           by = foldIntoTile(by, box.y, box.h, mirrorY, lagY);
         }
         if (wrap === "clamp" && by >= box.y + box.h) continue;
-        const c = pathGradientColorAt(shape, bx, by);
+        const focusPoint = bias && shape.focus?.x === 0 ? { x: bx - inv2[0] * bias, y: by - inv2[1] * bias } : void 0;
+        const c = pathGradientColorAt(shape, bx, by, focusPoint);
         if (c === null) {
           continue;
         }
@@ -33789,7 +33794,7 @@ function layoutGdiRun(font, run) {
     const origin = at(along, down);
     const fractionalX = !font.gridFit || font.fractionalOrigins;
     const ox = fractionalX ? Math.floor(origin.x) : Math.round(origin.x);
-    const subX = !fractionalX ? 0 : font.fractionalOrigins === "xy" ? Math.round((origin.x - ox) * 4) * 16 : Math.round((origin.x - ox) * 64);
+    const subX = !fractionalX ? 0 : font.fractionalOrigins === "xy" ? Math.round((origin.x - ox) * 4) * 16 : font.fractionalOrigins === "x" ? Math.round((origin.x - ox) * 6) * (64 / 6) : Math.round((origin.x - ox) * 64);
     const oy = font.fractionalOrigins === "xy" ? Math.floor(origin.y) : Math.round(origin.y);
     const subY = font.fractionalOrigins === "xy" ? Math.round((origin.y - oy) * 4) * 16 : 0;
     origins.push({ x: ox + subX / 64, y: oy + subY / 64, along, down });

package/dist/index.mjs CHANGED Viewed

@@ -15905,7 +15905,7 @@ function stopColorAt(stops, t) {
   }
   return stops[stops.length - 1].argb;
 }
-function pathGradientColorAt(shape, x, y) {
+function pathGradientColorAt(shape, x, y, focusPoint) {
   const { center, boundary, boundaryArgb } = shape;
   const n = boundary.length;
   const px = x - center.x;
@@ -15954,6 +15954,10 @@ function pathGradientColorAt(shape, x, y) {
         const ey = b.y - a.y;
         const cross = ax * ey - ay * ex;
         if (Math.abs(cross) < 1e-12) continue;
+        if (fx === 0 && fy > 0 && Math.abs((focusPoint?.x ?? x) - center.x) < eps && ex > 0 && Math.max(ax, ax + ex) > 0 && Math.abs(ey) > eps) {
+          const u = (((focusPoint?.y ?? y) - center.y) / fy - ay) / ey;
+          if (u >= -eps && u <= 1 + eps) inFocus = true;
+        }
         if ((fx > 0 || Math.abs(px) < eps) && (fy > 0 || Math.abs(py) < eps)) {
           const x2 = fx > 0 ? px / fx : 0;
           const y2 = fy > 0 ? py / fy : 0;
@@ -27506,7 +27510,7 @@ var RealizedFont = class {
           xs[i] = Math.round(m[0] * x - m[2] * y + subX);
           ys[i] = Math.round(-(m[1] * x - m[3] * y) - subY);
         } else {
-          xs[i] = Math.round(x + subX);
+          xs[i] = this.gdiPlus && this.mode === "cleartype" ? x + subX : Math.round(x + subX);
           ys[i] = y - subY;
         }
       }
@@ -30408,7 +30412,8 @@ function pathGradientSampler(shape, wrap, device) {
           by = foldIntoTile(by, box.y, box.h, mirrorY, lagY);
         }
         if (wrap === "clamp" && by >= box.y + box.h) continue;
-        const c = pathGradientColorAt(shape, bx, by);
+        const focusPoint = bias && shape.focus?.x === 0 ? { x: bx - inv2[0] * bias, y: by - inv2[1] * bias } : void 0;
+        const c = pathGradientColorAt(shape, bx, by, focusPoint);
         if (c === null) {
           continue;
         }
@@ -33787,7 +33792,7 @@ function layoutGdiRun(font, run) {
     const origin = at(along, down);
     const fractionalX = !font.gridFit || font.fractionalOrigins;
     const ox = fractionalX ? Math.floor(origin.x) : Math.round(origin.x);
-    const subX = !fractionalX ? 0 : font.fractionalOrigins === "xy" ? Math.round((origin.x - ox) * 4) * 16 : Math.round((origin.x - ox) * 64);
+    const subX = !fractionalX ? 0 : font.fractionalOrigins === "xy" ? Math.round((origin.x - ox) * 4) * 16 : font.fractionalOrigins === "x" ? Math.round((origin.x - ox) * 6) * (64 / 6) : Math.round((origin.x - ox) * 64);
     const oy = font.fractionalOrigins === "xy" ? Math.floor(origin.y) : Math.round(origin.y);
     const subY = font.fractionalOrigins === "xy" ? Math.round((origin.y - oy) * 4) * 16 : 0;
     origins.push({ x: ox + subX / 64, y: oy + subY / 64, along, down });

package/package.json CHANGED Viewed

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