Added simple-circuit

doc/examples.typ

@@ -148,21 +148,3 @@ wire.wire("w2", ((0, 0), (1, -.5)),
           style: "zigzag", zigzag-ratio: 80%)
 wire.intersection("w1.zig")
 ```)
-
-#let capacitor = example(```
-electrical.capacitor(
-  x: 0, y: 0, w: 2, h: 1, id: "a",
-  scales: (100%, 80%), gap: 0.3
-)
-
-electrical.capacitor(
-  x: 4, y: -0.5, w: 1, h: 2, id: "b",
-  vertical: true, symbols: ([+], none)
-)
-```, vertical: true)
-
-#let resistor = example(```
-electrical.resistor(x: 0, y: 0, w: 2, h: 0.5, id: "a", zigzags: 8)
-electrical.resistor(x: 4, y: -0.5, w: 0.5, h: 2, id: "b", vertical: true)
-electrical.resistor(x: 6.5, y: 0, w: 2, h: 0.5, id: "c", zigzags: none)
-```, vertical: true)

gallery/simple-circuit.typ

@@ -0,0 +1,36 @@
+#import "../src/lib.typ": *
+#import "@preview/cetz:0.3.2": draw // For potential use of draw.hide if needed, but trying without first
+
+#set page(width: auto, height: auto, margin: 1cm)
+
+#circuit({
+  // Circuit 1: Series Lamps
+  electrical.voltage-source(x: 0, y: 0, w: 1, h: 1, id: "vs1")
+  electrical.lamp(x: 1, y: 0, w: 1, h: 1, id: "lamp1")
+  electrical.lamp(x: 2, y: 0, w: 1, h: 1, id: "lamp2")
+
+  // Circuit 1 Wires
+  wire.wire("w-s-1", ("vs1.east", "lamp1.west"))
+  wire.wire("w-s-2", ("lamp1.east", "lamp2.west"))
+  // Use dodge style for return path
+  wire.wire("w-s-return", ("lamp2.east", "vs1.west"), style: "dodge", dodge-y: -1.5, dodge-sides: ("east", "west"))
+})
+
+
+#circuit({
+  // Circuit 2: RC Charging
+
+  electrical.voltage-source(x: 0, y: 0, w: 1, h: 1, id: "vs")
+  electrical.switch(x: 2, y: 0, w: 1, h: 1, id: "sw1", closed: false)
+  electrical.capacitor(x: 2, y: -2, w: 1, h: 1, id: "c1")
+  electrical.resistor(x: 0, y: -2, w: 2, h: 1, id: "r1")
+  
+  electrical.voltmeter(x: 2, y: -3, w: 1, h: 1, id: "vm")
+
+  wire.wire("w-s-1", ("vs-port-1", "sw1-port-0"))
+  wire.wire("w-s-2", ("c1-port-1", "sw1-port-1"))
+  wire.wire("w-s-3", ("r1-port-0", "vs-port-0"))
+  
+  wire.wire("w-s-4", ("vm-port-0", "c1-port-0"))
+  wire.wire("w-s-4", ("vm-port-1", "c1-port-1"))
+})

gallery/test3.typ

@@ -81,57 +81,4 @@
   element.gate-xnor(
     x: 9, y: -6, w: 2, h: 2, id: "xnor"
   )
-
-  element.resistor(
-    x: 0, y: -8, w: 2, h: 0.5, id: "res1"
-  )
-
-  element.capacitor(
-    x: 3, y: (from: "res1-port-1", to: "0"),
-    w: 2, h: 0.6,
-    id: "cap1",
-    scales: (100%, 80%),
-    symbols: ([+], [-])
-  )
-
-  element.resistor(
-    x: (rel: 1, to: "cap1-port-1"),
-    y: (from: "cap1-port-1", to: "0"),
-    w: 0.5, h: 2,
-    id: "res2",
-    vertical: true,
-    zigzags: 8
-  )
-
-  element.capacitor(
-    x: (rel: 1, to: "res2.east"),
-    y: (from: "res2-port-1", to: "1"),
-    w: 0.5, h: 2,
-    id: "cap2",
-    vertical: true,
-    symbols: ([a], [b])
-  )
-
-  element.resistor(
-    x: (rel: 1, to: "cap2-port-0"),
-    y: (from: "cap2-port-0", to: "0"),
-    w: 2, h: 0.5,
-    id: "res3",
-    zigzags: none
-  )
-
-  element.resistor(
-    x: (rel: 1, to: "res3-port-1"),
-    y: (from: "res3-port-1", to: "0"),
-    w: 0.5, h: 2,
-    id: "res4",
-    zigzags: none,
-    vertical: true
-  )
-
-  wire.wire("w4", ("res1-port-1", "cap1-port-0"))
-  wire.wire("w5", ("cap1-port-1", "res2-port-0"))
-  wire.wire("w6", ("res2-port-1", "cap2-port-1"))
-  wire.wire("w7", ("cap2-port-0", "res3-port-0"))
-  wire.wire("w8", ("res3-port-1", "res4-port-0"))
 })

manual.typ

@@ -4,7 +4,6 @@
 #import "doc/examples.typ"
 #import "src/circuit.typ": circuit
 #import "src/element.typ"
-#import "src/electrical.typ"
 #import "src/gates.typ"
 #import "src/util.typ"
 #import "src/wire.typ"
@@ -212,23 +211,3 @@ If you have installed Circuiteria directly in your project, import #link("src/li
 )
 
 #tidy.show-module(gates-docs, sort-functions: false)
-
-#pagebreak()
-
-#let electrical-docs = tidy.parse-module(
-  read("src/elements/electrical/capacitor.typ") + "\n" +
-  read("src/elements/electrical/resistor.typ") + "\n",
-  name: "electrical",
-  scope: (
-    element: element,
-    circuit: circuit,
-    electrical: electrical,
-    draw: draw,
-    wire: wire,
-    tidy: tidy,
-    examples: examples,
-    doc-ref: doc-ref
-  )
-)
-
-#tidy.show-module(electrical-docs, sort-functions: false)

src/electrical.typ

@@ -1,2 +1,9 @@
 #import "elements/electrical/capacitor.typ": capacitor
 #import "elements/electrical/resistor.typ": resistor
+#import "elements/electrical/voltage-source.typ": voltage-source
+#import "elements/electrical/ac-source.typ": ac-source
+#import "elements/electrical/ammeter.typ": ammeter
+#import "elements/electrical/voltmeter.typ": voltmeter
+#import "elements/electrical/inductor.typ": inductor
+#import "elements/electrical/switch.typ": switch
+#import "elements/electrical/lamp.typ": lamp

src/element.typ

@@ -12,7 +12,4 @@
 #import "elements/logic/xor.typ": gate-xor, gate-xnor
 #import "elements/logic/buf.typ": gate-buf, gate-not
 
-#import "elements/electrical/resistor.typ": resistor
-#import "elements/electrical/capacitor.typ": capacitor
-
 #import "elements/group.typ": group

src/elements/electrical/ac-source.typ

@@ -0,0 +1,100 @@
+#import "@preview/cetz:0.3.2": draw
+#import "../element.typ"
+#import "../ports.typ": add-port
+
+#let draw-shape(
+  id,
+  tl,
+  tr,
+  br,
+  bl,
+  fill,
+  stroke,
+  vertical: false,
+) = {
+  let (x0, y0) = tl
+  let (x1, y1) = br
+
+  let w = x1 - x0
+  let h = y1 - y0
+
+  let cx = x0 + w / 2
+  let cy = y0 + h / 2
+  let r = calc.min(w, h) / 2
+
+  let line = draw.line.with(stroke: stroke)
+  let circle = draw.circle.with(stroke: stroke, fill: fill)
+
+  let f = draw.group(
+    name: id,
+    {
+      // Kreis und Tilde-Symbol
+      circle((cx, cy), radius: r)
+      draw.content((cx, cy), [$tilde$], anchor: "center")
+
+      // Verbindungslinien zu den Ports
+      if vertical {
+        // Vertikale Quelle
+        let p_start = (cx, y0) // North port
+        let p_end = (cx, y1) // South port
+        let circle_top = (cx, cy - r) // Top point of the circle
+        let circle_bottom = (cx, cy + r) // Bottom point of the circle
+        line(p_start, circle_top) // Line from North port to top of circle
+        line(circle_bottom, p_end) // Line from bottom of circle to South port
+      } else {
+        // Horizontale Quelle
+        let p_start = (x0, cy) // West port
+        let p_end = (x1, cy) // East port
+        let circle_left = (cx - r, cy) // Left point of the circle
+        let circle_right = (cx + r, cy) // Right point of the circle
+        line(p_start, circle_right) // Line from West port to left of circle
+        line(circle_left, p_end) // Line from right of circle to East port
+      }
+    },
+  )
+
+  return (f, tl, tr, br, bl)
+}
+
+#let ac-source(
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  vertical: false,
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false,
+  ),
+) = {
+  let ports = if vertical {
+    (
+      north: ((id: "0"),),
+      south: ((id: "1"),),
+    )
+  } else {
+    (
+      west: ((id: "0"),),
+      east: ((id: "1"),),
+    )
+  }
+
+  element.elmt(
+    draw-shape: draw-shape.with(vertical: vertical),
+    x: x,
+    y: y,
+    w: w,
+    h: h,
+    name: name,
+    name-anchor: name-anchor,
+    ports: ports,
+    fill: fill,
+    stroke: stroke,
+    id: id,
+    debug: debug,
+  )
+}

src/elements/electrical/ammeter.typ

@@ -0,0 +1,81 @@
+#import "@preview/cetz:0.3.2": draw
+#import "../element.typ"
+#import "../ports.typ": add-port
+
+#let draw-shape(
+  id, tl, tr, br, bl,
+  fill, stroke,
+  vertical: false
+) = {
+  let (x0, y0) = tl
+  let (x1, y1) = br
+
+  let w = x1 - x0
+  let h = y1 - y0
+
+  let cx = x0 + w / 2
+  let cy = y0 + h / 2
+  let r = calc.min(w, h) / 3
+  
+  let line = draw.line.with(stroke: stroke)
+  let circle = draw.circle.with(stroke: stroke, fill: fill)
+
+  let f = draw.group(name: id, {
+    // Kreis und 'A'-Symbol
+    circle((cx, cy), radius: r)
+    draw.content((cx, cy), [A], anchor: "center")
+
+    // Verbindungslinien zu den Ports
+    if vertical {
+      // Vertikales Amperemeter
+      let p_start = (cx, y0) // North port
+      let p_end = (cx, y1)   // South port
+      let circle_top = (cx, cy - r) // Top point of the circle
+      let circle_bottom = (cx, cy + r) // Bottom point of the circle
+      line(p_start, circle_top) // Line from North port to top of circle
+      line(circle_bottom, p_end) // Line from bottom of circle to South port
+    } else {
+      // Horizontales Amperemeter
+      let p_start = (x0, cy) // West port
+      let p_end = (x1, cy)   // East port
+      let circle_left = (cx - r, cy) // Left point of the circle
+      let circle_right = (cx + r, cy) // Right point of the circle
+      line(p_start, circle_right) // Line from West port to left of circle
+      line(circle_left, p_end) // Line from right of circle to East port
+    }
+  })
+  
+  return (f, tl, tr, br, bl)
+}
+
+#let ammeter(
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  vertical: false,
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false
+  )
+) = {
+  let ports = if vertical {(
+    north: ((id: "0"),),
+    south: ((id: "1"),)
+  )} else {(
+    west: ((id: "0"),),
+    east: ((id: "1"),)
+  )}
+  
+  element.elmt(
+    draw-shape: draw-shape.with(
+      vertical: vertical
+    ),
+    x: x, y: y, w: w, h: h, name: name, name-anchor: name-anchor,
+    ports: ports, fill: fill, stroke: stroke, id: id, debug: debug
+  )
+}

src/elements/electrical/capacitor.typ

@@ -1,4 +1,4 @@
-#import "@preview/cetz:0.2.2": draw
+#import "@preview/cetz:0.3.2": draw, coordinate
 #import "../element.typ"
 #import "../ports.typ": add-port
 

src/elements/electrical/inductor.typ

@@ -0,0 +1,137 @@
+#import "@preview/cetz:0.3.2": draw,
+#import "../element.typ"
+#import "../ports.typ": add-port
+
+#let draw-shape(
+  id,
+  tl,
+  tr,
+  br,
+  bl,
+  fill,
+  stroke,
+  vertical: false,
+) = {
+  let (x0, y0) = tl
+  let (x1, y1) = br
+
+  let w = x1 - x0
+  let h = y1 - y0
+
+  let cx = x0 + w / 2
+  let cy = y0 + h / 2
+
+  let line = draw.line.with(stroke: stroke)
+  let arc = draw.arc.with(stroke: stroke)
+  let loops = 4 // Number of half-circle loops
+
+  let f = draw.group(
+    name: id,
+    {
+      if vertical {
+        // Vertical Inductor
+        let p_start = (cx, y0)
+        let p_end = (cx, y1)
+        let coil_margin = 0.1 * h // Margin for connection lines
+        let coil_start_y = y0 + coil_margin
+        let coil_end_y = y1 - coil_margin
+        let coil_length = coil_end_y - coil_start_y
+        let loop_height = coil_length / loops
+        let loop_radius = w / 2 // Radius of the arcs depends on the element's width
+        let first_loop_start_y = coil_start_y
+        let last_loop_end_y = coil_end_y
+
+        // Draw connection lines (ending at the start/end of the coil loops)
+        line(p_start, (cx, first_loop_start_y))
+        line((cx, last_loop_end_y), p_end)
+
+        // Draw loops
+        for i in range(loops) {
+          let loop_center_y = coil_start_y + loop_height * i + loop_height / 2
+          arc(
+            (cx, loop_center_y),
+            start: -90deg,
+            delta: 180deg,
+            radius: loop_radius,
+          )
+        }
+      } else {
+        // Horizontal Inductor
+        let p_start = (x0, cy)
+        let p_end = (x1, cy)
+        let coil_margin = 0.1 * w // Margin for connection lines
+        let coil_start_x = x0 + coil_margin
+        let coil_end_x = x1 - coil_margin
+        let coil_length = coil_end_x - coil_start_x
+        let loop_width = coil_length / loops
+        let loop_radius = h / 2 // Radius of the arcs depends on the element's height
+        let first_loop_start_x = coil_start_x
+        let last_loop_end_x = coil_end_x
+
+        draw.merge-path({
+          // Draw connection lines (ending at the start/end of the coil loops)
+          line(p_start, (first_loop_start_x, cy))
+
+          // Draw loops
+          for i in range(loops) {
+            let loop_center_x = coil_start_x + loop_width * i + loop_width / 2
+            arc(
+              (loop_center_x, cy),
+              start: 0deg,
+              delta: 180deg,
+              radius: loop_radius / 2.5,
+              anchor: "origin",
+            )
+          }
+
+          line((last_loop_end_x, cy), p_end)
+        })
+      }
+    },
+  )
+
+  return (f, tl, tr, br, bl)
+}
+
+#let inductor(
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  vertical: false,
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false,
+  ),
+) = {
+  let ports = if vertical {
+    (
+      north: ((id: "0"),),
+      south: ((id: "1"),),
+    )
+  } else {
+    (
+      west: ((id: "0"),),
+      east: ((id: "1"),),
+    )
+  }
+
+  element.elmt(
+    draw-shape: draw-shape.with(vertical: vertical),
+    x: x,
+    y: y,
+    w: w,
+    h: h,
+    name: name,
+    name-anchor: name-anchor,
+    ports: ports,
+    fill: fill,
+    stroke: stroke,
+    id: id,
+    debug: debug,
+  )
+}

src/elements/electrical/lamp.typ

@@ -0,0 +1,85 @@
+#import "@preview/cetz:0.3.2": draw
+#import "../element.typ"
+#import "../ports.typ": add-port
+
+#let draw-shape(
+  id, tl, tr, br, bl,
+  fill, stroke,
+  vertical: false
+) = {
+  let (x0, y0) = tl
+  let (x1, y1) = br
+
+  let w = x1 - x0
+  let h = y1 - y0
+
+  let cx = x0 + w / 2
+  let cy = y0 + h / 2
+  let r = calc.min(w, h) / 3
+  
+  let line = draw.line.with(stroke: stroke)
+  let circle = draw.circle.with(stroke: stroke, fill: fill)
+
+  let f = draw.group(name: id, {
+    // Kreis für die Glühlampe
+    circle((cx, cy), radius: r, name: "lamp-circle")
+    
+    // X-Symbol im Kreis für die Glühlampe
+    let r_inner = r * 0.7 // Scale factor for the 'X' size
+    line("lamp-circle.north-west", "lamp-circle.south-east")
+    line("lamp-circle.north-east", "lamp-circle.south-west")
+
+    // Verbindungslinien zu den Ports
+    if vertical {
+      // Vertikale Lampe
+      let p_start = (cx, y0) // North port
+      let p_end = (cx, y1)   // South port
+      let circle_top = (cx, cy - r) // Top point of the circle
+      let circle_bottom = (cx, cy + r) // Bottom point of the circle
+      line(p_start, circle_top) // Line from North port to top of circle
+      line(circle_bottom, p_end) // Line from bottom of circle to South port
+    } else {
+      // Horizontale Lampe
+      let p_start = (x0, cy) // West port
+      let p_end = (x1, cy)   // East port
+      let circle_left = (cx - r, cy) // Left point of the circle
+      let circle_right = (cx + r, cy) // Right point of the circle
+      line(p_end, circle_left) // Line from West port to left of circle
+      line(circle_right, p_start) // Line from right of circle to East port
+    }
+  })
+  
+  return (f, tl, tr, br, bl)
+}
+
+#let lamp(
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  vertical: false,
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false
+  )
+) = {
+  let ports = if vertical {(
+    north: ((id: "0"),),
+    south: ((id: "1"),)
+  )} else {(
+    west: ((id: "0"),),
+    east: ((id: "1"),)
+  )}
+  
+  element.elmt(
+    draw-shape: draw-shape.with(
+      vertical: vertical
+    ),
+    x: x, y: y, w: w, h: h, name: name, name-anchor: name-anchor,
+    ports: ports, fill: fill, stroke: stroke, id: id, debug: debug
+  )
+}

src/elements/electrical/resistor.typ

@@ -1,4 +1,4 @@
-#import "@preview/cetz:0.2.2": draw
+#import "@preview/cetz:0.3.2": draw, coordinate
 #import "../element.typ"
 #import "../ports.typ": add-port
 
@@ -29,9 +29,13 @@
   let p2 = pt(o0 + 0.8 * s0, m1)
   let p3 = pt(o0 + s0, m1)
 
+  // Draw rectangle (IEC standard) if zigzags is none
   if zigzags == none {
-    let p4 = pt(o0 + 0.2 * s0, o1)
+    let rect_height = s1 / 2
-    let p5 = pt(o0 + 0.8 * s0, o1 + s1)
+    let rect_top = m1 - rect_height / 2
+    let rect_bottom = m1 + rect_height / 2
+    let p4 = pt(o0 + 0.2 * s0, rect_top)
+    let p5 = pt(o0 + 0.8 * s0, rect_bottom)
     let f = draw.group(name: id, {
       draw.line(p0, p1)
       draw.line(p2, p3)
@@ -39,21 +43,26 @@
     })
     return (f, tl, tr, br, bl)
   }
+  // Draw zigzags (ANSI standard) if zigzags is an integer
+  else if type(zigzags) == int {
+    let pts = (p0, p1)
     
-  let pts = (p0, p1)
+    for i in range(zigzags) {
+      let r = ((i+0.5) / zigzags * 0.6 + 0.2)
+      let pos = pt(o0 + r * s0, o1 + s1 * calc.rem(i, 2))
+      pts.push(pos)
+    }
   
-  for i in range(zigzags) {
+    pts += (p2, p3)
-    let r = ((i+0.5) / zigzags * 0.6 + 0.2)
+  
-    let pos = pt(o0 + r * s0, o1 + s1 * calc.rem(i, 2))
+    let f = draw.group(name: id, {
-    pts.push(pos)
+      draw.line(..pts, stroke: stroke)
+    })
+    return (f, tl, tr, br, bl)
   }
-
+  // Fallback or error? For now, just return nothing or raise an error.
-  pts += (p2, p3)
+  // Let's return an empty group for now.
-
+  return (draw.group(name: id, {}), tl, tr, br, bl)
-  let f = draw.group(name: id, {
-    draw.line(..pts, stroke: stroke)
-  })
-  return (f, tl, tr, br, bl)
 }
 
 /// Draws a resistor
@@ -61,7 +70,7 @@
 /// #examples.resistor
 /// For other parameters description, see #doc-ref("element.elmt")
 /// - vertical (bool): Whether the element is vertical or horizontal. If false, port 0 is placed on the west side and port 1 on the east. If true, they are on the north, respectively the south sides
-/// - zigzags (number, none): Number of zigzags to draw. If none, a rectangle is drawn
+/// - zigzags (int, none): Number of zigzags for the ANSI style symbol. If `none` (default), a rectangle (IEC style) is drawn.
 #let resistor(
   x: none,
   y: none,
@@ -70,7 +79,7 @@
   name: none,
   name-anchor: "center",
   vertical: false,
-  zigzags: 6,
+  zigzags: none, // Default to IEC style (rectangle)
   fill: none,
   stroke: black + 1pt,
   id: "",

src/elements/electrical/switch.typ

@@ -0,0 +1,136 @@
+#import "@preview/cetz:0.3.2": draw
+#import "../element.typ"
+#import "../ports.typ": add-port
+
+#let draw-shape(
+  id,
+  tl,
+  tr,
+  br,
+  bl,
+  fill,
+  stroke,
+  vertical: false,
+  closed: false,
+) = {
+  let (x0, y0) = tl
+  let (x1, y1) = br
+
+  let w = x1 - x0
+  let h = y1 - y0
+
+  let line = draw.line.with(stroke: stroke)
+  let circle = draw.circle.with(stroke: stroke, fill: white) // Use white fill for visibility
+  let terminal_radius = 0.05 * calc.min(w, h) // Small radius for terminals
+
+  let cx = x0 + w / 2 // Center x
+  let cy = y0 + h / 2 // Center y
+
+  let f = draw.group(
+    name: id,
+    {
+      if vertical {
+        // Vertical Switch
+        let p0 = (cx, y0) // North port
+        let p1 = (cx, y1) // South port
+        let terminal0 = (cx, y0 + 0.2 * h) // Upper terminal position
+        let terminal1 = (cx, y1 - 0.2 * h) // Lower terminal position
+
+        // Draw connection lines (ending at the terminals)
+        line(p0, terminal0) // Line from North port to upper terminal
+        line(terminal1, p1) // Line from lower terminal to South port
+
+        // Draw terminals (circles)
+        circle(terminal0, radius: terminal_radius, name: "left-connector")
+        circle(terminal1, radius: terminal_radius, name: "right-connector")
+
+        // Draw switch lever
+        let lever_end
+        let lever_start
+        if closed {
+          lever_start = "left-connector.north"
+          lever_end = "right-connector.south"
+        } else {
+          lever_start = "left-connector.135deg"
+          lever_end = (rel: (-45deg, calc.abs(y1 - y0) * 0.6), to: "left-connector.45deg")
+        }
+        line(lever_start, lever_end)
+      } else {
+        // Horizontal Switch
+        let p0 = (x0, cy) // West port
+        let p1 = (x1, cy) // East port
+        let terminal0 = (x0 + 0.2 * w, cy) // Left terminal position
+        let terminal1 = (x1 - 0.2 * w, cy) // Right terminal position
+
+        // Draw connection lines (ending at the terminals)
+        line(p0, terminal0) // Line from West port to left terminal
+        line(terminal1, p1) // Line from right terminal to East port
+
+        // Draw terminals (circles)
+        circle(terminal0, radius: terminal_radius, name: "left-connector")
+        circle(terminal1, radius: terminal_radius, name: "right-connector")
+
+        // Draw switch lever
+        let lever_end
+        let lever_start
+        if closed {
+          lever_start = "left-connector.west"
+          lever_end = "right-connector.east"
+        } else {
+          lever_start = "left-connector.225deg"
+          lever_end = (rel: (45deg, calc.abs(x1 - x0) * 0.6), to: "left-connector.45deg")
+        }
+        line(lever_start, lever_end)
+      }
+    },
+  )
+
+  return (f, tl, tr, br, bl)
+}
+
+#let switch(
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  vertical: false,
+  closed: false,
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false,
+  ),
+) = {
+  let ports = if vertical {
+    (
+      north: ((id: "0"),),
+      south: ((id: "1"),),
+    )
+  } else {
+    (
+      west: ((id: "0"),),
+      east: ((id: "1"),),
+    )
+  }
+
+  element.elmt(
+    draw-shape: draw-shape.with(
+      vertical: vertical,
+      closed: closed,
+    ),
+    x: x,
+    y: y,
+    w: w,
+    h: h,
+    name: name,
+    name-anchor: name-anchor,
+    ports: ports,
+    fill: fill,
+    stroke: stroke,
+    id: id,
+    debug: debug,
+  )
+}

src/elements/electrical/voltage-source.typ

@@ -0,0 +1,100 @@
+#import "@preview/cetz:0.3.2": draw
+#import "../element.typ"
+#import "../ports.typ": add-port
+
+#let draw-shape(
+  id, tl, tr, br, bl,
+  fill, stroke,
+  vertical: false
+) = {
+  let (x0, y0) = tl
+  let (x1, y1) = br
+
+  let w = x1 - x0
+  let h = y1 - y0
+
+  let line = draw.line.with(stroke: stroke)
+  let cx = x0 + w / 2
+  let cy = y0 + h / 2
+
+  let f = draw.group(name: id, {
+    if vertical {
+      // Vertical voltage source (battery symbol) - Centered
+      let p0 = (cx, y0) // North port (+)
+      let p1 = (cx, y1) // South port (-)
+      let gap = 0.1 * h    // Gap between the two plates
+      let plate_width = 0.6 * w // Width of the plates
+
+      // Center the plates around cy
+      let plate0_y = cy - gap / 2 // Position of the long plate (+)
+      let plate1_y = cy + gap / 2 // Position of the short plate (-)
+
+      // Create a thicker stroke for the short plate
+      let thicker_stroke = (paint: stroke.paint, thickness: stroke.thickness + 1pt)
+
+      // Draw plates
+      line((cx - plate_width / 2, plate0_y), (cx + plate_width / 2, plate0_y)) // Long plate (+)
+      line((cx - plate_width / 3, plate1_y), (cx + plate_width / 3, plate1_y)) // Short plate (-)
+
+      // Draw connection lines (ending at the plates)
+      line(p0, (cx, plate0_y)) // Line from North port to top plate
+      line((cx, plate1_y), p1) // Line from bottom plate to South port
+
+    } else {
+      // Horizontal voltage source (battery symbol) - Centered
+      let p0 = (x0, cy) // West port (+)
+      let p1 = (x1, cy) // East port (-)
+      let gap = 0.1 * w    // Gap between the two plates
+      let plate_height = 0.6 * h // Height of the plates
+
+      // Center the plates around cx
+      let plate0_x = cx - gap / 2 // Position of the long plate (+)
+      let plate1_x = cx + gap / 2 // Position of the short plate (-)
+
+      // Create a thicker stroke for the short plate
+      let thicker_stroke = (paint: stroke.paint, thickness: stroke.thickness + 1pt)
+      
+      // Draw plates
+      line((plate0_x, cy - plate_height / 2), (plate0_x, cy + plate_height / 2)) // Long plate (+)
+      line((plate1_x, cy - plate_height / 3), (plate1_x, cy + plate_height / 3)) // Short plate (-)
+
+      // Draw connection lines (ending at the plates)
+      line(p0, (plate0_x, cy)) // Line from West port to left plate
+      line((plate1_x, cy), p1) // Line from right plate to East port
+    }
+  })
+  
+  return (f, tl, tr, br, bl)
+}
+
+#let voltage-source(
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  vertical: false,
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false
+  )
+) = {
+  let ports = if vertical {(
+    north: ((id: "0"),),
+    south: ((id: "1"),)
+  )} else {(
+    west: ((id: "0"),),
+    east: ((id: "1"),)
+  )}
+  
+  element.elmt(
+    draw-shape: draw-shape.with(
+      vertical: vertical
+    ),
+    x: x, y: y, w: w, h: h, name: name, name-anchor: name-anchor,
+    ports: ports, fill: fill, stroke: stroke, id: id, debug: debug
+  )
+}

src/elements/electrical/voltmeter.typ

@@ -0,0 +1,81 @@
+#import "@preview/cetz:0.3.2": draw
+#import "../element.typ"
+#import "../ports.typ": add-port
+
+#let draw-shape(
+  id, tl, tr, br, bl,
+  fill, stroke,
+  vertical: false
+) = {
+  let (x0, y0) = tl
+  let (x1, y1) = br
+
+  let w = x1 - x0
+  let h = y1 - y0
+
+  let cx = x0 + w / 2
+  let cy = y0 + h / 2
+  let r = calc.min(w, h) / 3
+  
+  let line = draw.line.with(stroke: stroke)
+  let circle = draw.circle.with(stroke: stroke, fill: fill)
+
+  let f = draw.group(name: id, {
+    // Kreis und 'V'-Symbol
+    circle((cx, cy), radius: r)
+    draw.content((cx, cy), [V], anchor: "center")
+
+    // Verbindungslinien zu den Ports
+    if vertical {
+      // Vertikales Voltmeter
+      let p_start = (cx, y0) // North port
+      let p_end = (cx, y1)   // South port
+      let circle_top = (cx, cy - r) // Top point of the circle
+      let circle_bottom = (cx, cy + r) // Bottom point of the circle
+      line(p_start, circle_top) // Line from North port to top of circle
+      line(circle_bottom, p_end) // Line from bottom of circle to South port
+    } else {
+      // Horizontales Voltmeter
+      let p_start = (x0, cy) // West port
+      let p_end = (x1, cy)   // East port
+      let circle_left = (cx - r, cy) // Left point of the circle
+      let circle_right = (cx + r, cy) // Right point of the circle
+      line(p_start, circle_right) // Line from West port to left of circle
+      line(circle_left, p_end) // Line from right of circle to East port
+    }
+  })
+  
+  return (f, tl, tr, br, bl)
+}
+
+#let voltmeter(
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  vertical: false,
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false
+  )
+) = {
+  let ports = if vertical {(
+    north: ((id: "0"),),
+    south: ((id: "1"),)
+  )} else {(
+    west: ((id: "0"),),
+    east: ((id: "1"),)
+  )}
+  
+  element.elmt(
+    draw-shape: draw-shape.with(
+      vertical: vertical
+    ),
+    x: x, y: y, w: w, h: h, name: name, name-anchor: name-anchor,
+    ports: ports, fill: fill, stroke: stroke, id: id, debug: debug
+  )
+}

src/lib.typ

@@ -1,8 +1,8 @@
 #let version = version(0, 2, 0)
 
 #import "circuit.typ": circuit
-#import "electrical.typ"
 #import "element.typ"
 #import "gates.typ"
 #import "util.typ"
 #import "wire.typ"
+#import "electrical.typ"