@tscircuit/footprinter 0.0.343 → 0.0.345

package/dist/index.js

@@ -181,6 +181,101 @@ var u_curve = Array.from(
   y: -Math.sqrt(1 - x ** 2)
 }));
 
+// src/helpers/rect-union-outline.ts
+var createRectUnionOutline = (rectBoundsFromOuterToInner) => {
+  if (rectBoundsFromOuterToInner.length < 2) {
+    throw new Error("Rect union outline requires at least two bounds");
+  }
+  for (const bounds of rectBoundsFromOuterToInner) {
+    if (bounds.minX >= bounds.maxX || bounds.minY >= bounds.maxY) {
+      throw new Error("Each rectangle bound must have min < max on both axes");
+    }
+  }
+  for (let i = 1; i < rectBoundsFromOuterToInner.length; i++) {
+    const previous = rectBoundsFromOuterToInner[i - 1];
+    const current = rectBoundsFromOuterToInner[i];
+    if (current.minX < previous.minX || current.maxX > previous.maxX || current.minY > previous.minY || current.maxY < previous.maxY) {
+      throw new Error(
+        "Bounds must be ordered outer-to-inner with tighter X and larger Y span"
+      );
+    }
+  }
+  const buildTopLeftRouteFromInnerToOuter = () => {
+    const route = [];
+    let index = rectBoundsFromOuterToInner.length - 1;
+    route.push({
+      x: rectBoundsFromOuterToInner[index].minX,
+      y: rectBoundsFromOuterToInner[index].maxY
+    });
+    while (index > 0) {
+      const current = rectBoundsFromOuterToInner[index];
+      const previous = rectBoundsFromOuterToInner[index - 1];
+      route.push({ x: current.minX, y: previous.maxY });
+      route.push({ x: previous.minX, y: previous.maxY });
+      index -= 1;
+    }
+    return route;
+  };
+  const buildTopRightRouteFromInnerToOuter = () => {
+    const route = [];
+    let index = rectBoundsFromOuterToInner.length - 1;
+    route.push({
+      x: rectBoundsFromOuterToInner[index].maxX,
+      y: rectBoundsFromOuterToInner[index].maxY
+    });
+    while (index > 0) {
+      const current = rectBoundsFromOuterToInner[index];
+      const previous = rectBoundsFromOuterToInner[index - 1];
+      route.push({ x: current.maxX, y: previous.maxY });
+      route.push({ x: previous.maxX, y: previous.maxY });
+      index -= 1;
+    }
+    return route;
+  };
+  const buildBottomRightRouteFromInnerToOuter = () => {
+    const route = [];
+    let index = rectBoundsFromOuterToInner.length - 1;
+    route.push({
+      x: rectBoundsFromOuterToInner[index].maxX,
+      y: rectBoundsFromOuterToInner[index].minY
+    });
+    while (index > 0) {
+      const current = rectBoundsFromOuterToInner[index];
+      const previous = rectBoundsFromOuterToInner[index - 1];
+      route.push({ x: current.maxX, y: previous.minY });
+      route.push({ x: previous.maxX, y: previous.minY });
+      index -= 1;
+    }
+    return route;
+  };
+  const buildBottomLeftRouteFromInnerToOuter = () => {
+    const route = [];
+    let index = rectBoundsFromOuterToInner.length - 1;
+    route.push({
+      x: rectBoundsFromOuterToInner[index].minX,
+      y: rectBoundsFromOuterToInner[index].minY
+    });
+    while (index > 0) {
+      const current = rectBoundsFromOuterToInner[index];
+      const previous = rectBoundsFromOuterToInner[index - 1];
+      route.push({ x: current.minX, y: previous.minY });
+      route.push({ x: previous.minX, y: previous.minY });
+      index -= 1;
+    }
+    return route;
+  };
+  const topLeftInnerToOuter = buildTopLeftRouteFromInnerToOuter();
+  const topRightInnerToOuter = buildTopRightRouteFromInnerToOuter();
+  const bottomRightInnerToOuter = buildBottomRightRouteFromInnerToOuter();
+  const bottomLeftInnerToOuter = buildBottomLeftRouteFromInnerToOuter();
+  return [
+    ...topLeftInnerToOuter.reverse(),
+    ...topRightInnerToOuter,
+    ...bottomRightInnerToOuter.reverse(),
+    ...bottomLeftInnerToOuter
+  ];
+};
+
 // src/fn/dip.ts
 function convertMilToMm(value) {
   if (typeof value === "string") {
@@ -316,18 +411,30 @@ var dip = (raw_params) => {
     });
   }
   const silkscreenRefText = silkscreenRef(0, sh / 2 + 0.5, 0.4);
-  const courtyardPadding = 0.25;
-  const crtMinX = -(parameters.w / 2 + parameters.od / 2) - courtyardPadding;
-  const crtMaxX = parameters.w / 2 + parameters.od / 2 + courtyardPadding;
-  const crtMinY = -sh / 2 - courtyardPadding;
-  const crtMaxY = sh / 2 + courtyardPadding;
+  const pinRowSpanX = parameters.w + parameters.od;
+  const pinRowSpanY = padEdgeHeight;
+  const courtyardStepOuterHalfWidth = pinRowSpanX / 2 + 0.25;
+  const courtyardStepInnerHalfWidth = courtyardStepOuterHalfWidth;
+  const courtyardStepOuterHalfHeight = pinRowSpanY / 2 + 0.72;
+  const courtyardStepInnerHalfHeight = courtyardStepOuterHalfHeight;
   const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    outline: createRectUnionOutline([
+      {
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
+      },
+      {
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
+      }
+    ]),
     layer: "top"
   };
   return {
@@ -1182,14 +1289,36 @@ var bga = (raw_params) => {
     route: markerRoute,
     stroke_width: 0.05
   };
-  const courtyardPadding = 0.25;
+  const padSpanX = (grid.x - 1) * p + pad2;
+  const padSpanY = (grid.y - 1) * p + pad2;
+  const bodySpanX = w ?? padSpanX;
+  const bodySpanY = h ?? padSpanY;
+  const courtyardEnvelopeHalfWidth = Math.max(padSpanX / 2, bodySpanX / 2);
+  const courtyardEnvelopeHalfHeight = Math.max(padSpanY / 2, bodySpanY / 2);
+  const courtyardClearanceX = 1.715;
+  const courtyardClearanceY = 1.765;
+  const courtyardStepOuterHalfWidth = courtyardEnvelopeHalfWidth + courtyardClearanceX;
+  const courtyardStepInnerHalfWidth = courtyardStepOuterHalfWidth;
+  const courtyardStepOuterHalfHeight = courtyardEnvelopeHalfHeight + courtyardClearanceY;
+  const courtyardStepInnerHalfHeight = courtyardStepOuterHalfHeight;
   const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: "",
     pcb_component_id: "",
-    center: { x: 0, y: 0 },
-    width: 2 * (edgeX + courtyardPadding),
-    height: 2 * (edgeY + courtyardPadding),
+    outline: createRectUnionOutline([
+      {
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
+      },
+      {
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
+      }
+    ]),
     layer: "top"
   };
   return {
@@ -1223,101 +1352,6 @@ var pillpad = (pn, x, y, w, h) => {
   };
 };
 
-// src/helpers/rect-union-outline.ts
-var createRectUnionOutline = (rectBoundsFromOuterToInner) => {
-  if (rectBoundsFromOuterToInner.length < 2) {
-    throw new Error("Rect union outline requires at least two bounds");
-  }
-  for (const bounds of rectBoundsFromOuterToInner) {
-    if (bounds.minX >= bounds.maxX || bounds.minY >= bounds.maxY) {
-      throw new Error("Each rectangle bound must have min < max on both axes");
-    }
-  }
-  for (let i = 1; i < rectBoundsFromOuterToInner.length; i++) {
-    const previous = rectBoundsFromOuterToInner[i - 1];
-    const current = rectBoundsFromOuterToInner[i];
-    if (current.minX < previous.minX || current.maxX > previous.maxX || current.minY > previous.minY || current.maxY < previous.maxY) {
-      throw new Error(
-        "Bounds must be ordered outer-to-inner with tighter X and larger Y span"
-      );
-    }
-  }
-  const buildTopLeftRouteFromInnerToOuter = () => {
-    const route = [];
-    let index = rectBoundsFromOuterToInner.length - 1;
-    route.push({
-      x: rectBoundsFromOuterToInner[index].minX,
-      y: rectBoundsFromOuterToInner[index].maxY
-    });
-    while (index > 0) {
-      const current = rectBoundsFromOuterToInner[index];
-      const previous = rectBoundsFromOuterToInner[index - 1];
-      route.push({ x: current.minX, y: previous.maxY });
-      route.push({ x: previous.minX, y: previous.maxY });
-      index -= 1;
-    }
-    return route;
-  };
-  const buildTopRightRouteFromInnerToOuter = () => {
-    const route = [];
-    let index = rectBoundsFromOuterToInner.length - 1;
-    route.push({
-      x: rectBoundsFromOuterToInner[index].maxX,
-      y: rectBoundsFromOuterToInner[index].maxY
-    });
-    while (index > 0) {
-      const current = rectBoundsFromOuterToInner[index];
-      const previous = rectBoundsFromOuterToInner[index - 1];
-      route.push({ x: current.maxX, y: previous.maxY });
-      route.push({ x: previous.maxX, y: previous.maxY });
-      index -= 1;
-    }
-    return route;
-  };
-  const buildBottomRightRouteFromInnerToOuter = () => {
-    const route = [];
-    let index = rectBoundsFromOuterToInner.length - 1;
-    route.push({
-      x: rectBoundsFromOuterToInner[index].maxX,
-      y: rectBoundsFromOuterToInner[index].minY
-    });
-    while (index > 0) {
-      const current = rectBoundsFromOuterToInner[index];
-      const previous = rectBoundsFromOuterToInner[index - 1];
-      route.push({ x: current.maxX, y: previous.minY });
-      route.push({ x: previous.maxX, y: previous.minY });
-      index -= 1;
-    }
-    return route;
-  };
-  const buildBottomLeftRouteFromInnerToOuter = () => {
-    const route = [];
-    let index = rectBoundsFromOuterToInner.length - 1;
-    route.push({
-      x: rectBoundsFromOuterToInner[index].minX,
-      y: rectBoundsFromOuterToInner[index].minY
-    });
-    while (index > 0) {
-      const current = rectBoundsFromOuterToInner[index];
-      const previous = rectBoundsFromOuterToInner[index - 1];
-      route.push({ x: current.minX, y: previous.minY });
-      route.push({ x: previous.minX, y: previous.minY });
-      index -= 1;
-    }
-    return route;
-  };
-  const topLeftInnerToOuter = buildTopLeftRouteFromInnerToOuter();
-  const topRightInnerToOuter = buildTopRightRouteFromInnerToOuter();
-  const bottomRightInnerToOuter = buildBottomRightRouteFromInnerToOuter();
-  const bottomLeftInnerToOuter = buildBottomLeftRouteFromInnerToOuter();
-  return [
-    ...topLeftInnerToOuter.reverse(),
-    ...topRightInnerToOuter,
-    ...bottomRightInnerToOuter.reverse(),
-    ...bottomLeftInnerToOuter
-  ];
-};
-
 // src/fn/soic.ts
 var extendSoicDef = (newDefaults) => base_def.extend({
   fn: z13.string(),
@@ -1408,14 +1442,11 @@ var soicWithoutParsing = (parameters) => {
       { x: -sw / 2, y: -sh / 2 }
     ]
   };
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const pinRowSpanY = (parameters.num_pins / 2 - 1) * parameters.p + parameters.pw;
-  const courtyardStepInnerHalfX = roundToCourtyardGrid(parameters.w / 2 + 0.25);
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(
-    courtyardStepInnerHalfX + 1.93
-  );
-  const courtyardStepInnerHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.27);
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.63);
+  const courtyardStepInnerHalfWidth = parameters.w / 2 + 0.25;
+  const courtyardStepOuterHalfWidth = courtyardStepInnerHalfWidth + 1.93;
+  const courtyardStepInnerHalfHeight = pinRowSpanY / 2 + 0.275;
+  const courtyardStepOuterHalfHeight = pinRowSpanY / 2 + 0.635;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
@@ -1423,16 +1454,16 @@ var soicWithoutParsing = (parameters) => {
     layer: "top",
     outline: createRectUnionOutline([
       {
-        minX: -courtyardStepOuterHalfX,
-        maxX: courtyardStepOuterHalfX,
-        minY: -courtyardStepInnerHalfY,
-        maxY: courtyardStepInnerHalfY
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
       },
       {
-        minX: -courtyardStepInnerHalfX,
-        maxX: courtyardStepInnerHalfX,
-        minY: -courtyardStepOuterHalfY,
-        maxY: courtyardStepOuterHalfY
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
       }
     ])
   };
@@ -1774,20 +1805,19 @@ var quad = (raw_params) => {
     parameters.h / 2 + (parameters.legsoutside ? parameters.pl * 1.2 : 0.5),
     0.3
   );
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const roundUpToCourtyardOuterGrid = (value) => Math.ceil(value / 0.05) * 0.05;
   const pinRowSpanX = (spc - 1) * parameters.p + parameters.pw;
   const pinRowSpanY = (spc - 1) * parameters.p + parameters.pw;
-  const courtyardStepInnerHalfX = roundToCourtyardGrid(pinRowSpanX / 2 + 0.25);
-  const courtyardStepInnerHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.25);
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(parameters.w / 2 + 0.25);
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(parameters.h / 2 + 0.25);
-  const courtyardOuterHalfX = Math.max(
-    courtyardStepOuterHalfX,
+  const courtyardStepInnerHalfWidth = pinRowSpanX / 2 + 0.25;
+  const courtyardStepInnerHalfHeight = pinRowSpanY / 2 + 0.25;
+  const courtyardStepOuterHalfWidth = parameters.w / 2 + 0.25;
+  const courtyardStepOuterHalfHeight = parameters.h / 2 + 0.25;
+  const courtyardOuterHalfWidth = Math.max(
+    courtyardStepOuterHalfWidth,
     roundUpToCourtyardOuterGrid(padOuterHalfX + 0.25)
   );
-  const courtyardOuterHalfY = Math.max(
-    courtyardStepOuterHalfY,
+  const courtyardOuterHalfHeight = Math.max(
+    courtyardStepOuterHalfHeight,
     roundUpToCourtyardOuterGrid(padOuterHalfY + 0.25)
   );
   const courtyard = {
@@ -1797,22 +1827,22 @@ var quad = (raw_params) => {
     layer: "top",
     outline: createRectUnionOutline([
       {
-        minX: -courtyardOuterHalfX,
-        maxX: courtyardOuterHalfX,
-        minY: -courtyardStepInnerHalfY,
-        maxY: courtyardStepInnerHalfY
+        minX: -courtyardOuterHalfWidth,
+        maxX: courtyardOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
       },
       {
-        minX: -courtyardStepOuterHalfX,
-        maxX: courtyardStepOuterHalfX,
-        minY: -courtyardStepOuterHalfY,
-        maxY: courtyardStepOuterHalfY
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
       },
       {
-        minX: -courtyardStepInnerHalfX,
-        maxX: courtyardStepInnerHalfX,
-        minY: -courtyardOuterHalfY,
-        maxY: courtyardOuterHalfY
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardOuterHalfHeight,
+        maxY: courtyardOuterHalfHeight
       }
     ])
   };
@@ -2039,21 +2069,31 @@ var ssop = (raw_params) => {
       { x: -sw / 2, y: -sh / 2 }
     ]
   };
-  const courtyardPadding = 0.25;
-  const silkXs = silkscreenBorder.route.map((pt) => pt.x);
-  const silkYs = silkscreenBorder.route.map((pt) => pt.y);
-  const padXExtent = parameters.legsoutside ? parameters.w / 2 + parameters.pl : (parameters.w + 0.2) / 2 + parameters.pl / 2;
-  const crtMinX = Math.min(-padXExtent, ...silkXs) - courtyardPadding;
-  const crtMaxX = Math.max(padXExtent, ...silkXs) + courtyardPadding;
-  const crtMinY = Math.min(...silkYs) - courtyardPadding;
-  const crtMaxY = Math.max(...silkYs) + courtyardPadding;
+  const pinRowSpanY = (parameters.num_pins / 2 - 1) * parameters.p + parameters.pw;
+  const padToeHalfX = parameters.legsoutside ? parameters.w / 2 + parameters.pl : (parameters.w + 0.2) / 2 + parameters.pl / 2;
+  const pinRowHalfY = pinRowSpanY / 2;
+  const courtyardStepOuterHalfWidth = padToeHalfX + 0.25;
+  const courtyardStepInnerHalfWidth = courtyardStepOuterHalfWidth;
+  const courtyardStepOuterHalfHeight = pinRowHalfY + 0.445;
+  const courtyardStepInnerHalfHeight = courtyardStepOuterHalfHeight;
   const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    outline: createRectUnionOutline([
+      {
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
+      },
+      {
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
+      }
+    ]),
     layer: "top"
   };
   return {
@@ -2132,15 +2172,12 @@ var tssop = (raw_params) => {
       { x: -sw / 2, y: -sh / 2 }
     ]
   };
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const pinRowSpanY = (parameters.num_pins / 2 - 1) * parameters.p + parameters.pw;
   const pinToeHalfSpanX = parameters.w / 2 + (parameters.legsoutside ? parameters.pl : 0);
-  const courtyardStepInnerHalfX = roundToCourtyardGrid(parameters.w / 2 + 0.25);
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(pinToeHalfSpanX + 0.18);
-  const courtyardStepInnerHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.25);
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(
-    courtyardStepInnerHalfY + 0.35
-  );
+  const courtyardStepInnerHalfWidth = parameters.w / 2 + 0.25;
+  const courtyardStepOuterHalfWidth = pinToeHalfSpanX + 0.18;
+  const courtyardStepInnerHalfHeight = pinRowSpanY / 2 + 0.25;
+  const courtyardStepOuterHalfHeight = courtyardStepInnerHalfHeight + 0.35;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
@@ -2148,16 +2185,16 @@ var tssop = (raw_params) => {
     layer: "top",
     outline: createRectUnionOutline([
       {
-        minX: -courtyardStepOuterHalfX,
-        maxX: courtyardStepOuterHalfX,
-        minY: -courtyardStepInnerHalfY,
-        maxY: courtyardStepInnerHalfY
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
       },
       {
-        minX: -courtyardStepInnerHalfX,
-        maxX: courtyardStepInnerHalfX,
-        minY: -courtyardStepOuterHalfY,
-        maxY: courtyardStepOuterHalfY
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
       }
     ])
   };
@@ -3409,18 +3446,34 @@ var axial = (raw_params) => {
     pcb_silkscreen_path_id: ""
   };
   const silkscreenRefText = silkscreenRef(0, 1.5, 0.5);
-  const courtyardPadding = 0.25;
-  const crtMinX = -(p / 2 + od / 2 + courtyardPadding);
-  const crtMaxX = p / 2 + od / 2 + courtyardPadding;
-  const crtMinY = -(od / 2 + courtyardPadding);
-  const crtMaxY = od / 2 + courtyardPadding;
+  const pin1CenterX = -p / 2;
+  const pin2CenterX = p / 2;
+  const pinPadHalfX = od / 2;
+  const pinPadHalfY = od / 2;
+  const courtyardStepOuterMinX = pin1CenterX - pinPadHalfX - 0.35;
+  const courtyardStepOuterMaxX = pin2CenterX + pinPadHalfX + 0.26;
+  const courtyardStepOuterHalfHeight = pinPadHalfY + 0.35;
+  const courtyardStepInnerMinX = courtyardStepOuterMinX;
+  const courtyardStepInnerMaxX = courtyardStepOuterMaxX;
+  const courtyardStepInnerHalfHeight = courtyardStepOuterHalfHeight;
   const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    outline: createRectUnionOutline([
+      {
+        minX: courtyardStepOuterMinX,
+        maxX: courtyardStepOuterMaxX,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
+      },
+      {
+        minX: courtyardStepInnerMinX,
+        maxX: courtyardStepInnerMaxX,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
+      }
+    ]),
     layer: "top"
   };
   return {
@@ -4988,12 +5041,11 @@ var sop8 = (raw_params) => {
     ],
     stroke_width: 0.1
   };
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const pinRowSpanY = (parameters.num_pins / 2 - 1) * parameters.p + parameters.pw;
-  const courtyardStepInnerHalfX = roundToCourtyardGrid(parameters.w / 2 - 1.395);
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(parameters.w / 2 + 0.255);
-  const courtyardStepInnerHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.25);
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.5);
+  const courtyardStepInnerHalfWidth = parameters.w / 2 - 1.395;
+  const courtyardStepOuterHalfWidth = parameters.w / 2 + 0.255;
+  const courtyardStepInnerHalfHeight = pinRowSpanY / 2 + 0.25;
+  const courtyardStepOuterHalfHeight = pinRowSpanY / 2 + 0.5;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
@@ -5001,16 +5053,16 @@ var sop8 = (raw_params) => {
     layer: "top",
     outline: createRectUnionOutline([
       {
-        minX: -courtyardStepOuterHalfX,
-        maxX: courtyardStepOuterHalfX,
-        minY: -courtyardStepInnerHalfY,
-        maxY: courtyardStepInnerHalfY
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
       },
       {
-        minX: -courtyardStepInnerHalfX,
-        maxX: courtyardStepInnerHalfX,
-        minY: -courtyardStepOuterHalfY,
-        maxY: courtyardStepOuterHalfY
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
       }
     ])
   };
@@ -5309,45 +5361,69 @@ var sod_def5 = base_def.extend({
 });
 var sod923 = (raw_params) => {
   const parameters = sod_def5.parse(raw_params);
-  const silkscreenRefText = silkscreenRef(
-    0,
-    length31.parse(parameters.h),
-    0.3
-  );
+  const w = length31.parse(parameters.w);
+  const h = length31.parse(parameters.h);
+  const pl = length31.parse(parameters.pl);
+  const pw = length31.parse(parameters.pw);
+  const p = length31.parse(parameters.p);
+  const silkscreenRefText = silkscreenRef(0, h, 0.3);
   const silkscreenLine = {
     type: "pcb_silkscreen_path",
     layer: "top",
     pcb_component_id: "",
     route: [
       {
-        x: length31.parse(parameters.p) / 2 + 0.15,
-        y: length31.parse(parameters.h) / 2
+        x: p / 2 + 0.15,
+        y: h / 2
       },
       {
-        x: -length31.parse(parameters.w) / 2 - 0.15,
-        y: length31.parse(parameters.h) / 2
+        x: -w / 2 - 0.15,
+        y: h / 2
       },
       {
-        x: -length31.parse(parameters.w) / 2 - 0.15,
-        y: -length31.parse(parameters.h) / 2
+        x: -w / 2 - 0.15,
+        y: -h / 2
       },
       {
-        x: length31.parse(parameters.p) / 2 + 0.15,
-        y: -length31.parse(parameters.h) / 2
+        x: p / 2 + 0.15,
+        y: -h / 2
       }
     ],
     stroke_width: 0.1,
     pcb_silkscreen_path_id: ""
   };
-  const courtyardWidthMm = 1.5;
-  const courtyardHeightMm = 0.9;
+  const pinRowSpanX = p + pl;
+  const pinRowSpanY = pw;
+  const bodyHalfX = w / 2;
+  const bodyHalfY = h / 2;
+  const pinToeHalfX = pinRowSpanX / 2;
+  const pinRowHalfY = pinRowSpanY / 2;
+  const courtyardEnvelopeHalfWidth = Math.max(bodyHalfX, pinToeHalfX);
+  const courtyardEnvelopeHalfHeight = Math.max(bodyHalfY, pinRowHalfY);
+  const courtyardNarrowHalfWidth = Math.min(bodyHalfX, pinToeHalfX);
+  const courtyardNarrowHalfHeight = Math.min(bodyHalfY, pinRowHalfY);
+  const courtyardStepOuterHalfWidth = courtyardEnvelopeHalfWidth + 0.05;
+  const courtyardStepInnerHalfWidth = courtyardNarrowHalfWidth - 0.055;
+  const courtyardStepOuterHalfHeight = courtyardEnvelopeHalfHeight;
+  const courtyardStepInnerHalfHeight = courtyardNarrowHalfHeight + 0.155;
   const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: "",
     pcb_component_id: "",
-    center: { x: 0, y: 0 },
-    width: courtyardWidthMm,
-    height: courtyardHeightMm,
+    outline: createRectUnionOutline([
+      {
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
+      },
+      {
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
+      }
+    ]),
     layer: "top"
   };
   return {
@@ -6176,11 +6252,19 @@ var to220 = (raw_params) => {
     }
   ];
   const silkscreenRefText = silkscreenRef(0, h / 2 + 0.6, 0.5);
-  const courtyardPadding = 0.25;
-  const crtMinX = -(halfWidth + courtyardPadding);
-  const crtMaxX = halfWidth + courtyardPadding;
-  const crtMinY = -(halfHeight + courtyardPadding);
-  const crtMaxY = halfHeight + courtyardPadding;
+  const pinToeHalfSpanX = Math.max(...plated_holes.map((hole) => Math.abs(hole.x))) + od / 2;
+  const pinToeTopY = holeY + od / 2;
+  const pinToeBottomY = holeY - od / 2;
+  const courtyardHalfWidth = Math.max(
+    pinToeHalfSpanX + 0.25,
+    halfWidth - od * 0.59
+  );
+  const courtyardTopY = halfHeight - od * 0.63;
+  const courtyardBottomY = pinToeBottomY - (od / 2 + 0.01);
+  const crtMinX = -courtyardHalfWidth;
+  const crtMaxX = courtyardHalfWidth;
+  const crtMinY = Math.min(courtyardBottomY, pinToeBottomY - 0.25);
+  const crtMaxY = Math.max(courtyardTopY, pinToeTopY + 0.25);
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
@@ -7146,6 +7230,8 @@ var get2CcwSot2235Coords = (parameters) => {
 };
 var sot223_5 = (parameters) => {
   const pads = [];
+  let padOuterHalfX = 0;
+  let padOuterHalfY = 0;
   for (let i = 1; i <= parameters.num_pins; i++) {
     const { x, y } = get2CcwSot2235Coords({
       h: Number.parseFloat(parameters.h),
@@ -7162,6 +7248,8 @@ var sot223_5 = (parameters) => {
       pinWidth = 1;
       pinLength = 2.2;
     }
+    padOuterHalfX = Math.max(padOuterHalfX, Math.abs(x) + pinLength / 2);
+    padOuterHalfY = Math.max(padOuterHalfY, Math.abs(y) + pinWidth / 2);
     pads.push(rectpad(i, x, y, pinLength, pinWidth));
   }
   const width = Number.parseFloat(parameters.w) / 2 - 2.4;
@@ -7191,21 +7279,28 @@ var sot223_5 = (parameters) => {
     stroke_width: 0.1
   };
   const silkscreenRefText = silkscreenRef(0, 0, 0.3);
-  const w = Number.parseFloat(parameters.w);
-  const courtyardPadding = 0.25;
-  const padOuterX = w / 2 - 1.2 + 2.2 / 2;
-  const crtMinX = -(padOuterX + courtyardPadding);
-  const crtMaxX = padOuterX + courtyardPadding;
-  const h5 = Number.parseFloat(parameters.h);
-  const crtMinY = -(Math.max(h5 / 2, 2.25 + 0.5) + courtyardPadding);
-  const crtMaxY = Math.max(h5 / 2, 2.25 + 0.5) + courtyardPadding;
+  const courtyardStepOuterHalfWidth = padOuterHalfX + 0.25;
+  const courtyardStepInnerHalfWidth = courtyardStepOuterHalfWidth;
+  const courtyardStepOuterHalfHeight = padOuterHalfY + 0.85;
+  const courtyardStepInnerHalfHeight = courtyardStepOuterHalfHeight;
   const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    outline: createRectUnionOutline([
+      {
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
+      },
+      {
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
+      }
+    ]),
     layer: "top"
   };
   return [
@@ -7538,6 +7633,26 @@ var jst_def = base_def.extend({
   ),
   string: z61.string().optional()
 });
+var createEmptyBounds = () => ({
+  minX: Number.POSITIVE_INFINITY,
+  maxX: Number.NEGATIVE_INFINITY,
+  minY: Number.POSITIVE_INFINITY,
+  maxY: Number.NEGATIVE_INFINITY
+});
+var modifyBoundsToIncludeRect = ({
+  bounds,
+  centerX,
+  centerY,
+  width,
+  height
+}) => {
+  const halfWidth = width / 2;
+  const halfHeight = height / 2;
+  bounds.minX = Math.min(bounds.minX, centerX - halfWidth);
+  bounds.maxX = Math.max(bounds.maxX, centerX + halfWidth);
+  bounds.minY = Math.min(bounds.minY, centerY - halfHeight);
+  bounds.maxY = Math.max(bounds.maxY, centerY + halfHeight);
+};
 var variantDefaults = {
   ph: {
     p: length48.parse("2.2mm"),
@@ -7569,8 +7684,17 @@ function getVariant(params) {
   if (params.zh) return "zh";
   return "ph";
 }
-function generatePads(variant, numPins, p, id, pw, pl) {
+function generatePads({
+  variant,
+  numPins,
+  p,
+  id,
+  pw,
+  pl
+}) {
   const pads = [];
+  const padBounds = createEmptyBounds();
+  let maxPadHalfY = 0;
   if (variant === "ph") {
     const startX = -((numPins - 1) / 2) * p;
     for (let i = 0; i < numPins; i++) {
@@ -7585,6 +7709,14 @@ function generatePads(variant, numPins, p, id, pw, pl) {
           rectPadHeight: pl
         })
       );
+      modifyBoundsToIncludeRect({
+        bounds: padBounds,
+        centerX: x,
+        centerY: 2,
+        width: pw,
+        height: pl
+      });
+      maxPadHalfY = Math.max(maxPadHalfY, pl / 2);
     }
   } else if (variant === "zh") {
     const startX = -((numPins - 1) / 2) * p;
@@ -7605,20 +7737,57 @@ function generatePads(variant, numPins, p, id, pw, pl) {
       } else {
         pads.push(platedHolePill(i + 1, x, 0, id, pw, pl));
       }
+      modifyBoundsToIncludeRect({
+        bounds: padBounds,
+        centerX: x,
+        centerY: 0,
+        width: pw,
+        height: pl
+      });
+      maxPadHalfY = Math.max(maxPadHalfY, pl / 2);
     }
   } else {
     const startX = -((numPins - 1) / 2) * p;
     for (let i = 0; i < numPins; i++) {
       const x = startX + i * p;
       pads.push(rectpad(i + 1, x, -1.325, pw, pl));
+      modifyBoundsToIncludeRect({
+        bounds: padBounds,
+        centerX: x,
+        centerY: -1.325,
+        width: pw,
+        height: pl
+      });
+      maxPadHalfY = Math.max(maxPadHalfY, pl / 2);
     }
     const sideOffset = (numPins - 1) / 2 * p + 1.3;
     pads.push(rectpad(numPins + 1, -sideOffset, 1.22, 1.2, 1.8));
     pads.push(rectpad(numPins + 2, sideOffset, 1.22, 1.2, 1.8));
+    modifyBoundsToIncludeRect({
+      bounds: padBounds,
+      centerX: -sideOffset,
+      centerY: 1.22,
+      width: 1.2,
+      height: 1.8
+    });
+    modifyBoundsToIncludeRect({
+      bounds: padBounds,
+      centerX: sideOffset,
+      centerY: 1.22,
+      width: 1.2,
+      height: 1.8
+    });
+    maxPadHalfY = Math.max(maxPadHalfY, 0.9);
   }
-  return pads;
+  return { pads, padBounds, maxPadHalfY };
 }
-function generateSilkscreenBody(variant, w, h, numPins, p) {
+function generateSilkscreenBody({
+  variant,
+  w,
+  h,
+  numPins,
+  p
+}) {
   if (variant === "ph") {
     return {
       type: "pcb_silkscreen_path",
@@ -7700,34 +7869,37 @@ var jst = (raw_params) => {
       `JST requires an explicit pin count (e.g. jst6_sh or .jst(6))${params.string ? `, from string "${params.string}"` : ""}`
     );
   }
-  const pads = generatePads(variant, numPins, p, id, pw, pl);
-  const silkscreenBody = generateSilkscreenBody(variant, w, h, numPins, p);
+  const padGeometry = generatePads({
+    variant,
+    numPins,
+    p,
+    id,
+    pw,
+    pl
+  });
+  const { pads, padBounds, maxPadHalfY } = padGeometry;
+  const silkscreenBody = generateSilkscreenBody({
+    variant,
+    w,
+    h,
+    numPins,
+    p
+  });
   const silkscreenRefText = silkscreenRef(0, h / 2 + 1, 0.5);
-  const courtyardPadding = 0.25;
-  let crtMinX;
-  let crtMaxX;
-  let crtMinY;
-  let crtMaxY;
-  if (variant === "ph") {
-    const pinHalfSpan = (numPins - 1) / 2 * p + pw / 2;
-    crtMinX = -Math.max(pinHalfSpan, 3) - courtyardPadding;
-    crtMaxX = Math.max(pinHalfSpan, 3) + courtyardPadding;
-    crtMinY = -2 - courtyardPadding;
-    crtMaxY = 3 + courtyardPadding;
-  } else if (variant === "sh") {
-    const sideOffset = (numPins - 1) / 2 * p + 1.3;
-    crtMinX = -(sideOffset + 0.6 + courtyardPadding);
-    crtMaxX = sideOffset + 0.6 + courtyardPadding;
-    crtMinY = -1.325 - pl / 2 - courtyardPadding;
-    crtMaxY = 1.22 + 0.9 + courtyardPadding;
-  } else {
-    const pinSpan = (numPins - 1) * p;
-    const bodyHalfW = pinSpan / 2 + 1.5;
-    crtMinX = -(bodyHalfW + courtyardPadding);
-    crtMaxX = bodyHalfW + courtyardPadding;
-    crtMinY = -h / 2 - courtyardPadding;
-    crtMaxY = h / 2 + courtyardPadding;
-  }
+  const silkscreenXs = silkscreenBody.route.map((point) => point.x);
+  const silkscreenYs = silkscreenBody.route.map((point) => point.y);
+  const hasSilkscreenGeometry = silkscreenXs.length > 0 && silkscreenYs.length > 0;
+  const featureMinX = hasSilkscreenGeometry ? Math.min(padBounds.minX, Math.min(...silkscreenXs)) : padBounds.minX;
+  const featureMaxX = hasSilkscreenGeometry ? Math.max(padBounds.maxX, Math.max(...silkscreenXs)) : padBounds.maxX;
+  const featureMinY = hasSilkscreenGeometry ? Math.min(padBounds.minY, Math.min(...silkscreenYs)) : padBounds.minY;
+  const featureMaxY = hasSilkscreenGeometry ? Math.max(padBounds.maxY, Math.max(...silkscreenYs)) : padBounds.maxY;
+  const courtyardSideClearanceX = 0.5;
+  const courtyardFrontClearanceY = 0.05;
+  const courtyardRearClearanceY = maxPadHalfY + 0.085;
+  const crtMinX = featureMinX - courtyardSideClearanceX;
+  const crtMaxX = featureMaxX + courtyardSideClearanceX;
+  const crtMinY = featureMinY - courtyardRearClearanceY;
+  const crtMaxY = featureMaxY + courtyardFrontClearanceY;
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
@@ -7959,14 +8131,11 @@ var vssop = (raw_params) => {
     silkscreenBoxHeight / 2 + 0.5,
     0.3
   );
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const pinRowSpanY = (parameters.num_pins / 2 - 1) * p + pw;
-  const courtyardStepInnerHalfX = roundToCourtyardGrid(w / 2 + 0.25);
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(
-    courtyardStepInnerHalfX + 1.43
-  );
-  const courtyardStepInnerHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.255);
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(h / 2 + 0.25);
+  const courtyardStepInnerHalfWidth = w / 2 + 0.25;
+  const courtyardStepOuterHalfWidth = courtyardStepInnerHalfWidth + 1.43;
+  const courtyardStepInnerHalfHeight = pinRowSpanY / 2 + 0.255;
+  const courtyardStepOuterHalfHeight = h / 2 + 0.25;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
@@ -7974,16 +8143,16 @@ var vssop = (raw_params) => {
     layer: "top",
     outline: createRectUnionOutline([
       {
-        minX: -courtyardStepOuterHalfX,
-        maxX: courtyardStepOuterHalfX,
-        minY: -courtyardStepInnerHalfY,
-        maxY: courtyardStepInnerHalfY
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
       },
       {
-        minX: -courtyardStepInnerHalfX,
-        maxX: courtyardStepInnerHalfX,
-        minY: -courtyardStepOuterHalfY,
-        maxY: courtyardStepOuterHalfY
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
       }
     ])
   };
@@ -8134,14 +8303,11 @@ var msop = (raw_params) => {
     silkscreenBoxHeight / 2 + 0.5,
     0.3
   );
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const pinRowSpanY = (parameters.num_pins / 2 - 1) * p + pw;
-  const courtyardStepInnerHalfX = roundToCourtyardGrid(w / 2 + 0.25);
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(
-    courtyardStepInnerHalfX + 1.43
-  );
-  const courtyardStepInnerHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.255);
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(h / 2 + 0.25);
+  const courtyardStepInnerHalfWidth = w / 2 + 0.25;
+  const courtyardStepOuterHalfWidth = courtyardStepInnerHalfWidth + 1.43;
+  const courtyardStepInnerHalfHeight = pinRowSpanY / 2 + 0.255;
+  const courtyardStepOuterHalfHeight = h / 2 + 0.25;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
@@ -8149,16 +8315,16 @@ var msop = (raw_params) => {
     layer: "top",
     outline: createRectUnionOutline([
       {
-        minX: -courtyardStepOuterHalfX,
-        maxX: courtyardStepOuterHalfX,
-        minY: -courtyardStepInnerHalfY,
-        maxY: courtyardStepInnerHalfY
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
       },
       {
-        minX: -courtyardStepInnerHalfX,
-        maxX: courtyardStepInnerHalfX,
-        minY: -courtyardStepOuterHalfY,
-        maxY: courtyardStepOuterHalfY
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
       }
     ])
   };
@@ -8452,16 +8618,15 @@ var son = (raw_params) => {
     silkscreenBoxHeight / 2 + 0.5,
     0.3
   );
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const pinColumnCenterX = Math.abs(
     getSonPadCoord(parameters.num_pins, 1, w, p).x
   );
   const pinRowSpanY = (parameters.num_pins / 2 - 1) * p + pw;
   const pinRowSpanX = pinColumnCenterX * 2 + pl;
-  const courtyardStepInnerHalfX = roundToCourtyardGrid(w / 2 + 0.25);
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(pinRowSpanX / 2 + 0.25);
-  const courtyardStepInnerHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.25);
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(h / 2 + 0.25);
+  const courtyardStepInnerHalfWidth = w / 2 + 0.25;
+  const courtyardStepOuterHalfWidth = pinRowSpanX / 2 + 0.25;
+  const courtyardStepInnerHalfHeight = pinRowSpanY / 2 + 0.25;
+  const courtyardStepOuterHalfHeight = h / 2 + 0.25;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
@@ -8469,16 +8634,16 @@ var son = (raw_params) => {
     layer: "top",
     outline: createRectUnionOutline([
       {
-        minX: -courtyardStepOuterHalfX,
-        maxX: courtyardStepOuterHalfX,
-        minY: -courtyardStepInnerHalfY,
-        maxY: courtyardStepInnerHalfY
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
       },
       {
-        minX: -courtyardStepInnerHalfX,
-        maxX: courtyardStepInnerHalfX,
-        minY: -courtyardStepOuterHalfY,
-        maxY: courtyardStepOuterHalfY
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
       }
     ])
   };
@@ -8544,20 +8709,46 @@ var vson = (raw_params) => {
     grid.y / 2 + p,
     grid.y / 6
   );
-  const courtyardPadding = 0.25;
-  const centerY = (num_pins / 2 - 1) * p / 2;
-  const crtMinX = -(w / 2 + pinw / 2 + courtyardPadding);
-  const crtMaxX = w / 2 + pinw / 2 + courtyardPadding;
-  const crtMinY = -(Math.max(grid.y / 2, centerY + pinh / 2) + courtyardPadding);
-  const crtMaxY = Math.max(grid.y / 2, centerY + pinh / 2) + courtyardPadding;
+  const pinRowSpanY = (num_pins / 2 - 1) * p + pinh;
+  const pinRowSpanX = w + pinw;
+  const courtyardStepInnerHalfWidth = grid.x / 2 + 0.25;
+  const courtyardStepOuterHalfWidth = pinRowSpanX / 2 + 0.25;
+  const pinRowCourtyardHalfY = pinRowSpanY / 2 + 0.25;
+  const pinRowExtendedCourtyardHalfY = pinRowSpanY / 2 + 0.45 + Math.max(0, 0.8 - p);
+  const courtyardStepOuterHalfHeight = Math.min(
+    grid.y / 2 + 0.25,
+    pinRowExtendedCourtyardHalfY
+  );
+  const courtyardStepNotchDepthY = Math.max(
+    0,
+    0.37 - Math.max(
+      0,
+      courtyardStepOuterHalfWidth - courtyardStepInnerHalfWidth - 0.38
+    ) * 1.4
+  );
+  const courtyardStepInnerHalfHeight = Math.max(
+    pinRowCourtyardHalfY,
+    courtyardStepOuterHalfHeight - courtyardStepNotchDepthY
+  );
   const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
-    layer: "top"
+    layer: "top",
+    outline: createRectUnionOutline([
+      {
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
+      },
+      {
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
+      }
+    ])
   };
   return {
     circuitJson: [...pads, ...silkscreenPaths, silkscreenRefText, courtyard],
@@ -9227,20 +9418,16 @@ var electrolytic = (raw_params) => {
     pcb_silkscreen_path_id: ""
   };
   const silkscreenRefText = silkscreenRef(0, d / 2 + 1, 0.5);
-  const bodyR = d / 2 + 0.1;
-  const plusLeftExtent = Math.abs(X) + Size;
-  const courtyardPadding = 0.25;
-  const crtMinX = -Math.max(bodyR, plusLeftExtent) - courtyardPadding;
-  const crtMaxX = bodyR + courtyardPadding;
-  const crtMinY = -(bodyR + courtyardPadding);
-  const crtMaxY = bodyR + courtyardPadding;
+  const bodyOuterRadius = d / 2;
+  const pinOuterRadius = p / 2 + od / 2;
+  const courtyardClearance = 0.25;
+  const courtyardRadius = Math.max(bodyOuterRadius, pinOuterRadius) + courtyardClearance;
   const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
+    type: "pcb_courtyard_circle",
+    pcb_courtyard_circle_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: 0 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    center: { x: 0, y: 0 },
+    radius: courtyardRadius,
     layer: "top"
   };
   return {
@@ -9730,21 +9917,32 @@ var sotWithoutParsing = (parameters) => {
   const p_val = Number.parseFloat(parameters.p);
   const pl_val = Number.parseFloat(parameters.pl);
   const pw_val = Number.parseFloat(parameters.pw);
-  const courtyardPadding = 0.25;
-  const padCenterX = h_val / 2 + 0.5;
-  const silkscreenY = h_val / 2 + p_val / 1.3;
-  const crtMinX = -(padCenterX + pl_val / 2 + courtyardPadding);
-  const crtMaxX = padCenterX + pl_val / 2 + courtyardPadding;
-  const crtMinY = -(Math.max(silkscreenY, p_val + pw_val / 2) + courtyardPadding);
-  const crtMaxY = Math.max(silkscreenY, p_val + pw_val / 2) + courtyardPadding;
+  const pinColumnCenterX = h_val / 2 + 0.5;
+  const pinRowSpanY = p_val * 2 + pw_val;
+  const pinToeHalfSpanX = pinColumnCenterX + pl_val / 2;
+  const courtyardStepInnerHalfWidth = h_val / 2 + 0.25;
+  const courtyardStepOuterHalfWidth = pinToeHalfSpanX + 0.25;
+  const courtyardStepInnerHalfHeight = pinRowSpanY / 2 + 0.2;
+  const courtyardStepOuterHalfHeight = courtyardStepInnerHalfHeight + 0.2;
   const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
+    type: "pcb_courtyard_outline",
+    pcb_courtyard_outline_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
-    layer: "top"
+    layer: "top",
+    outline: createRectUnionOutline([
+      {
+        minX: -courtyardStepOuterHalfWidth,
+        maxX: courtyardStepOuterHalfWidth,
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
+      },
+      {
+        minX: -courtyardStepInnerHalfWidth,
+        maxX: courtyardStepInnerHalfWidth,
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
+      }
+    ])
   };
   return [
     ...pads,