@tscircuit/footprinter 0.0.344 → 0.0.346

package/dist/index.js

@@ -411,29 +411,28 @@ var dip = (raw_params) => {
     });
   }
   const silkscreenRefText = silkscreenRef(0, sh / 2 + 0.5, 0.4);
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const pinRowSpanX = parameters.w + parameters.od;
   const pinRowSpanY = padEdgeHeight;
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(pinRowSpanX / 2 + 0.25);
-  const courtyardStepInnerHalfX = courtyardStepOuterHalfX;
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(pinRowSpanY / 2 + 0.72);
-  const courtyardStepInnerHalfY = courtyardStepOuterHalfY;
+  const courtyardStepOuterHalfWidth = pinRowSpanX / 2 + 0.25;
+  const courtyardStepInnerHalfWidth = courtyardStepOuterHalfWidth;
+  const courtyardStepOuterHalfHeight = pinRowSpanY / 2 + 0.72;
+  const courtyardStepInnerHalfHeight = courtyardStepOuterHalfHeight;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
     pcb_component_id: "",
     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
       }
     ]),
     layer: "top"
@@ -1290,39 +1289,34 @@ var bga = (raw_params) => {
     route: markerRoute,
     stroke_width: 0.05
   };
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const padSpanX = (grid.x - 1) * p + pad2;
   const padSpanY = (grid.y - 1) * p + pad2;
   const bodySpanX = w ?? padSpanX;
   const bodySpanY = h ?? padSpanY;
-  const courtyardEnvelopeHalfX = Math.max(padSpanX / 2, bodySpanX / 2);
-  const courtyardEnvelopeHalfY = Math.max(padSpanY / 2, bodySpanY / 2);
+  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 courtyardStepOuterHalfX = roundToCourtyardGrid(
-    courtyardEnvelopeHalfX + courtyardClearanceX
-  );
-  const courtyardStepInnerHalfX = courtyardStepOuterHalfX;
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(
-    courtyardEnvelopeHalfY + courtyardClearanceY
-  );
-  const courtyardStepInnerHalfY = courtyardStepOuterHalfY;
+  const courtyardStepOuterHalfWidth = courtyardEnvelopeHalfWidth + courtyardClearanceX;
+  const courtyardStepInnerHalfWidth = courtyardStepOuterHalfWidth;
+  const courtyardStepOuterHalfHeight = courtyardEnvelopeHalfHeight + courtyardClearanceY;
+  const courtyardStepInnerHalfHeight = courtyardStepOuterHalfHeight;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
     pcb_component_id: "",
     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
       }
     ]),
     layer: "top"
@@ -1448,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: "",
@@ -1463,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
       }
     ])
   };
@@ -1814,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 = {
@@ -1837,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
       }
     ])
   };
@@ -2079,30 +2069,29 @@ var ssop = (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 padToeHalfX = parameters.legsoutside ? parameters.w / 2 + parameters.pl : (parameters.w + 0.2) / 2 + parameters.pl / 2;
   const pinRowHalfY = pinRowSpanY / 2;
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(padToeHalfX + 0.25);
-  const courtyardStepInnerHalfX = courtyardStepOuterHalfX;
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(pinRowHalfY + 0.445);
-  const courtyardStepInnerHalfY = courtyardStepOuterHalfY;
+  const courtyardStepOuterHalfWidth = padToeHalfX + 0.25;
+  const courtyardStepInnerHalfWidth = courtyardStepOuterHalfWidth;
+  const courtyardStepOuterHalfHeight = pinRowHalfY + 0.445;
+  const courtyardStepInnerHalfHeight = courtyardStepOuterHalfHeight;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
     pcb_component_id: "",
     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
       }
     ]),
     layer: "top"
@@ -2183,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: "",
@@ -2199,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
       }
     ])
   };
@@ -3139,17 +3125,29 @@ var pinrow = (raw_params) => {
     }
   }
   const refText = silkscreenRef(0, p, 0.5);
-  const halfSpanX = (numPinsPerRow - 1) / 2 * p;
-  const padHalfX = parameters.smd ? parameters.pw / 2 : od / 2;
-  const padHalfY = parameters.smd ? parameters.pl / 2 : od / 2;
-  const courtyardPadding = 0.25;
+  const padHalfWidth = parameters.smd ? parameters.pw / 2 : od / 2;
+  const padHalfHeight = parameters.smd ? parameters.pl / 2 : od / 2;
+  const pinRowSpanX = (numPinsPerRow - 1) * p;
+  const pinRowSpanY = (rows - 1) * p;
+  const padOuterHalfWidth = pinRowSpanX / 2 + padHalfWidth;
+  const padOuterHalfHeight = pinRowSpanY / 2 + padHalfHeight;
+  const bodyHalfWidth = pinRowSpanX / 2 + p / 2;
+  const bodyHalfHeight = pinRowSpanY / 2 + p / 2;
+  const courtyardHalfWidth = Math.max(
+    padOuterHalfWidth + 0.25,
+    bodyHalfWidth + 0.5
+  );
+  const courtyardHalfHeight = Math.max(
+    padOuterHalfHeight + 0.25,
+    bodyHalfHeight + 0.5
+  );
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
     pcb_component_id: "",
     center: { x: 0, y: -((rows - 1) * p) / 2 },
-    width: 2 * (halfSpanX + padHalfX + courtyardPadding),
-    height: (rows - 1) * p + 2 * (padHalfY + courtyardPadding),
+    width: 2 * courtyardHalfWidth,
+    height: 2 * courtyardHalfHeight,
     layer: "top"
   };
   return {
@@ -3460,21 +3458,16 @@ var axial = (raw_params) => {
     pcb_silkscreen_path_id: ""
   };
   const silkscreenRefText = silkscreenRef(0, 1.5, 0.5);
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const pin1CenterX = -p / 2;
   const pin2CenterX = p / 2;
   const pinPadHalfX = od / 2;
   const pinPadHalfY = od / 2;
-  const courtyardStepOuterMinX = roundToCourtyardGrid(
-    pin1CenterX - pinPadHalfX - 0.35
-  );
-  const courtyardStepOuterMaxX = roundToCourtyardGrid(
-    pin2CenterX + pinPadHalfX + 0.26
-  );
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(pinPadHalfY + 0.35);
+  const courtyardStepOuterMinX = pin1CenterX - pinPadHalfX - 0.35;
+  const courtyardStepOuterMaxX = pin2CenterX + pinPadHalfX + 0.26;
+  const courtyardStepOuterHalfHeight = pinPadHalfY + 0.35;
   const courtyardStepInnerMinX = courtyardStepOuterMinX;
   const courtyardStepInnerMaxX = courtyardStepOuterMaxX;
-  const courtyardStepInnerHalfY = courtyardStepOuterHalfY;
+  const courtyardStepInnerHalfHeight = courtyardStepOuterHalfHeight;
   const courtyard = {
     type: "pcb_courtyard_outline",
     pcb_courtyard_outline_id: "",
@@ -3483,14 +3476,14 @@ var axial = (raw_params) => {
       {
         minX: courtyardStepOuterMinX,
         maxX: courtyardStepOuterMaxX,
-        minY: -courtyardStepInnerHalfY,
-        maxY: courtyardStepInnerHalfY
+        minY: -courtyardStepInnerHalfHeight,
+        maxY: courtyardStepInnerHalfHeight
       },
       {
         minX: courtyardStepInnerMinX,
         maxX: courtyardStepInnerMaxX,
-        minY: -courtyardStepOuterHalfY,
-        maxY: courtyardStepOuterHalfY
+        minY: -courtyardStepOuterHalfHeight,
+        maxY: courtyardStepOuterHalfHeight
       }
     ]),
     layer: "top"
@@ -3716,15 +3709,20 @@ var pushbutton = (raw_params) => {
     height / 2 + 0.4,
     0.5
   );
-  const outerRadius = holeDiameter * 1.5 / 2;
-  const courtyardPadding = 0.25;
+  const padOuterRadius = holeDiameter * 1.5 / 2;
+  const pinRowSpanX = width;
+  const pinRowSpanY = height;
+  const padOuterHalfWidth = pinRowSpanX / 2 + padOuterRadius;
+  const padOuterHalfHeight = pinRowSpanY / 2 + padOuterRadius;
+  const courtyardHalfWidth = padOuterHalfWidth + 0.5;
+  const courtyardHalfHeight = padOuterHalfHeight + 0.5;
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
     pcb_component_id: "",
     center: { x: 0, y: 0 },
-    width: width + 2 * outerRadius + 2 * courtyardPadding,
-    height: height + 2 * outerRadius + 2 * courtyardPadding,
+    width: 2 * courtyardHalfWidth,
+    height: 2 * courtyardHalfHeight,
     layer: "top"
   };
   return {
@@ -4685,6 +4683,79 @@ import {
   length as length25
 } from "circuit-json";
 import { z as z33 } from "zod";
+
+// src/helpers/capsule-outline.ts
+var createCapsuleOutline = (options) => {
+  const {
+    centerX,
+    centerY,
+    straightHalfLength,
+    radius,
+    arcSegmentCount = 9,
+    orientation = "horizontal"
+  } = options;
+  if (straightHalfLength < 0) {
+    throw new Error("Capsule straightHalfLength must be non-negative");
+  }
+  if (radius <= 0) {
+    throw new Error("Capsule radius must be positive");
+  }
+  if (arcSegmentCount < 2) {
+    throw new Error("Capsule arcSegmentCount must be at least 2");
+  }
+  if (orientation === "horizontal") {
+    const leftCenterX = centerX - straightHalfLength;
+    const rightCenterX = centerX + straightHalfLength;
+    const rightArc = Array.from({ length: arcSegmentCount + 1 }, (_, i) => {
+      const theta = Math.PI / 2 - i * Math.PI / arcSegmentCount;
+      return {
+        x: rightCenterX + Math.cos(theta) * radius,
+        y: centerY + Math.sin(theta) * radius
+      };
+    });
+    const leftArc = Array.from({ length: arcSegmentCount + 1 }, (_, i) => {
+      const theta = -Math.PI / 2 + i * Math.PI / arcSegmentCount;
+      return {
+        x: leftCenterX - Math.cos(theta) * radius,
+        y: centerY + Math.sin(theta) * radius
+      };
+    });
+    return [
+      { x: leftCenterX, y: centerY + radius },
+      { x: rightCenterX, y: centerY + radius },
+      ...rightArc.slice(1, -1),
+      { x: rightCenterX, y: centerY - radius },
+      { x: leftCenterX, y: centerY - radius },
+      ...leftArc.slice(1, -1)
+    ];
+  }
+  const bottomCenterY = centerY - straightHalfLength;
+  const topCenterY = centerY + straightHalfLength;
+  const topArc = Array.from({ length: arcSegmentCount + 1 }, (_, i) => {
+    const theta = Math.PI - i * Math.PI / arcSegmentCount;
+    return {
+      x: centerX + Math.cos(theta) * radius,
+      y: topCenterY + Math.sin(theta) * radius
+    };
+  });
+  const bottomArc = Array.from({ length: arcSegmentCount + 1 }, (_, i) => {
+    const theta = i * Math.PI / arcSegmentCount;
+    return {
+      x: centerX + Math.cos(theta) * radius,
+      y: bottomCenterY - Math.sin(theta) * radius
+    };
+  });
+  return [
+    { x: centerX - radius, y: bottomCenterY },
+    { x: centerX - radius, y: topCenterY },
+    ...topArc.slice(1, -1),
+    { x: centerX + radius, y: topCenterY },
+    { x: centerX + radius, y: bottomCenterY },
+    ...bottomArc.slice(1, -1)
+  ];
+};
+
+// src/fn/hc49.ts
 var generate_u_curve = (centerX, centerY, radius, direction) => {
   return Array.from({ length: 25 }, (_, i) => {
     const theta = i / 24 * Math.PI - Math.PI / 2;
@@ -4729,18 +4800,20 @@ var hc49 = (raw_params) => {
     pcb_silkscreen_path_id: ""
   };
   const silkscreenRefText = silkscreenRef(0, p / 4, 0.5);
-  const courtyardPadding = 0.25;
-  const crtMinX = -(w / 2 + radius + courtyardPadding);
-  const crtMaxX = w / 2 + radius + courtyardPadding;
-  const crtMinY = -(radius + courtyardPadding);
-  const crtMaxY = radius + courtyardPadding;
+  const padRowHalfWidth = p / 2 + od / 2;
+  const courtyardCapsuleStraightHalfLength = padRowHalfWidth;
+  const courtyardCapsuleRadius = Math.max(h / 2 + 0.25, w / 2 + 0.03);
   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: createCapsuleOutline({
+      centerX: 0,
+      centerY: 0,
+      straightHalfLength: courtyardCapsuleStraightHalfLength,
+      radius: courtyardCapsuleRadius,
+      arcSegmentCount: 9
+    }),
     layer: "top"
   };
   return {
@@ -5060,12 +5133,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: "",
@@ -5073,16 +5145,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
       }
     ])
   };
@@ -5412,43 +5484,36 @@ var sod923 = (raw_params) => {
     stroke_width: 0.1,
     pcb_silkscreen_path_id: ""
   };
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
   const pinRowSpanX = p + pl;
   const pinRowSpanY = pw;
   const bodyHalfX = w / 2;
   const bodyHalfY = h / 2;
   const pinToeHalfX = pinRowSpanX / 2;
   const pinRowHalfY = pinRowSpanY / 2;
-  const courtyardEnvelopeHalfX = Math.max(bodyHalfX, pinToeHalfX);
-  const courtyardEnvelopeHalfY = Math.max(bodyHalfY, pinRowHalfY);
-  const courtyardNarrowHalfX = Math.min(bodyHalfX, pinToeHalfX);
-  const courtyardNarrowHalfY = Math.min(bodyHalfY, pinRowHalfY);
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(
-    courtyardEnvelopeHalfX + 0.05
-  );
-  const courtyardStepInnerHalfX = roundToCourtyardGrid(
-    courtyardNarrowHalfX - 0.055
-  );
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(courtyardEnvelopeHalfY);
-  const courtyardStepInnerHalfY = roundToCourtyardGrid(
-    courtyardNarrowHalfY + 0.155
-  );
+  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_outline",
     pcb_courtyard_outline_id: "",
     pcb_component_id: "",
     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
       }
     ]),
     layer: "top"
@@ -6279,11 +6344,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: "",
@@ -7157,6 +7230,8 @@ var get2CcwSot223Coords = (parameters) => {
 };
 var sot223_4 = (parameters) => {
   const pads = [];
+  let padOuterHalfWidth = 0;
+  let padOuterHalfHeight = 0;
   for (let i = 0; i < parameters.num_pins; i++) {
     const { x, y } = get2CcwSot223Coords({
       num_pins: parameters.num_pins,
@@ -7167,7 +7242,13 @@ var sot223_4 = (parameters) => {
       p: Number.parseFloat(parameters.p)
     });
     const pinWidth = i === 3 ? 3.8 : Number.parseFloat(parameters.pw);
-    pads.push(rectpad(i + 1, x, y, Number.parseFloat(parameters.pl), pinWidth));
+    const pinLength = Number.parseFloat(parameters.pl);
+    padOuterHalfWidth = Math.max(padOuterHalfWidth, Math.abs(x) + pinLength / 2);
+    padOuterHalfHeight = Math.max(
+      padOuterHalfHeight,
+      Math.abs(y) + pinWidth / 2
+    );
+    pads.push(rectpad(i + 1, x, y, pinLength, pinWidth));
   }
   const silkscreenRefText = silkscreenRef(0, 0, 0.3);
   const width = Number.parseFloat(parameters.w) / 2 - 2.4;
@@ -7196,23 +7277,23 @@ var sot223_4 = (parameters) => {
     type: "pcb_silkscreen_path",
     stroke_width: 0.1
   };
-  const w = Number.parseFloat(parameters.w);
-  const pl = Number.parseFloat(parameters.pl);
-  const p = Number.parseFloat(parameters.p);
-  const pw = Number.parseFloat(parameters.pw);
-  const courtyardPadding = 0.25;
-  const padCenterX = w / 2 - 1.1;
-  const crtMinX = -(padCenterX + pl / 2 + courtyardPadding);
-  const crtMaxX = padCenterX + pl / 2 + courtyardPadding;
-  const crtMinY = -(p + pw / 2 + courtyardPadding);
-  const crtMaxY = p + pw / 2 + courtyardPadding;
+  const bodyHalfWidth = Number.parseFloat(parameters.w) / 2;
+  const bodyHalfHeight = Number.parseFloat(parameters.h) / 2;
+  const courtyardHalfWidth = Math.max(
+    padOuterHalfWidth + 0.25,
+    bodyHalfWidth + 0.15
+  );
+  const courtyardHalfHeight = Math.max(
+    padOuterHalfHeight + 0.25,
+    bodyHalfHeight + 0.15
+  );
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    center: { x: 0, y: 0 },
+    width: 2 * courtyardHalfWidth,
+    height: 2 * courtyardHalfHeight,
     layer: "top"
   };
   return [
@@ -7249,8 +7330,8 @@ var get2CcwSot2235Coords = (parameters) => {
 };
 var sot223_5 = (parameters) => {
   const pads = [];
-  let padOuterHalfX = 0;
-  let padOuterHalfY = 0;
+  let padOuterHalfWidth = 0;
+  let padOuterHalfHeight = 0;
   for (let i = 1; i <= parameters.num_pins; i++) {
     const { x, y } = get2CcwSot2235Coords({
       h: Number.parseFloat(parameters.h),
@@ -7267,8 +7348,11 @@ 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);
+    padOuterHalfWidth = Math.max(padOuterHalfWidth, Math.abs(x) + pinLength / 2);
+    padOuterHalfHeight = Math.max(
+      padOuterHalfHeight,
+      Math.abs(y) + pinWidth / 2
+    );
     pads.push(rectpad(i, x, y, pinLength, pinWidth));
   }
   const width = Number.parseFloat(parameters.w) / 2 - 2.4;
@@ -7298,29 +7382,23 @@ var sot223_5 = (parameters) => {
     stroke_width: 0.1
   };
   const silkscreenRefText = silkscreenRef(0, 0, 0.3);
-  const roundToCourtyardGrid = (value) => Math.round(value / 0.01) * 0.01;
-  const courtyardStepOuterHalfX = roundToCourtyardGrid(padOuterHalfX + 0.25);
-  const courtyardStepInnerHalfX = courtyardStepOuterHalfX;
-  const courtyardStepOuterHalfY = roundToCourtyardGrid(padOuterHalfY + 0.85);
-  const courtyardStepInnerHalfY = courtyardStepOuterHalfY;
+  const bodyHalfWidth = Number.parseFloat(parameters.w) / 2;
+  const bodyHalfHeight = Number.parseFloat(parameters.h) / 2;
+  const courtyardHalfWidth = Math.max(
+    padOuterHalfWidth + 0.25,
+    bodyHalfWidth + 0.15
+  );
+  const courtyardHalfHeight = Math.max(
+    padOuterHalfHeight + 0.25,
+    bodyHalfHeight + 0.15
+  );
   const courtyard = {
-    type: "pcb_courtyard_outline",
-    pcb_courtyard_outline_id: "",
+    type: "pcb_courtyard_rect",
+    pcb_courtyard_rect_id: "",
     pcb_component_id: "",
-    outline: createRectUnionOutline([
-      {
-        minX: -courtyardStepOuterHalfX,
-        maxX: courtyardStepOuterHalfX,
-        minY: -courtyardStepInnerHalfY,
-        maxY: courtyardStepInnerHalfY
-      },
-      {
-        minX: -courtyardStepInnerHalfX,
-        maxX: courtyardStepInnerHalfX,
-        minY: -courtyardStepOuterHalfY,
-        maxY: courtyardStepOuterHalfY
-      }
-    ]),
+    center: { x: 0, y: 0 },
+    width: 2 * courtyardHalfWidth,
+    height: 2 * courtyardHalfHeight,
     layer: "top"
   };
   return [
@@ -7355,6 +7433,8 @@ var get2CcwSot2236Coords = (parameters) => {
 };
 var sot223_6 = (parameters) => {
   const pads = [];
+  let padOuterHalfWidth = 0;
+  let padOuterHalfHeight = 0;
   for (let i = 1; i <= parameters.num_pins; i++) {
     const { x, y } = get2CcwSot2236Coords({
       h: Number.parseFloat(parameters.h),
@@ -7371,6 +7451,11 @@ var sot223_6 = (parameters) => {
       pinWidth = 0.6;
       pinLength = 2.2;
     }
+    padOuterHalfWidth = Math.max(padOuterHalfWidth, Math.abs(x) + pinLength / 2);
+    padOuterHalfHeight = Math.max(
+      padOuterHalfHeight,
+      Math.abs(y) + pinWidth / 2
+    );
     pads.push(rectpad(i, x, y, pinLength, pinWidth));
   }
   const width = Number.parseFloat(parameters.w) / 2 - 2.4;
@@ -7400,18 +7485,23 @@ var sot223_6 = (parameters) => {
     stroke_width: 0.1
   };
   const silkscreenRefText = silkscreenRef(0, 0, 0.3);
-  const courtyardPadding = 0.25;
-  const crtMinX = -(4.25 + courtyardPadding);
-  const crtMaxX = 4.25 + courtyardPadding;
-  const crtMinY = -(2.9 + courtyardPadding);
-  const crtMaxY = 2.9 + courtyardPadding;
+  const bodyHalfWidth = Number.parseFloat(parameters.w) / 2;
+  const bodyHalfHeight = Number.parseFloat(parameters.h) / 2;
+  const courtyardHalfWidth = Math.max(
+    padOuterHalfWidth + 0.25,
+    bodyHalfWidth + 0.15
+  );
+  const courtyardHalfHeight = Math.max(
+    padOuterHalfHeight + 0.25,
+    bodyHalfHeight + 0.15
+  );
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    center: { x: 0, y: 0 },
+    width: 2 * courtyardHalfWidth,
+    height: 2 * courtyardHalfHeight,
     layer: "top"
   };
   return [
@@ -7516,18 +7606,21 @@ var sot23w_3 = (parameters) => {
   const pl = Number.parseFloat(parameters.pl);
   const pw = Number.parseFloat(parameters.pw);
   const h = Number.parseFloat(parameters.h);
-  const courtyardPadding = 0.25;
-  const crtMinX = -(p + pl / 2 + courtyardPadding);
-  const crtMaxX = p + pl / 2 + courtyardPadding;
-  const crtMinY = -(Math.max(h / 2, 0.95 + pw / 2) + courtyardPadding);
-  const crtMaxY = Math.max(h / 2, 0.95 + pw / 2) + courtyardPadding;
+  const padToeHalfWidth = p + pl / 2;
+  const pinRowHalfHeight = 0.95 + pw / 2;
+  const bodyHalfHeight = h / 2;
+  const courtyardHalfWidth = padToeHalfWidth + 0.25;
+  const courtyardHalfHeight = Math.max(
+    pinRowHalfHeight + 0.25,
+    bodyHalfHeight + 0.09
+  );
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    center: { x: 0, y: 0 },
+    width: 2 * courtyardHalfWidth,
+    height: 2 * courtyardHalfHeight,
     layer: "top"
   };
   return [
@@ -7604,18 +7697,30 @@ var to92s = (raw_params) => {
     pcb_silkscreen_path_id: ""
   };
   const silkscreenRefText = silkscreenRef(0, holeY + 1, 0.5);
-  const od_v = Number.parseFloat(parameters.od);
-  const courtyardPadding = 0.25;
-  const crtHalfX = Math.max(holeY, padSpacing7 + od_v / 2) + courtyardPadding;
-  const crtMinY = -courtyardPadding;
-  const crtMaxY = holeY + 0.5 + courtyardPadding;
+  const padOuterDiameter = Number.parseFloat(parameters.od);
+  const padCenterY = holeY - padSpacing7;
+  const padMinX = -padSpacing7 - padOuterDiameter / 2;
+  const padMaxX = padSpacing7 + padOuterDiameter / 2;
+  const padMinY = padCenterY - padOuterDiameter / 2;
+  const padMaxY = padCenterY + padOuterDiameter / 2;
+  const bodyMinX = -holeY;
+  const bodyMaxX = holeY;
+  const bodyMinY = 0;
+  const bodyMaxY = holeY + 0.5;
+  const courtyardMinX = Math.min(padMinX, bodyMinX) - 0.27;
+  const courtyardMaxX = Math.max(padMaxX, bodyMaxX) + 0.13;
+  const courtyardMinY = Math.min(padMinY, bodyMinY) - 0.42;
+  const courtyardMaxY = Math.max(padMaxY, bodyMaxY) + 0.08;
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
     pcb_component_id: "",
-    center: { x: 0, y: (crtMinY + crtMaxY) / 2 },
-    width: 2 * crtHalfX,
-    height: crtMaxY - crtMinY,
+    center: {
+      x: (courtyardMinX + courtyardMaxX) / 2,
+      y: (courtyardMinY + courtyardMaxY) / 2
+    },
+    width: courtyardMaxX - courtyardMinX,
+    height: courtyardMaxY - courtyardMinY,
     layer: "top"
   };
   return {
@@ -7653,6 +7758,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"),
@@ -7684,8 +7809,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++) {
@@ -7700,6 +7834,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;
@@ -7720,20 +7862,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",
@@ -7815,34 +7994,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: "",
@@ -8074,14 +8256,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: "",
@@ -8089,16 +8268,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
       }
     ])
   };
@@ -8249,14 +8428,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: "",
@@ -8264,16 +8440,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
       }
     ])
   };
@@ -8567,16 +8743,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: "",
@@ -8584,16 +8759,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
       }
     ])
   };
@@ -8659,20 +8834,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],
@@ -8840,18 +9041,18 @@ var solderjumper = (params) => {
   const refOffset = 0.6;
   const refY = outlineCenterY + outlineHeight / 2 + refOffset;
   const silk = silkscreenRef(outlineCenterX, refY, 0.4);
-  const courtyardPadding = 0.25;
-  const crtMinX = outlineCenterX - outlineWidth / 2 - courtyardPadding;
-  const crtMaxX = outlineCenterX + outlineWidth / 2 + courtyardPadding;
-  const crtMinY = -(outlineHeight / 2 + courtyardPadding);
-  const crtMaxY = outlineHeight / 2 + courtyardPadding;
+  const pinRowSpanX = (num_pins - 1) * padSpacing7;
+  const padOuterHalfWidth = pinRowSpanX / 2 + padWidth / 2;
+  const padOuterHalfHeight = padHeight / 2;
+  const courtyardHalfWidth = padOuterHalfWidth + 0.5;
+  const courtyardHalfHeight = padOuterHalfHeight + 0.5;
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: 0 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    center: { x: pinRowSpanX / 2, y: 0 },
+    width: 2 * courtyardHalfWidth,
+    height: 2 * courtyardHalfHeight,
     layer: "top"
   };
   return {
@@ -9003,29 +9204,57 @@ var generateSot457Elements = (params) => {
     ],
     stroke_width: 0.05
   };
-  const courtyardPadding = 0.25;
-  let crtMinX, crtMaxX, crtMinY, crtMaxY;
+  let courtyard;
   if (params.wave) {
-    crtMinX = -(pitch + padWidth / 2 + courtyardPadding);
-    crtMaxX = pitch + padWidth / 2 + courtyardPadding;
-    crtMinY = -(pitch + padLength / 2 + courtyardPadding);
-    crtMaxY = pitch + padLength / 2 + courtyardPadding;
+    const pinRowSpanX = 2 * pitch;
+    const pinRowSpanY = 2 * pitch;
+    const padOuterHalfWidth = pinRowSpanX / 2 + padWidth / 2;
+    const padOuterHalfHeight = pinRowSpanY / 2 + padLength / 2;
+    const courtyardHalfWidth = padOuterHalfWidth + 0.25;
+    const courtyardHalfHeight = padOuterHalfHeight + 0.25;
+    courtyard = {
+      type: "pcb_courtyard_rect",
+      pcb_courtyard_rect_id: "",
+      pcb_component_id: "",
+      center: { x: 0, y: 0 },
+      width: 2 * courtyardHalfWidth,
+      height: 2 * courtyardHalfHeight,
+      layer: "top"
+    };
   } else {
     const padCenterX = width / 2 + 0.1;
-    crtMinX = -(padCenterX + padLength / 2 + courtyardPadding);
-    crtMaxX = padCenterX + padLength / 2 + courtyardPadding;
-    crtMinY = -(pitch + padWidth / 2 + courtyardPadding);
-    crtMaxY = pitch + padWidth / 2 + courtyardPadding;
+    const padToeHalfWidth = padCenterX + padLength / 2;
+    const pinRowHalfHeight = pitch + padWidth / 2;
+    const bodyHalfWidth = width / 2;
+    const bodyHalfHeight = height / 2;
+    const courtyardStepOuterHalfWidth = padToeHalfWidth + 0.25;
+    const courtyardStepInnerHalfWidth = bodyHalfWidth + 0.08;
+    const courtyardStepOuterHalfHeight = pinRowHalfHeight + 0.25;
+    const courtyardStepInnerHalfHeight = Math.max(
+      bodyHalfHeight + 0.45,
+      courtyardStepOuterHalfHeight
+    );
+    courtyard = {
+      type: "pcb_courtyard_outline",
+      pcb_courtyard_outline_id: "",
+      pcb_component_id: "",
+      outline: createRectUnionOutline([
+        {
+          minX: -courtyardStepOuterHalfWidth,
+          maxX: courtyardStepOuterHalfWidth,
+          minY: -courtyardStepOuterHalfHeight,
+          maxY: courtyardStepOuterHalfHeight
+        },
+        {
+          minX: -courtyardStepInnerHalfWidth,
+          maxX: courtyardStepInnerHalfWidth,
+          minY: -courtyardStepInnerHalfHeight,
+          maxY: courtyardStepInnerHalfHeight
+        }
+      ]),
+      layer: "top"
+    };
   }
-  const courtyard = {
-    type: "pcb_courtyard_rect",
-    pcb_courtyard_rect_id: "",
-    pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: (crtMinY + crtMaxY) / 2 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
-    layer: "top"
-  };
   return [
     silkscreenRefText,
     silkscreenPath1,
@@ -9212,20 +9441,19 @@ var potentiometer = (raw_params) => {
   };
   const W = Number.parseFloat(parameters.w) / 2;
   const silkscreenRefText = silkscreenRef(W, y + 1, 0.5);
-  const pad_radius = Number.parseFloat(parameters.od) / 2;
-  const h_hole = Number.parseFloat(parameters.h);
-  const courtyardPadding = 0.25;
-  const crtMinX = -(pad_radius + courtyardPadding);
-  const crtMaxX = Math.max(x, h_hole + pad_radius) + courtyardPadding;
-  const crtMinY = -(y + courtyardPadding);
-  const crtMaxY = y + courtyardPadding;
+  const padRadius = Number.parseFloat(parameters.od) / 2;
+  const pinRowSpanX = Number.parseFloat(parameters.h);
+  const pinRowSpanY = Number.parseFloat(parameters.ca) / 2;
+  const courtyardMinX = -(padRadius + 0.25);
+  const courtyardMaxX = pinRowSpanX + padRadius + 0.25;
+  const courtyardHalfHeight = pinRowSpanY + 0.25;
   const courtyard = {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "",
     pcb_component_id: "",
-    center: { x: (crtMinX + crtMaxX) / 2, y: 0 },
-    width: crtMaxX - crtMinX,
-    height: crtMaxY - crtMinY,
+    center: { x: (courtyardMinX + courtyardMaxX) / 2, y: 0 },
+    width: courtyardMaxX - courtyardMinX,
+    height: 2 * courtyardHalfHeight,
     layer: "top"
   };
   return {
@@ -9342,20 +9570,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 {
@@ -9845,21 +10069,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,