@@ -1,4 +1,3 @@
-import { resolveFootprinterPolarity } from "./utils/resolve-footprinter-polarity"
 import { NormalComponent_doInitialSourcePinSpecificationChecks } from "./NormalComponent_doInitialSourcePinSpecificationChecks"
 import {
   getNumericPinLabels,
@@ -683,8 +682,9 @@ export class NormalComponent<
 
   // Override to choose the effective footprint without rewriting user props.
   resolveFootprint() {
+    // Footprint-driven config can discover ports before props have been parsed.
     return (
-      this._parsedProps.footprint ??
+      this._parsedProps?.footprint ??
       this.props.footprint ??
       this._getImpliedFootprintString?.()
     )
@@ -703,16 +703,7 @@ export class NormalComponent<
       if (parseLibraryFootprintRef(footprint)) return
       let fpCircuitJson: AnyCircuitElement[]
       try {
-        const resolved = resolveFootprinterPolarity({
-          footprint,
-          componentName: this.componentName,
-          name: this.name ?? this.componentName,
-          pinLabels: this._resolvePinLabels(),
-          polarized: this._parsedProps.polarized,
-        })
-        fpCircuitJson = fp
-          .string(resolved.footprint)
-          .soup() as AnyCircuitElement[]
+        fpCircuitJson = fp.string(footprint).soup() as AnyCircuitElement[]
       } catch (error) {
         this._queueInvalidFootprintPropMessage(footprint, error)
         return
@@ -1657,7 +1648,7 @@ export class NormalComponent<
       inferredInternallyConnectedPinNames,
       implicitPinNumberByHint,
     }
-    let { footprint } = this.props
+    let footprint = this.resolveFootprint()
     if (
       typeof footprint === "string" &&
       parseLibraryFootprintRef(footprint) &&
 
@@ -1,3 +1,4 @@
+import { resolvePassiveFootprintDefinition } from "@tscircuit/footprinter"
 import { capacitorProps, resolveManufacturerPartNumber } from "@tscircuit/props"
 import type { SourceSimpleCapacitorInput } from "circuit-json"
 import { formatSiUnit } from "format-si-unit"
@@ -8,29 +9,67 @@ import {
 } from "lib/utils/constants"
 import { symbols } from "schematic-symbols"
 import { NormalComponent } from "../base-components/NormalComponent/NormalComponent"
-import { isFootprinterString } from "../base-components/NormalComponent/utils/isFootprinterString"
-import { resolveFootprinterPolarity } from "../base-components/NormalComponent/utils/resolve-footprinter-polarity"
+import { parseFootprinterDefinition } from "lib/utils/footprints/parse-footprinter-definition"
+import { resolveTwoTerminalPinMapping } from "lib/utils/footprints/resolve-two-terminal-pin-mapping"
 import { Trace } from "../primitive-components/Trace/Trace"
-import { Capacitor_addPolarityFabricationSymbols } from "./Capacitor_addPolarityFabricationSymbols"
 import { Capacitor_getAutomaticMaxDecouplingTraceLength } from "./Capacitor_getAutomaticMaxDecouplingTraceLength"
 
-const CAPACITOR_CHIP_FOOTPRINTS = new Set([
-  "01005",
-  "0201",
-  "0402",
-  "0603",
-  "0805",
-  "1206",
-  "1210",
-  "2010",
-  "2512",
-])
-
 export class Capacitor extends NormalComponent<
   typeof capacitorProps,
   PolarizedPassivePorts
 > {
   _adjustSilkscreenTextAutomatically = true
+  resolveFootprint() {
+    const footprint = super.resolveFootprint()
+    return typeof footprint === "string"
+      ? this.getFootprinterString()
+      : footprint
+  }
+
+  getFootprinterString(): string | null {
+    // Read the authored definition directly: the base CAD getter calls resolveFootprint.
+    const footprint = super.resolveFootprint()
+    if (typeof footprint !== "string") return null
+    const parsed = parseFootprinterDefinition(footprint)
+    if (!parsed) return footprint
+    const { definition, parameters } = parsed
+    const terminals = resolveTwoTerminalPinMapping({
+      name: this.name ?? "Capacitor",
+      pinLabels: this._resolvePinLabels(),
+      explicitPositive: parameters.positivepin,
+      explicitNegative: parameters.negativepin,
+      positiveOption: "positivepin",
+      negativeOption: "negativepin",
+    })
+    const polarized = this._parsedProps.polarized
+    if (
+      polarized &&
+      (parameters.nonpolarized ||
+        parameters.polarized === false ||
+        parameters.polarized === "false")
+    ) {
+      throw new Error(
+        `${this.name} is polarized but its footprint explicitly disables polarity.`,
+      )
+    }
+    let resolved = resolvePassiveFootprintDefinition(definition, {
+      defaultFamily: "cap",
+    })
+    if (
+      parameters.polarized === undefined &&
+      parameters.nonpolarized === undefined
+    ) {
+      resolved += polarized ? "_polarized" : "_nonpolarized"
+    }
+    if (terminals.hasPolarityLabels) {
+      if (parameters.positivepin === undefined)
+        resolved += `_positivepin${terminals.positivePin}`
+      if (parameters.negativepin === undefined)
+        resolved += `_negativepin${terminals.negativePin}`
+    }
+    return resolved
+  }
+
   get config() {
     const baseSymbolName = this.props.symbolName ?? "capacitor"
     const compactSize =
@@ -59,14 +98,15 @@ export class Capacitor extends NormalComponent<
   initPorts() {
     // Keep electrical polarity aliases aligned with footprint terminal options.
     if (typeof this.props.footprint === "string") {
-      const { positivePin, negativePin } = isFootprinterString(
-        this.props.footprint,
-      )
-        ? resolveFootprinterPolarity({
-            footprint: this.props.footprint,
-            componentName: this.componentName,
+      const parsed = parseFootprinterDefinition(this.props.footprint)
+      const { positivePin, negativePin } = parsed
+        ? resolveTwoTerminalPinMapping({
             name: this.name,
-            polarized: this._parsedProps.polarized,
+            pinLabels: this._resolvePinLabels(),
+            explicitPositive: parsed.parameters.positivepin,
+            explicitNegative: parsed.parameters.negativepin,
+            positiveOption: "positivepin",
+            negativeOption: "negativepin",
           })
         : { positivePin: 1, negativePin: 2 }
       super.initPorts({
@@ -112,14 +152,6 @@ export class Capacitor extends NormalComponent<
     return capacitanceDisplay
   }
 
-  getFootprinterString(): string | null {
-    const baseFootprint = super.getFootprinterString()
-    if (baseFootprint && CAPACITOR_CHIP_FOOTPRINTS.has(baseFootprint)) {
-      return `cap${baseFootprint}`
-    }
-    return baseFootprint
-  }
-
   doInitialCreateNetsFromProps() {
     this._createNetsFromProps([
       this.props.decouplingFor,
@@ -146,11 +178,6 @@ export class Capacitor extends NormalComponent<
     this._createTracesFromConnectionsProp()
   }
 
-  doInitialPcbComponentSizeCalculation(): void {
-    super.doInitialPcbComponentSizeCalculation()
-    Capacitor_addPolarityFabricationSymbols(this)
-  }
-
   doInitialSourceRender() {
     const { db } = this.root!
     const { _parsedProps: props } = this