circuit-json-to-lbrn 0.0.40 → 0.0.41

package/dist/index.d.ts

@@ -11,6 +11,7 @@ interface ConvertCircuitJsonToLbrnOptions {
     includeCopper?: boolean;
     includeSoldermask?: boolean;
     globalCopperSoldermaskMarginAdjustment?: number;
+    solderMaskMarginPercent?: number;
     includeLayers?: Array<"top" | "bottom">;
     traceMargin?: number;
     laserSpotSize?: number;

package/dist/index.js

@@ -62,6 +62,7 @@ var addCirclePlatedHole = (platedHole, ctx) => {
     includeSoldermask,
     connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -107,7 +108,9 @@ var addCirclePlatedHole = (platedHole, ctx) => {
     }
   }
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
-    const smRadius = platedHole.outer_diameter / 2 + globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+    const percentMargin = solderMaskMarginPercent / 100 * platedHole.outer_diameter;
+    const totalMargin = globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMargin;
+    const smRadius = Math.max(platedHole.outer_diameter / 2 + totalMargin, 0);
     const outer = createCirclePath({
       centerX,
       centerY,
@@ -189,6 +192,7 @@ var addOvalPlatedHole = (platedHole, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   if (platedHole.outer_width <= 0 || platedHole.outer_height <= 0) {
@@ -227,9 +231,18 @@ var addOvalPlatedHole = (platedHole, ctx) => {
     }
   }
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeSoldermask) {
-    const soldermaskMargin = globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-    const smWidth = platedHole.outer_width + 2 * soldermaskMargin;
-    const smHeight = platedHole.outer_height + 2 * soldermaskMargin;
+    const percentMarginX = solderMaskMarginPercent / 100 * platedHole.outer_width;
+    const percentMarginY = solderMaskMarginPercent / 100 * platedHole.outer_height;
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+      -platedHole.outer_width / 2
+    );
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+      -platedHole.outer_height / 2
+    );
+    const smWidth = platedHole.outer_width + 2 * totalMarginX;
+    const smHeight = platedHole.outer_height + 2 * totalMarginY;
     const outer = createOvalPath({
       centerX,
       centerY,
@@ -412,6 +425,7 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -442,8 +456,18 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
     });
   }
   if (includeSoldermask) {
-    const smPadWidth = padWidth + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-    const smPadHeight = padHeight + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+    const percentMarginX = solderMaskMarginPercent / 100 * padWidth;
+    const percentMarginY = solderMaskMarginPercent / 100 * padHeight;
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+      -padWidth / 2
+    );
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+      -padHeight / 2
+    );
+    const smPadWidth = padWidth + 2 * totalMarginX;
+    const smPadHeight = padHeight + 2 * totalMarginY;
     const smPadPath = createRoundedRectPath({
       centerX,
       centerY,
@@ -587,6 +611,7 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -617,8 +642,18 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
       });
     }
     if (includeSoldermask) {
-      const smPadWidth = padWidth + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-      const smPadHeight = padHeight + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * padWidth;
+      const percentMarginY = solderMaskMarginPercent / 100 * padHeight;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+        -padWidth / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+        -padHeight / 2
+      );
+      const smPadWidth = padWidth + 2 * totalMarginX;
+      const smPadHeight = padHeight + 2 * totalMarginY;
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,
@@ -669,6 +704,7 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -702,8 +738,18 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
       });
     }
     if (includeSoldermask) {
-      const smPadWidth = padWidth + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-      const smPadHeight = padHeight + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * padWidth;
+      const percentMarginY = solderMaskMarginPercent / 100 * padHeight;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+        -padWidth / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+        -padHeight / 2
+      );
+      const smPadWidth = padWidth + 2 * totalMarginX;
+      const smPadHeight = padHeight + 2 * totalMarginY;
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,
@@ -867,6 +913,7 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -902,8 +949,18 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     }
   }
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeSoldermask) {
-    const smWidth = platedHole.outer_width + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-    const smHeight = platedHole.outer_height + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+    const percentMarginX = solderMaskMarginPercent / 100 * platedHole.outer_width;
+    const percentMarginY = solderMaskMarginPercent / 100 * platedHole.outer_height;
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+      -platedHole.outer_width / 2
+    );
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+      -platedHole.outer_height / 2
+    );
+    const smWidth = platedHole.outer_width + 2 * totalMarginX;
+    const smHeight = platedHole.outer_height + 2 * totalMarginY;
     const outer = createPillPath({
       centerX,
       centerY,
@@ -973,6 +1030,7 @@ var addRectSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1006,8 +1064,18 @@ var addRectSmtPad = (smtPad, ctx) => {
     });
   }
   if (includeSoldermask) {
-    const smHalfWidth = halfWidth + globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
-    const smHalfHeight = halfHeight + globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+    const percentMarginX = solderMaskMarginPercent / 100 * smtPad.width;
+    const percentMarginY = solderMaskMarginPercent / 100 * smtPad.height;
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+      -smtPad.width / 2
+    );
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+      -smtPad.height / 2
+    );
+    const smHalfWidth = halfWidth + totalMarginX;
+    const smHalfHeight = halfHeight + totalMarginY;
     const verts = [
       { x: centerX - smHalfWidth, y: centerY - smHalfHeight },
       { x: centerX + smHalfWidth, y: centerY - smHalfHeight },
@@ -1044,6 +1112,7 @@ var addCircleSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1071,7 +1140,19 @@ var addCircleSmtPad = (smtPad, ctx) => {
       });
     }
     if (includeSoldermask) {
-      const smRadius = outerRadius + globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const elementWidth = 2 * outerRadius;
+      const elementHeight = 2 * outerRadius;
+      const percentMarginX = solderMaskMarginPercent / 100 * elementWidth;
+      const percentMarginY = solderMaskMarginPercent / 100 * elementHeight;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+        -elementWidth / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+        -elementHeight / 2
+      );
+      const smRadius = outerRadius + totalMarginX;
       const outer = createCirclePath({
         centerX,
         centerY,
@@ -1099,6 +1180,7 @@ var addPillSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1126,8 +1208,18 @@ var addPillSmtPad = (smtPad, ctx) => {
       });
     }
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
-      const smHeight = smtPad.height + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * smtPad.width;
+      const percentMarginY = solderMaskMarginPercent / 100 * smtPad.height;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+        -smtPad.width / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+        -smtPad.height / 2
+      );
+      const smWidth = smtPad.width + 2 * totalMarginX;
+      const smHeight = smtPad.height + 2 * totalMarginY;
       const smOuter = createPillPath({
         centerX,
         centerY,
@@ -1156,6 +1248,7 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1184,8 +1277,18 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
       });
     }
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
-      const smHeight = smtPad.height + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * smtPad.width;
+      const percentMarginY = solderMaskMarginPercent / 100 * smtPad.height;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+        -smtPad.width / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+        -smtPad.height / 2
+      );
+      const smWidth = smtPad.width + 2 * totalMarginX;
+      const smHeight = smtPad.height + 2 * totalMarginY;
       const smOuter = createPillPath({
         centerX,
         centerY,
@@ -1244,6 +1347,7 @@ var addPolygonSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1290,6 +1394,7 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1322,8 +1427,18 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
       });
     }
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
-      const smHeight = smtPad.height + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * smtPad.width;
+      const percentMarginY = solderMaskMarginPercent / 100 * smtPad.height;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+        -smtPad.width / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+        -smtPad.height / 2
+      );
+      const smWidth = smtPad.width + 2 * totalMarginX;
+      const smHeight = smtPad.height + 2 * totalMarginY;
       const smOuter = createRoundedRectPath({
         centerX,
         centerY,
@@ -1833,6 +1948,7 @@ var addPcbVia = (via, ctx) => {
     includeSoldermask,
     connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = via.x + origin.x;
@@ -1887,7 +2003,9 @@ var addPcbVia = (via, ctx) => {
     }
   }
   if (via.outer_diameter > 0 && includeSoldermask) {
-    const smRadius = via.outer_diameter / 2 + globalCopperSoldermaskMarginAdjustment;
+    const percentMargin = solderMaskMarginPercent / 100 * via.outer_diameter;
+    const totalMargin = globalCopperSoldermaskMarginAdjustment + percentMargin;
+    const smRadius = Math.max(via.outer_diameter / 2 + totalMargin, 0);
     const outer = createCirclePath({
       centerX,
       centerY,
@@ -2376,6 +2494,7 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
   const includeCopper = options.includeCopper ?? true;
   const includeSoldermask = options.includeSoldermask ?? false;
   const globalCopperSoldermaskMarginAdjustment = options.globalCopperSoldermaskMarginAdjustment ?? 0;
+  const solderMaskMarginPercent = options.solderMaskMarginPercent ?? 0;
   const laserProfile = options.laserProfile;
   const defaultCopperSettings = {
     speed: 300,
@@ -2492,7 +2611,8 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
     traceMargin,
     laserSpotSize,
     topTraceClearanceAreaCutSetting,
-    bottomTraceClearanceAreaCutSetting
+    bottomTraceClearanceAreaCutSetting,
+    solderMaskMarginPercent
   };
   for (const net of Object.keys(connMap.netMap)) {
     ctx.topCutNetGeoms.set(net, []);

package/lib/ConvertContext.ts

@@ -43,4 +43,7 @@ export interface ConvertContext {
   // Cut settings for trace clearance areas
   topTraceClearanceAreaCutSetting?: CutSetting
   bottomTraceClearanceAreaCutSetting?: CutSetting
+
+  // Percent-based solder mask margin (scales with element size)
+  solderMaskMarginPercent: number
 }

package/lib/element-handlers/addPcbVia/index.ts

@@ -20,6 +20,7 @@ export const addPcbVia = (via: PcbVia, ctx: ConvertContext): void => {
     includeSoldermask,
     connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = via.x + origin.x
@@ -93,8 +94,16 @@ export const addPcbVia = (via: PcbVia, ctx: ConvertContext): void => {
 
   // Add soldermask opening if drawing soldermask
   if (via.outer_diameter > 0 && includeSoldermask) {
-    const smRadius =
-      via.outer_diameter / 2 + globalCopperSoldermaskMarginAdjustment
+    // Percent margin is additive and may be negative.
+    // Global adjustment is always applied.
+    // Percent margin is applied to full diameter
+    const percentMargin = (solderMaskMarginPercent / 100) * via.outer_diameter
+
+    // Total margin is additive
+    const totalMargin = globalCopperSoldermaskMarginAdjustment + percentMargin
+
+    // Clamp so radius never goes below zero
+    const smRadius = Math.max(via.outer_diameter / 2 + totalMargin, 0)
     const outer = createCirclePath({
       centerX,
       centerY,

package/lib/element-handlers/addPlatedHole/addCirclePlatedHole.ts

@@ -22,6 +22,7 @@ export const addCirclePlatedHole = (
     includeSoldermask,
     connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -75,10 +76,15 @@ export const addCirclePlatedHole = (
 
   // Add soldermask opening if drawing soldermask
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
-    const smRadius =
-      platedHole.outer_diameter / 2 +
+    // Percent margin is additive and may be negative.
+    // Absolute per-element margin and global adjustment are always applied.
+    const percentMargin =
+      (solderMaskMarginPercent / 100) * platedHole.outer_diameter
+    const totalMargin =
       globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
+      (platedHole.soldermask_margin ?? 0) +
+      percentMargin
+    const smRadius = Math.max(platedHole.outer_diameter / 2 + totalMargin, 0)
     const outer = createCirclePath({
       centerX,
       centerY,

package/lib/element-handlers/addPlatedHole/addCircularHoleWithRectPad.ts

@@ -17,6 +17,7 @@ export const addCircularHoleWithRectPad = (
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -54,14 +55,25 @@ export const addCircularHoleWithRectPad = (
 
   // Add soldermask opening if drawing soldermask
   if (includeSoldermask) {
-    const smPadWidth =
-      padWidth +
-      2 * globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
-    const smPadHeight =
-      padHeight +
-      2 * globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
+    // Percent margin is additive and may be negative.
+    // Absolute per-element margin and global adjustment are always applied.
+    const percentMarginX = (solderMaskMarginPercent / 100) * padWidth
+    const percentMarginY = (solderMaskMarginPercent / 100) * padHeight
+
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginX,
+      -padWidth / 2,
+    )
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginY,
+      -padHeight / 2,
+    )
+    const smPadWidth = padWidth + 2 * totalMarginX
+    const smPadHeight = padHeight + 2 * totalMarginY
     const smPadPath = createRoundedRectPath({
       centerX,
       centerY,

package/lib/element-handlers/addPlatedHole/addOvalPlatedHole.ts

@@ -17,6 +17,7 @@ export const addOvalPlatedHole = (
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
 
@@ -70,11 +71,26 @@ export const addOvalPlatedHole = (
     platedHole.outer_height > 0 &&
     includeSoldermask
   ) {
-    const soldermaskMargin =
+    // Percent margin is additive and may be negative.
+    // Absolute per-element margin and global adjustment are always applied.
+    const percentMarginX =
+      (solderMaskMarginPercent / 100) * platedHole.outer_width
+    const percentMarginY =
+      (solderMaskMarginPercent / 100) * platedHole.outer_height
+    const totalMarginX = Math.max(
       globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
-    const smWidth = platedHole.outer_width + 2 * soldermaskMargin
-    const smHeight = platedHole.outer_height + 2 * soldermaskMargin
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginX,
+      -platedHole.outer_width / 2,
+    )
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginY,
+      -platedHole.outer_height / 2,
+    )
+    const smWidth = platedHole.outer_width + 2 * totalMarginX
+    const smHeight = platedHole.outer_height + 2 * totalMarginY
     const outer = createOvalPath({
       centerX,
       centerY,

package/lib/element-handlers/addPlatedHole/addPillHoleWithRectPad.ts

@@ -17,6 +17,7 @@ export const addPillHoleWithRectPad = (
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -54,14 +55,24 @@ export const addPillHoleWithRectPad = (
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
-      const smPadWidth =
-        padWidth +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (platedHole.soldermask_margin ?? 0)
-      const smPadHeight =
-        padHeight +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (platedHole.soldermask_margin ?? 0)
+      // Percent margin is additive and may be negative.
+      // Absolute per-element margin and global adjustment are always applied.
+      const percentMarginX = (solderMaskMarginPercent / 100) * padWidth
+      const percentMarginY = (solderMaskMarginPercent / 100) * padHeight
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (platedHole.soldermask_margin ?? 0) +
+          percentMarginX,
+        -padWidth / 2,
+      )
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (platedHole.soldermask_margin ?? 0) +
+          percentMarginY,
+        -padHeight / 2,
+      )
+      const smPadWidth = padWidth + 2 * totalMarginX
+      const smPadHeight = padHeight + 2 * totalMarginY
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,

package/lib/element-handlers/addPlatedHole/addPillPlatedHole.ts

@@ -17,6 +17,7 @@ export const addPcbPlatedHolePill = (
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -65,14 +66,26 @@ export const addPcbPlatedHolePill = (
     platedHole.outer_height > 0 &&
     includeSoldermask
   ) {
-    const smWidth =
-      platedHole.outer_width +
-      2 * globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
-    const smHeight =
-      platedHole.outer_height +
-      2 * globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
+    // Percent margin is additive and may be negative.
+    // Absolute per-element margin and global adjustment are always applied.
+    const percentMarginX =
+      (solderMaskMarginPercent / 100) * platedHole.outer_width
+    const percentMarginY =
+      (solderMaskMarginPercent / 100) * platedHole.outer_height
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginX,
+      -platedHole.outer_width / 2,
+    )
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginY,
+      -platedHole.outer_height / 2,
+    )
+    const smWidth = platedHole.outer_width + 2 * totalMarginX
+    const smHeight = platedHole.outer_height + 2 * totalMarginY
     const outer = createPillPath({
       centerX,
       centerY,

package/lib/element-handlers/addPlatedHole/addRotatedPillHoleWithRectPad.ts

@@ -17,6 +17,7 @@ export const addRotatedPillHoleWithRectPad = (
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -57,14 +58,24 @@ export const addRotatedPillHoleWithRectPad = (
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
-      const smPadWidth =
-        padWidth +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (platedHole.soldermask_margin ?? 0)
-      const smPadHeight =
-        padHeight +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (platedHole.soldermask_margin ?? 0)
+      // Percent margin is additive and may be negative.
+      // Absolute per-element margin and global adjustment are always applied.
+      const percentMarginX = (solderMaskMarginPercent / 100) * padWidth
+      const percentMarginY = (solderMaskMarginPercent / 100) * padHeight
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (platedHole.soldermask_margin ?? 0) +
+          percentMarginX,
+        -padWidth / 2,
+      )
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (platedHole.soldermask_margin ?? 0) +
+          percentMarginY,
+        -padHeight / 2,
+      )
+      const smPadWidth = padWidth + 2 * totalMarginX
+      const smPadHeight = padHeight + 2 * totalMarginY
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,

package/lib/element-handlers/addSmtPad/addCircleSmtPad.ts

@@ -15,6 +15,7 @@ export const addCircleSmtPad = (
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
 
@@ -51,10 +52,26 @@ export const addCircleSmtPad = (
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
-      const smRadius =
-        outerRadius +
+      // Percent margin is additive and may be negative.
+      // Absolute per-element margin and global adjustment are always applied.
+      const elementWidth = 2 * outerRadius
+      const elementHeight = 2 * outerRadius
+      const percentMarginX = (solderMaskMarginPercent / 100) * elementWidth
+      const percentMarginY = (solderMaskMarginPercent / 100) * elementHeight
+      const totalMarginX = Math.max(
         globalCopperSoldermaskMarginAdjustment +
-        (smtPad.soldermask_margin ?? 0)
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginX,
+        -elementWidth / 2,
+      )
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginY,
+        -elementHeight / 2,
+      )
+      // Since symmetric, use totalMarginX (same as totalMarginY)
+      const smRadius = outerRadius + totalMarginX
       const outer = createCirclePath({
         centerX,
         centerY,