circuit-json-to-lbrn 0.0.29 → 0.0.31

package/dist/index.d.ts

@@ -10,7 +10,7 @@ declare const convertCircuitJsonToLbrn: (circuitJson: CircuitJson, options?: {
     margin?: number;
     includeCopper?: boolean;
     includeSoldermask?: boolean;
-    soldermaskMargin?: number;
+    globalCopperSoldermaskMarginAdjustment?: number;
     includeLayers?: Array<"top" | "bottom">;
     traceMargin?: number;
     laserSpotSize?: number;

package/dist/index.js

@@ -61,7 +61,7 @@ var addCirclePlatedHole = (platedHole, ctx) => {
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -107,7 +107,7 @@ var addCirclePlatedHole = (platedHole, ctx) => {
     }
   }
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
-    const smRadius = platedHole.outer_diameter / 2 + soldermaskMargin;
+    const smRadius = platedHole.outer_diameter / 2 + globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
     const outer = createCirclePath({
       centerX,
       centerY,
@@ -188,7 +188,7 @@ var addOvalPlatedHole = (platedHole, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   if (platedHole.outer_width <= 0 || platedHole.outer_height <= 0) {
@@ -227,6 +227,7 @@ 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 outer = createOvalPath({
@@ -367,7 +368,7 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -406,8 +407,8 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
     }
   }
   if (includeSoldermask) {
-    const smPadWidth = padWidth + 2 * soldermaskMargin;
-    const smPadHeight = padHeight + 2 * soldermaskMargin;
+    const smPadWidth = padWidth + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+    const smPadHeight = padHeight + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
     const smPadPath = createRoundedRectPath({
       centerX,
       centerY,
@@ -552,7 +553,7 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -591,8 +592,8 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
       }
     }
     if (includeSoldermask) {
-      const smPadWidth = padWidth + 2 * soldermaskMargin;
-      const smPadHeight = padHeight + 2 * soldermaskMargin;
+      const smPadWidth = padWidth + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+      const smPadHeight = padHeight + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,
@@ -644,7 +645,7 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -686,8 +687,8 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
       }
     }
     if (includeSoldermask) {
-      const smPadWidth = padWidth + 2 * soldermaskMargin;
-      const smPadHeight = padHeight + 2 * soldermaskMargin;
+      const smPadWidth = padWidth + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+      const smPadHeight = padHeight + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,
@@ -766,7 +767,7 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   if (platedHole.pad_outline.length >= 3 && includeCopper) {
@@ -860,7 +861,7 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -896,8 +897,8 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     }
   }
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeSoldermask) {
-    const smWidth = platedHole.outer_width + 2 * soldermaskMargin;
-    const smHeight = platedHole.outer_height + 2 * soldermaskMargin;
+    const smWidth = platedHole.outer_width + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+    const smHeight = platedHole.outer_height + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
     const outer = createPillPath({
       centerX,
       centerY,
@@ -971,7 +972,7 @@ var addRectSmtPad = (smtPad, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1025,8 +1026,8 @@ var addRectSmtPad = (smtPad, ctx) => {
     }
   }
   if (includeSoldermask) {
-    const smHalfWidth = halfWidth + soldermaskMargin;
-    const smHalfHeight = halfHeight + soldermaskMargin;
+    const smHalfWidth = halfWidth + globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+    const smHalfHeight = halfHeight + globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
     const verts = [
       { x: centerX - smHalfWidth, y: centerY - smHalfHeight },
       { x: centerX + smHalfWidth, y: centerY - smHalfHeight },
@@ -1068,7 +1069,7 @@ var addCircleSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1107,7 +1108,7 @@ var addCircleSmtPad = (smtPad, ctx) => {
       }
     }
     if (includeSoldermask) {
-      const smRadius = outerRadius + soldermaskMargin;
+      const smRadius = outerRadius + globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
       const outer = createCirclePath({
         centerX,
         centerY,
@@ -1148,7 +1149,7 @@ var addPillSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1186,8 +1187,8 @@ var addPillSmtPad = (smtPad, ctx) => {
       }
     }
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * soldermaskMargin;
-      const smHeight = smtPad.height + 2 * soldermaskMargin;
+      const smWidth = smtPad.width + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const smHeight = smtPad.height + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
       const smOuter = createPillPath({
         centerX,
         centerY,
@@ -1220,7 +1221,7 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1259,8 +1260,8 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
       }
     }
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * soldermaskMargin;
-      const smHeight = smtPad.height + 2 * soldermaskMargin;
+      const smWidth = smtPad.width + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const smHeight = smtPad.height + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
       const smOuter = createPillPath({
         centerX,
         centerY,
@@ -1323,7 +1324,7 @@ var addPolygonSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1384,7 +1385,7 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1427,8 +1428,8 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
       }
     }
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * soldermaskMargin;
-      const smHeight = smtPad.height + 2 * soldermaskMargin;
+      const smWidth = smtPad.width + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const smHeight = smtPad.height + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
       const smOuter = createRoundedRectPath({
         centerX,
         centerY,
@@ -1913,7 +1914,7 @@ var addPcbVia = (via, ctx) => {
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers
   } = ctx;
   const centerX = via.x + origin.x;
@@ -1960,7 +1961,7 @@ var addPcbVia = (via, ctx) => {
     }
   }
   if (via.outer_diameter > 0 && includeSoldermask) {
-    const smRadius = via.outer_diameter / 2 + soldermaskMargin;
+    const smRadius = via.outer_diameter / 2 + globalCopperSoldermaskMarginAdjustment;
     const outer = createCirclePath({
       centerX,
       centerY,
@@ -2002,17 +2003,15 @@ var addCirclePcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
   if (hole.hole_diameter > 0 && includeSoldermask) {
-    const smRadius = hole.hole_diameter / 2 + soldermaskMargin;
     const soldermaskPath = createCirclePath({
       centerX,
       centerY,
-      radius: smRadius
+      radius: hole.hole_diameter / 2 + (hole.soldermask_margin ?? 0)
     });
     project.children.push(
       new ShapePath16({
@@ -2050,7 +2049,6 @@ var addRectPcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
@@ -2059,8 +2057,8 @@ var addRectPcbHole = (hole, ctx) => {
     const soldermaskPath = createRoundedRectPath({
       centerX,
       centerY,
-      width: hole.hole_width + soldermaskMargin * 2,
-      height: hole.hole_height + soldermaskMargin * 2,
+      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
+      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
       borderRadius: 0
       // no border radius for rect holes
     });
@@ -2102,7 +2100,6 @@ var addOvalPcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
@@ -2111,8 +2108,8 @@ var addOvalPcbHole = (hole, ctx) => {
     const soldermaskPath = createOvalPath({
       centerX,
       centerY,
-      width: hole.hole_width + soldermaskMargin * 2,
-      height: hole.hole_height + soldermaskMargin * 2
+      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
+      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0)
     });
     project.children.push(
       new ShapePath18({
@@ -2150,7 +2147,6 @@ var addPillPcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
@@ -2159,8 +2155,8 @@ var addPillPcbHole = (hole, ctx) => {
     const soldermaskPath = createPillPath({
       centerX,
       centerY,
-      width: hole.hole_width + soldermaskMargin * 2,
-      height: hole.hole_height + soldermaskMargin * 2
+      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
+      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0)
     });
     project.children.push(
       new ShapePath19({
@@ -2198,7 +2194,6 @@ var addRotatedPillPcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
@@ -2208,8 +2203,8 @@ var addRotatedPillPcbHole = (hole, ctx) => {
     const soldermaskPath = createPillPath({
       centerX,
       centerY,
-      width: hole.hole_width + soldermaskMargin * 2,
-      height: hole.hole_height + soldermaskMargin * 2,
+      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
+      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
       rotation
     });
     project.children.push(
@@ -2269,7 +2264,6 @@ var addCirclePcbCutout = (cutout, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
     soldermaskCutSetting
   } = ctx;
   const centerX = cutout.center.x + origin.x;
@@ -2290,11 +2284,10 @@ var addCirclePcbCutout = (cutout, ctx) => {
     );
   }
   if (cutout.radius > 0 && includeSoldermask) {
-    const smRadius = cutout.radius + soldermaskMargin;
     const outer = createCirclePath({
       centerX,
       centerY,
-      radius: smRadius
+      radius: cutout.radius
     });
     project.children.push(
       new ShapePath21({
@@ -2316,7 +2309,6 @@ var addRectPcbCutout = (cutout, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
     soldermaskCutSetting
   } = ctx;
   const centerX = cutout.center.x + origin.x;
@@ -2345,13 +2337,11 @@ var addRectPcbCutout = (cutout, ctx) => {
   }
   if (cutout.width > 0 && cutout.height > 0 && includeSoldermask) {
     const rotation = (cutout.rotation ?? 0) * (Math.PI / 180);
-    const smWidth = cutout.width + 2 * soldermaskMargin;
-    const smHeight = cutout.height + 2 * soldermaskMargin;
     const rectPath = createRoundedRectPath({
       centerX,
       centerY,
-      width: smWidth,
-      height: smHeight,
+      width: cutout.width,
+      height: cutout.height,
       borderRadius: 0,
       // no border radius for cutouts
       segments: 4,
@@ -2378,8 +2368,7 @@ var addPolygonPcbCutout = (cutout, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskCutSetting,
-    soldermaskMargin
+    soldermaskCutSetting
   } = ctx;
   if (cutout.points.length >= 3 && includeCopper) {
     const polygonPath = createPolygonPathFromOutline({
@@ -2397,12 +2386,8 @@ var addPolygonPcbCutout = (cutout, ctx) => {
     );
   }
   if (cutout.points.length >= 3 && includeSoldermask) {
-    const points = soldermaskMargin && soldermaskMargin > 0 ? cutout.points.map((p) => ({
-      x: (p.x ?? 0) + (p.x ?? 0) > 0 ? soldermaskMargin : -soldermaskMargin,
-      y: (p.y ?? 0) + (p.y ?? 0) > 0 ? soldermaskMargin : -soldermaskMargin
-    })) : cutout.points;
     const polygonPath = createPolygonPathFromOutline({
-      outline: points,
+      outline: cutout.points,
       offsetX: origin.x,
       offsetY: origin.y
     });
@@ -2426,7 +2411,6 @@ var addPathPcbCutout = (cutout, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
     soldermaskCutSetting
   } = ctx;
   if (cutout.route.length >= 2 && includeCopper) {
@@ -2659,7 +2643,7 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
   const laserSpotSize = options.laserSpotSize ?? 5e-3;
   const includeCopper = options.includeCopper ?? true;
   const includeSoldermask = options.includeSoldermask ?? false;
-  const soldermaskMargin = options.soldermaskMargin ?? 0;
+  const globalCopperSoldermaskMarginAdjustment = options.globalCopperSoldermaskMarginAdjustment ?? 0;
   const laserProfile = options.laserProfile;
   const defaultCopperSettings = {
     speed: 300,
@@ -2771,7 +2755,7 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
     traceMargin,
     laserSpotSize,

package/lib/ConvertContext.ts

@@ -33,8 +33,8 @@ export interface ConvertContext {
   includeSoldermask: boolean
   includeLayers: Array<"top" | "bottom">
 
-  // Soldermask margin (can be negative)
-  soldermaskMargin: number
+  // Global copper soldermask margin adjustment (can be negative)
+  globalCopperSoldermaskMarginAdjustment: number
 
   // Trace margin for clearance zones
   traceMargin: number

package/lib/element-handlers/addPcbCutout/addCirclePcbCutout.ts

@@ -17,7 +17,6 @@ export const addCirclePcbCutout = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
     soldermaskCutSetting,
   } = ctx
   const centerX = cutout.center.x + origin.x
@@ -42,11 +41,10 @@ export const addCirclePcbCutout = (
 
   // Add soldermask opening if drawing soldermask
   if (cutout.radius > 0 && includeSoldermask) {
-    const smRadius = cutout.radius + soldermaskMargin
     const outer = createCirclePath({
       centerX,
       centerY,
-      radius: smRadius,
+      radius: cutout.radius,
     })
     project.children.push(
       new ShapePath({

package/lib/element-handlers/addPcbCutout/addPathPcbCutout.ts

@@ -16,7 +16,6 @@ export const addPathPcbCutout = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
     soldermaskCutSetting,
   } = ctx
 

package/lib/element-handlers/addPcbCutout/addPolygonPcbCutout.ts

@@ -18,7 +18,6 @@ export const addPolygonPcbCutout = (
     includeCopper,
     includeSoldermask,
     soldermaskCutSetting,
-    soldermaskMargin,
   } = ctx
 
   // Add the cutout - cut through the board
@@ -40,23 +39,8 @@ export const addPolygonPcbCutout = (
 
   // Add soldermask opening if drawing soldermask
   if (cutout.points.length >= 3 && includeSoldermask) {
-    // Apply soldermask margin to the points if margin is specified
-    const points =
-      soldermaskMargin && soldermaskMargin > 0
-        ? cutout.points.map((p) => ({
-            x:
-              (p.x ?? 0) + (p.x ?? 0) > 0
-                ? soldermaskMargin
-                : -soldermaskMargin,
-            y:
-              (p.y ?? 0) + (p.y ?? 0) > 0
-                ? soldermaskMargin
-                : -soldermaskMargin,
-          }))
-        : cutout.points
-
     const polygonPath = createPolygonPathFromOutline({
-      outline: points,
+      outline: cutout.points,
       offsetX: origin.x,
       offsetY: origin.y,
     })

package/lib/element-handlers/addPcbCutout/addRectPcbCutout.ts

@@ -17,7 +17,6 @@ export const addRectPcbCutout = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
     soldermaskCutSetting,
   } = ctx
   const centerX = cutout.center.x + origin.x
@@ -48,13 +47,11 @@ export const addRectPcbCutout = (
   // Add soldermask opening if drawing soldermask
   if (cutout.width > 0 && cutout.height > 0 && includeSoldermask) {
     const rotation = (cutout.rotation ?? 0) * (Math.PI / 180) // Convert degrees to radians
-    const smWidth = cutout.width + 2 * soldermaskMargin
-    const smHeight = cutout.height + 2 * soldermaskMargin
     const rectPath = createRoundedRectPath({
       centerX,
       centerY,
-      width: smWidth,
-      height: smHeight,
+      width: cutout.width,
+      height: cutout.height,
       borderRadius: 0, // no border radius for cutouts
       segments: 4, // segments
       rotation,

package/lib/element-handlers/addPcbHole/addCirclePcbHole.ts

@@ -16,7 +16,6 @@ export const addCirclePcbHole = (
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper,
   } = ctx
   const centerX = hole.x + origin.x
@@ -24,11 +23,10 @@ export const addCirclePcbHole = (
 
   // Add soldermask opening if drawing soldermask
   if (hole.hole_diameter > 0 && includeSoldermask) {
-    const smRadius = hole.hole_diameter / 2 + soldermaskMargin
     const soldermaskPath = createCirclePath({
       centerX,
       centerY,
-      radius: smRadius,
+      radius: hole.hole_diameter / 2 + (hole.soldermask_margin ?? 0),
     })
     project.children.push(
       new ShapePath({

package/lib/element-handlers/addPcbHole/addOvalPcbHole.ts

@@ -16,7 +16,6 @@ export const addOvalPcbHole = (
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper,
   } = ctx
   const centerX = hole.x + origin.x
@@ -27,8 +26,8 @@ export const addOvalPcbHole = (
     const soldermaskPath = createOvalPath({
       centerX,
       centerY,
-      width: hole.hole_width + soldermaskMargin * 2,
-      height: hole.hole_height + soldermaskMargin * 2,
+      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
+      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
     })
     project.children.push(
       new ShapePath({

package/lib/element-handlers/addPcbHole/addPillPcbHole.ts

@@ -16,7 +16,6 @@ export const addPillPcbHole = (
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper,
   } = ctx
   const centerX = hole.x + origin.x
@@ -27,8 +26,8 @@ export const addPillPcbHole = (
     const soldermaskPath = createPillPath({
       centerX,
       centerY,
-      width: hole.hole_width + soldermaskMargin * 2,
-      height: hole.hole_height + soldermaskMargin * 2,
+      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
+      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
     })
     project.children.push(
       new ShapePath({

package/lib/element-handlers/addPcbHole/addRectPcbHole.ts

@@ -16,7 +16,6 @@ export const addRectPcbHole = (
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper,
   } = ctx
   const centerX = hole.x + origin.x
@@ -27,8 +26,8 @@ export const addRectPcbHole = (
     const soldermaskPath = createRoundedRectPath({
       centerX,
       centerY,
-      width: hole.hole_width + soldermaskMargin * 2,
-      height: hole.hole_height + soldermaskMargin * 2,
+      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
+      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
       borderRadius: 0, // no border radius for rect holes
     })
     project.children.push(

package/lib/element-handlers/addPcbHole/addRotatedPillPcbHole.ts

@@ -16,7 +16,6 @@ export const addRotatedPillPcbHole = (
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin,
     includeCopper,
   } = ctx
   const centerX = hole.x + origin.x
@@ -28,8 +27,8 @@ export const addRotatedPillPcbHole = (
     const soldermaskPath = createPillPath({
       centerX,
       centerY,
-      width: hole.hole_width + soldermaskMargin * 2,
-      height: hole.hole_height + soldermaskMargin * 2,
+      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
+      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
       rotation,
     })
     project.children.push(

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

@@ -19,7 +19,7 @@ export const addPcbVia = (via: PcbVia, ctx: ConvertContext): void => {
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
   const centerX = via.x + origin.x
@@ -82,7 +82,8 @@ 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 + soldermaskMargin
+    const smRadius =
+      via.outer_diameter / 2 + globalCopperSoldermaskMarginAdjustment
     const outer = createCirclePath({
       centerX,
       centerY,

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

@@ -21,7 +21,7 @@ export const addCirclePlatedHole = (
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -75,7 +75,10 @@ export const addCirclePlatedHole = (
 
   // Add soldermask opening if drawing soldermask
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
-    const smRadius = platedHole.outer_diameter / 2 + soldermaskMargin
+    const smRadius =
+      platedHole.outer_diameter / 2 +
+      globalCopperSoldermaskMarginAdjustment +
+      (platedHole.soldermask_margin ?? 0)
     const outer = createCirclePath({
       centerX,
       centerY,