Added simple-circuit

doc/examples.typ

@@ -56,7 +56,7 @@ for i in range(3) {
 ```)
 
 #let wires = example(```
-for i in range(4) {
+for i in range(3) {
   draw.circle((i * 3, 0), radius: .1, name: "p" + str(i * 2))
   draw.circle((i * 3 + 2, 1), radius: .1, name: "p" + str(i * 2 + 1))
   draw.content((i * 3 + 1, -1), raw(wire.wire-styles.at(i)))
@@ -65,10 +65,6 @@ wire.wire("w1", ("p0", "p1"), style: "direct")
 wire.wire("w2", ("p2", "p3"), style: "zigzag")
 wire.wire("w3", ("p4", "p5"), style: "dodge",
           dodge-y: -0.5, dodge-margins: (0.5, 0.5))
-wire.wire("w4", ("p6","p7"), style: "guided",
-          guided-center:(20%, 40%), guided-margins: (90%,87%),
-          guided-sides: ("north","south"))
-
 ```, vertical: true)
 
 #let stub = example(```
@@ -119,46 +115,6 @@ gates.gate-xnor(x: 0, y: 0, w: 1.5, h: 1.5)
 gates.gate-xnor(x: 3, y: 0, w: 1.5, h: 1.5, inverted: "all")
 ```, vertical: true)
 
-#let iec-gate-and = example(```
-gates.iec-gate-and(x: 0, y: 0, w: 1.5, h: 1.5)
-gates.iec-gate-and(x: 3, y: 0, w: 1.5, h: 1.5, inverted: "all")
-```, vertical: true)
-
-#let iec-gate-nand = example(```
-gates.iec-gate-nand(x: 0, y: 0, w: 1.5, h: 1.5)
-gates.iec-gate-nand(x: 3, y: 0, w: 1.5, h: 1.5, inverted: "all")
-```, vertical: true)
-
-#let iec-gate-or = example(```
-gates.iec-gate-or(x: 0, y: 0, w: 1.5, h: 1.5)
-gates.iec-gate-or(x: 3, y: 0, w: 1.5, h: 1.5, inverted: "all")
-```, vertical: true)
-
-#let iec-gate-nor = example(```
-gates.iec-gate-nor(x: 0, y: 0, w: 1.5, h: 1.5)
-gates.iec-gate-nor(x: 3, y: 0, w: 1.5, h: 1.5, inverted: "all")
-```, vertical: true)
-
-#let iec-gate-xor = example(```
-gates.iec-gate-xor(x: 0, y: 0, w: 1.5, h: 1.5)
-gates.iec-gate-xor(x: 3, y: 0, w: 1.5, h: 1.5, inverted: "all")
-```, vertical: true)
-
-#let iec-gate-xnor = example(```
-gates.iec-gate-xnor(x: 0, y: 0, w: 1.5, h: 1.5)
-gates.iec-gate-xnor(x: 3, y: 0, w: 1.5, h: 1.5, inverted: "all")
-```, vertical: true)
-
-#let iec-gate-buf = example(```
-gates.iec-gate-buf(x: 0, y: 0, w: 1.5, h: 1.5)
-gates.iec-gate-buf(x: 3, y: 0, w: 1.5, h: 1.5, inverted: "all")
-```, vertical: true)
-
-#let iec-gate-not = example(```
-gates.iec-gate-not(x: 0, y: 0, w: 1.5, h: 1.5)
-gates.iec-gate-not(x: 3, y: 0, w: 1.5, h: 1.5, inverted: "all")
-```, vertical: true)
-
 #let group = example(```
 element.group(
   id: "g1", name: "Group 1", stroke: (dash: "dashed"),

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/test7.typ

@@ -1,98 +0,0 @@
-#import "@preview/cetz:0.3.2": draw
-#import "../src/lib.typ": circuit, element, util, wire
-
-#set page(width: auto, height: auto, margin: .5cm)
-
-#circuit({
-  element.iec-gate-buf(
-    x: 0,
-    y: 0,
-    w: 2,
-    h: 2,
-    id: "iec-buf",
-    inputs: 1,
-  )
-  wire.stub("iec-buf-port-in0", "west")
-
-  element.iec-gate-not(
-    x: 3,
-    y: 0,
-    w: 2,
-    h: 2,
-    id: "iec-not",
-    inputs: 1,
-  )
-  wire.stub("iec-not-port-in0", "west")
-
-  element.iec-gate-and(
-    id: "iec-and",
-    x: 0,
-    y: -3,
-    w: 2,
-    h: 2,
-    inputs: 2,
-  )
-  for i in range(2) {
-    wire.stub("iec-and-port-in" + str(i), "west")
-  }
-
-  element.iec-gate-nand(
-    id: "iec-nand",
-    x: 3,
-    y: -3,
-    w: 2,
-    h: 2,
-    inputs: 2,
-  )
-  for i in range(2) {
-    wire.stub("iec-nand-port-in" + str(i), "west")
-  }
-
-  element.iec-gate-or(
-    id: "iec-or",
-    x: 0,
-    y: -6,
-    w: 2,
-    h: 2,
-    inputs: 2,
-  )
-  for i in range(2) {
-    wire.stub("iec-or-port-in" + str(i), "west")
-  }
-
-  element.iec-gate-nor(
-    id: "iec-nor",
-    x: 3,
-    y: -6,
-    w: 2,
-    h: 2,
-    inputs: 2,
-  )
-  for i in range(2) {
-    wire.stub("iec-nor-port-in" + str(i), "west")
-  }
-
-  element.iec-gate-xor(
-    id: "iec-xor",
-    x: 0,
-    y: -9,
-    w: 2,
-    h: 2,
-    inputs: 2,
-  )
-  for i in range(2) {
-    wire.stub("iec-xor-port-in" + str(i), "west")
-  }
-
-  element.iec-gate-xnor(
-    id: "iec-nxor",
-    x: 3,
-    y: -9,
-    w: 2,
-    h: 2,
-    inputs: 2,
-  )
-  for i in range(2) {
-    wire.stub("iec-nxor-port-in" + str(i), "west")
-  }
-})

manual.typ

@@ -195,12 +195,7 @@ If you have installed Circuiteria directly in your project, import #link("src/li
   read("src/elements/logic/and.typ") + "\n" +
   read("src/elements/logic/buf.typ") + "\n" +
   read("src/elements/logic/or.typ") + "\n" +
-  read("src/elements/logic/xor.typ") + "\n" +
+  read("src/elements/logic/xor.typ"),
-  read("src/elements/logic/iec_gate.typ") + "\n" +
-  read("src/elements/logic/iec_and.typ") + "\n" +
-  read("src/elements/logic/iec_buf.typ") + "\n" +
-  read("src/elements/logic/iec_or.typ") + "\n" +
-  read("src/elements/logic/iec_xor.typ"),
   name: "gates",
   old-syntax: true,
   scope: (

src/circuit.typ

@@ -9,5 +9,6 @@
 /// - length (length, ratio): Optional base unit
 /// -> none
 #let circuit(body, length: 2em) = {
+  set text(font: "Source Sans 3")
   canvas(length: length, body)
 }

src/electrical.typ

@@ -0,0 +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

@@ -11,10 +11,5 @@
 #import "elements/logic/or.typ": gate-or, gate-nor
 #import "elements/logic/xor.typ": gate-xor, gate-xnor
 #import "elements/logic/buf.typ": gate-buf, gate-not
-#import "elements/logic/iec_gate.typ": iec-gate
-#import "elements/logic/iec_and.typ": iec-gate-and, iec-gate-nand
-#import "elements/logic/iec_buf.typ": iec-gate-buf, iec-gate-not
-#import "elements/logic/iec_or.typ": iec-gate-or, iec-gate-nor
-#import "elements/logic/iec_xor.typ": iec-gate-xor, iec-gate-xnor
 
 #import "elements/group.typ": group

src/elements/block.typ

@@ -1,9 +1,9 @@
 #import "@preview/cetz:0.3.2": draw
 #import "element.typ"
 
-#let draw-shape(id, tl, tr, br, bl, fill, stroke, radius: 0.5em) = {
+#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
   let f = draw.rect(
-    radius: radius,
+    radius: 0.5em,
     inset: 0.5em,
     fill: fill,
     stroke: stroke,
@@ -27,14 +27,13 @@
   ports: (),
   ports-margins: (),
   fill: none,
-  radius: 0.5em,
   stroke: black + 1pt,
   id: "",
   debug: (
     ports: false
   )
 ) = element.elmt(
-  draw-shape: draw-shape.with(radius: radius),
+  draw-shape: draw-shape,
   x: x,
   y: y,
   w: w,

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

@@ -0,0 +1,138 @@
+#import "@preview/cetz:0.3.2": draw, coordinate
+#import "../element.typ"
+#import "../ports.typ": add-port
+
+#let draw-shape(
+  id, tl, tr, br, bl,
+  fill, stroke,
+  vertical: false,
+  gap: 0.2,
+  scales: (100%, 100%),
+  symbols: (none, none)
+) = {
+  let (x0, y0) = tl
+  let (x1, y1) = br
+
+  let w = x1 - x0
+  let h = y1 - y0
+
+  let (o0, s0) = if vertical {(y0, h)} else {(x0, w)}
+  let (o1, s1) = if vertical {(x0, w)} else {(y0, h)}
+  let m1 = o1 + s1 / 2
+
+  let pt(i, j) = if vertical {
+    (j, i)
+  } else {
+    (i, j)
+  }
+
+  let size0 = s1 * scales.first() / 100%
+  let size1 = s1 * scales.last() / 100%
+
+  if type(gap) == ratio {
+    gap = gap / 100%
+  } else {
+    gap = gap / calc.abs(s0)
+  }
+  let r0 = 0.5 - gap / 2
+  let r1 = 0.5 + gap / 2
+
+  // Coordinates in (main axis, secondary axis) format
+  let p0 = pt(o0, m1)
+  let p1 = pt(o0 + r0 * s0, m1)
+  let p2 = pt(o0 + r1 * s0, m1)
+  let p3 = pt(o0 + s0, m1)
+  
+  let p4 = pt(o0 + r0 * s0, m1 - size0 / 2)
+  let p5 = pt(o0 + r0 * s0, m1 + size0 / 2)
+  
+  let p6 = pt(o0 + r1 * s0, m1 - size1 / 2)
+  let p7 = pt(o0 + r1 * s0, m1 + size1 / 2)
+
+  let line = draw.line.with(stroke: stroke)
+  let f = draw.group(name: id, {
+    line(p0, p1)
+    line(p2, p3)
+    line(p4, p5)
+    line(p6, p7)
+
+    if symbols.first() != none {
+      draw.content(
+        p1,
+        symbols.first(),
+        anchor: if vertical {"south-west"} else {"south-east"},
+        padding: 2pt
+      )
+    }
+
+    if symbols.last() != none {
+      draw.content(
+        p2,
+        symbols.last(),
+        anchor: if vertical {"north-west"} else {"south-west"},
+        padding: 2pt
+      )
+    }
+  })
+
+  return (f, tl, tr, br, bl)
+}
+
+/// Draws a capacitor
+///
+/// #examples.capacitor
+/// 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
+/// - gap (number, ratio): The gap between both sides
+///   - if it is a number (int or float), it is interpreted as an absolute canvas-unit length
+///   - if it is a ratio, it is interpreted as proportional to the capacitor's length (width if horizontal, height if vertical)
+/// - scales (array): A pair of ratios, the sizes of the sides relative to the capacitor's height (width if vertical).
+/// - symbols (array): A pair of content or strings (or none values) to attach on the sides of the capacitor
+#let capacitor(
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  vertical: false,
+  gap: 0.2,
+  scales: (100%, 100%),
+  symbols: (none, none),
+  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,
+      gap: gap,
+      scales: scales,
+      symbols: symbols
+    ),
+    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/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

@@ -0,0 +1,115 @@
+#import "@preview/cetz:0.3.2": draw, coordinate
+#import "../element.typ"
+#import "../ports.typ": add-port
+
+#let draw-shape(
+  id, tl, tr, br, bl,
+  fill, stroke,
+  zigzags: 6,
+  vertical: false
+) = {
+  let (x0, y0) = tl
+  let (x1, y1) = br
+
+  let w = x1 - x0
+  let h = y1 - y0
+
+  let (o0, s0) = if vertical {(y0, h)} else {(x0, w)}
+  let (o1, s1) = if vertical {(x0, w)} else {(y0, h)}
+  let m1 = o1 + s1 / 2
+
+  let pt(i, j) = if vertical {
+    (j, i)
+  } else {
+    (i, j)
+  }
+
+  let p0 = pt(o0, m1)
+  let p1 = pt(o0 + 0.2 * s0, m1)
+  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 rect_height = s1 / 2
+    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)
+      draw.rect(p4, p5, stroke: stroke, fill: fill)
+    })
+    return (f, tl, tr, br, bl)
+  }
+  // Draw zigzags (ANSI standard) if zigzags is an integer
+  else if type(zigzags) == int {
+    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)
+    }
+  
+    pts += (p2, p3)
+  
+    let f = draw.group(name: id, {
+      draw.line(..pts, stroke: stroke)
+    })
+    return (f, tl, tr, br, bl)
+  }
+  // Fallback or error? For now, just return nothing or raise an error.
+  // Let's return an empty group for now.
+  return (draw.group(name: id, {}), tl, tr, br, bl)
+}
+
+/// Draws a resistor
+///
+/// #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 (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,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  vertical: false,
+  zigzags: none, // Default to IEC style (rectangle)
+  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,
+      zigzags: zigzags
+    ),
+    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/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/elements/logic/iec_and.typ

@@ -1,70 +0,0 @@
-#import "@preview/cetz:0.3.2": draw
-// #import "iec_gate.typ" as iec-gate
-#import "iec_gate.typ" as iec-gate
-
-
-/// Draws an IEC-AND gate. This function is also available as `element.iec-gate-and()`
-/// 
-/// For parameters, see #doc-ref("gates.iec-gate")
-/// #examples.iec-gate-and
-#let iec-gate-and(
-  x: none,
-  y: none,
-  w: none,
-  h: none,
-  inputs: 2,
-  fill: none,
-  stroke: black + 1pt,
-  id: "",
-  inverted: (),
-  debug: (
-    ports: false
-  ),
-) = {
-  iec-gate.iec-gate(
-    x: x,
-    y: y,
-    w: w,
-    h: h,
-    inputs: inputs,
-    fill: fill,
-    stroke: stroke,
-    id: id,
-    inverted: inverted,
-    debug: debug,
-    symbol: $amp$,
-  )
-
-}
-
-/// Draws an IEC-NAND gate. This function is also available as `element.iec-gate-nand()`
-/// 
-/// For parameters, see #doc-ref("gates.iec-gate")
-/// #examples.iec-gate-nand
-#let iec-gate-nand(
-  x: none,
-  y: none,
-  w: none,
-  h: none,
-  inputs: 2,
-  fill: none,
-  stroke: black + 1pt,
-  id: "",
-  inverted: (),
-  debug: (
-    ports: false
-  ),
-) = {
-  iec-gate-and(
-    x: x,
-    y: y,
-    w: w,
-    h: h,
-    inputs: inputs,
-    fill: fill,
-    stroke: stroke,
-    id: id,
-    inverted: if inverted != "all" {inverted + ("out",)} else {inverted},
-    debug: debug,
-  )
-}

src/elements/logic/iec_buf.typ

@@ -1,68 +0,0 @@
-#import "@preview/cetz:0.3.2": draw
-#import "iec_gate.typ" as iec-gate
-
-
-/// Draws an IEC buffer gate. This function is also available as `element.iec-gate-buf()`
-///
-/// For parameters, see #doc-ref("gates.iec-gate")
-/// #examples.iec-gate-buf
-#let iec-gate-buf(
-  x: none,
-  y: none,
-  w: none,
-  h: none,
-  inputs: 2,
-  fill: none,
-  stroke: black + 1pt,
-  id: "",
-  inverted: (),
-  debug: (
-    ports: false,
-  ),
-) = {
-  iec-gate.iec-gate(
-    x: x,
-    y: y,
-    w: w,
-    h: h,
-    inputs: inputs,
-    fill: fill,
-    stroke: stroke,
-    id: id,
-    inverted: inverted,
-    debug: debug,
-    symbol: "1",
-  )
-}
-
-/// Draws an IEC NOT gate. This function is also available as `element.iec-gate-not()`
-/// 
-/// For parameters, see #doc-ref("gates.iec-gate")
-/// #examples.iec-gate-not
-#let iec-gate-not(
-  x: none,
-  y: none,
-  w: none,
-  h: none,
-  inputs: 2,
-  fill: none,
-  stroke: black + 1pt,
-  id: "",
-  inverted: (),
-  debug: (
-    ports: false,
-  ),
-) = {
-  iec-gate-buf(
-    x: x,
-    y: y,
-    w: w,
-    h: h,
-    inputs: inputs,
-    fill: fill,
-    stroke: stroke,
-    id: id,
-    inverted: if inverted != "all" { inverted + ("out",) } else { inverted },
-    debug: debug,
-  )
-}

src/elements/logic/iec_gate.typ

@@ -1,125 +0,0 @@
-#import "@preview/cetz:0.3.2": draw, coordinate
-#import "../ports.typ": add-ports, add-port
-#import "../element.typ"
-
-#let default-draw-shape(id, tl, tr, br, bl, fill, stroke, symbol) = {
-  let shapes = draw.rect(
-    inset: 0.5em,
-    fill: fill,
-    stroke: stroke,
-    name: id,
-    bl, tr
-  )
-  shapes += draw.content(
-    id + ".center",
-    [*$ symbol $*]
-  )
-  return (shapes, tl, tr, br, bl)
-}
-
-/// Draws a logic gate. This function is also available as `element.iec-gate()`
-///
-/// - draw-shape (function): see #doc-ref("element.elmt")
-/// - x (number, dictionary): see #doc-ref("element.elmt")
-/// - y (number, dictionary): see #doc-ref("element.elmt")
-/// - w (number): see #doc-ref("element.elmt")
-/// - h (number): see #doc-ref("element.elmt")
-/// - inputs (int): The number of inputs
-/// - fill (none, color): see #doc-ref("element.elmt")
-/// - stroke (stroke): see #doc-ref("element.elmt")
-/// - id (str): see #doc-ref("element.elmt")
-/// - inverted (str, array): Either "all" or an array of port ids to display as inverted
-/// - inverted-radius (number): The radius of inverted ports dot
-/// - debug (dictionary): see #doc-ref("element.elmt")
-/// - symbol (str): The symbol to display at the center of the gate
-#let iec-gate(
-  draw-shape: default-draw-shape,
-  x: none,
-  y: none,
-  w: none,
-  h: none,
-  inputs: 2,
-  fill: none,
-  stroke: black + 1pt,
-  id: "",
-  inverted: (),
-  inverted-radius: 0.1,
-  debug: (
-    ports: false
-  ),
-  symbol: "",
-) = draw.get-ctx(ctx => {
-  let width = w
-  let height = h
-
-  let x = x
-  let y = y
-  if x == none { panic("Parameter x must be set") }
-  if y == none { panic("Parameter y must be set") }
-  if w == none { panic("Parameter w must be set") }
-  if h == none { panic("Parameter h must be set") }
-
-  if (type(x) == dictionary) {
-    let offset = x.rel
-    let to = x.to
-    let (ctx, to-pos) = coordinate.resolve(ctx, (rel: (offset, 0), to: to))
-    x = to-pos.at(0)
-  }
-  
-  if (type(y) == dictionary) {
-    let from = y.from
-    let to = y.to
-    
-    let dy
-    if to == "out" {
-      dy = height / 2
-    } else {
-      dy = height * (i + 0.5) / inputs
-    }
-    
-    let (ctx, from-pos) = coordinate.resolve(ctx, from)
-    y = from-pos.at(1) + dy - height
-  }
-
-  let tl = (x, y + height)
-  let tr = (x + width, y + height)
-  let br = (x + width, y)
-  let bl = (x, y)
-
-  // Workaround because CeTZ needs to have all draw functions in the body
-  let func = {}
-  (func, tl, tr, br, bl) = draw-shape(id, tl, tr, br, bl, fill, stroke, symbol)
-  func
-
-  let space = 100% / inputs
-  for i in range(inputs) {
-    let pct = (i + 0.5) * space
-    let port-pos = (tl, pct, bl)
-    let port-name = "in" + str(i)
-    if inverted == "all" or port-name in inverted {
-      draw.circle(
-        port-pos,
-        radius: inverted-radius,
-        anchor: "east",
-        stroke: stroke
-      )
-      port-pos = (rel: (-2 * inverted-radius, 0), to: port-pos)
-    }
-    add-port(
-      id, "west",
-      (id: port-name), port-pos,
-      debug: debug.ports
-    )
-  }
-
-  let out-pos = id + ".east"
-  if inverted == "all" or "out" in inverted {
-    draw.circle(out-pos, radius: inverted-radius, anchor: "west", stroke: stroke)
-    out-pos = (rel: (2 * inverted-radius, 0), to: out-pos)
-  }
-  add-port(
-    id, "east",
-    (id: "out"), out-pos,
-    debug: debug.ports
-  )
-})

src/elements/logic/iec_or.typ

@@ -1,67 +0,0 @@
-#import "@preview/cetz:0.3.2": draw
-#import "iec_gate.typ" as iec-gate
-
-/// Draws an IEC-OR gate. This function is also available as `element.iec-gate-or()`
-/// 
-/// For parameters, see #doc-ref("gates.iec-gate")
-/// #examples.iec-gate-or
-#let iec-gate-or(
-  x: none,
-  y: none,
-  w: none,
-  h: none,
-  inputs: 2,
-  fill: none,
-  stroke: black + 1pt,
-  id: "",
-  inverted: (),
-  debug: (
-    ports: false
-  )
-) = {
-  iec-gate.iec-gate(
-    x: x,
-    y: y,
-    w: w,
-    h: h,
-    inputs: inputs,
-    fill: fill,
-    stroke: stroke,
-    id: id,
-    inverted: inverted,
-    debug: debug,
-    symbol: $>= 1$,
-  )
-}
-
-/// Draws an IEC-NOR gate. This function is also available as `element.iec-gate-nor()`
-/// 
-/// For parameters, see #doc-ref("gates.iec-gate")
-/// #examples.iec-gate-nor
-#let iec-gate-nor(
-  x: none,
-  y: none,
-  w: none,
-  h: none,
-  inputs: 2,
-  fill: none,
-  stroke: black + 1pt,
-  id: "",
-  inverted: (),
-  debug: (
-    ports: false
-  )
-) = {
-  iec-gate-or(
-    x: x,
-    y: y,
-    w: w,
-    h: h,
-    inputs: inputs,
-    fill: fill,
-    stroke: stroke,
-    id: id,
-    inverted: if inverted != "all" {inverted + ("out",)} else {inverted},
-    debug: debug
-  )
-}

src/elements/logic/iec_xor.typ

@@ -1,67 +0,0 @@
-#import "@preview/cetz:0.3.2": draw
-#import "iec_gate.typ" as iec-gate
-
-/// Draws an IEC-XOR gate. This function is also available as `element.iec-gate-xor()`
-/// 
-/// For parameters, see #doc-ref("gates.iec-gate")
-/// #examples.iec-gate-xor
-#let iec-gate-xor(
-  x: none,
-  y: none,
-  w: none,
-  h: none,
-  inputs: 2,
-  fill: none,
-  stroke: black + 1pt,
-  id: "",
-  inverted: (),
-  debug: (
-    ports: false
-  )
-) = {
-  iec-gate.iec-gate(
-    x: x,
-    y: y,
-    w: w,
-    h: h,
-    inputs: inputs,
-    fill: fill,
-    stroke: stroke,
-    id: id,
-    inverted: inverted,
-    debug: debug,
-    symbol: $= 1$,
-  )
-}
-
-/// Draws an IEC-XNOR gate. This function is also available as `element.iec-gate-xnor()`
-/// 
-/// For parameters, see #doc-ref("gates.iec-gate")
-/// #examples.iec-gate-xnor
-#let iec-gate-xnor(
-  x: none,
-  y: none,
-  w: none,
-  h: none,
-  inputs: 2,
-  fill: none,
-  stroke: black + 1pt,
-  id: "",
-  inverted: (),
-  debug: (
-    ports: false
-  )
-) = {
-  iec-gate-xor(
-    x: x,
-    y: y,
-    w: w,
-    h: h,
-    inputs: inputs,
-    fill: fill,
-    stroke: stroke,
-    id: id,
-    inverted: if inverted != "all" {inverted + ("out",)} else {inverted},
-    debug: debug
-  )
-}

src/gates.typ

@@ -3,8 +3,3 @@
 #import "elements/logic/or.typ": gate-or, gate-nor
 #import "elements/logic/xor.typ": gate-xor, gate-xnor
 #import "elements/logic/buf.typ": gate-buf, gate-not
-#import "elements/logic/iec_gate.typ": iec-gate
-#import "elements/logic/iec_and.typ": iec-gate-and, iec-gate-nand
-#import "elements/logic/iec_or.typ": iec-gate-or, iec-gate-nor
-#import "elements/logic/iec_buf.typ": iec-gate-buf, iec-gate-not
-#import "elements/logic/iec_xor.typ": iec-gate-xor, iec-gate-xnor

src/lib.typ

@@ -5,3 +5,4 @@
 #import "gates.typ"
 #import "util.typ"
 #import "wire.typ"
+#import "electrical.typ"

src/wire.typ

@@ -3,7 +3,7 @@
 
 /// List of valid wire styles
 /// #examples.wires
-#let wire-styles = ("direct", "zigzag", "dodge", "guided")
+#let wire-styles = ("direct", "zigzag", "dodge")
 #let signal-width = 1pt
 #let bus-width = 1.5pt
 
@@ -109,88 +109,6 @@
   return (points, anchors)
 }
 
-#let get-guided-wire(pts, margins, sides, center-guides, ctx) = {
-  let start = pts.first()
-  let end = pts.last()
-  let (margin-start, margin-end) = margins
-  let (side-start, side-end) = sides
-  let (center_horizontal, center_vertical) = center-guides
-
-  let (ctx, p0) = coordinate.resolve(ctx, start)
-  let (ctx, p6) = coordinate.resolve(ctx, end)
-  p0 = (x: p0.first(), y: p0.at(1))
-  p6 = (x: p6.first(), y: p6.at(1))
-
-  let box_width = calc.abs(p6.x - p0.x)
-  let box_height = calc.abs(p6.y - p0.y)
-
-  // finding correct dx and dy
-  let dx1 = box_width * margin-start / 100%
-  if side-start == "west" {
-    dx1 *= -1
-  } else if side-start == "north" or side-start == "south" { dx1 = 0}
-
-  let dx2 = box_width * margin-end / 100%
-  if side-end == "west" {
-    dx2 *= -1
-  } else if side-end == "north" or side-end == "south" { dx2 = 0}
-
-  let dy1 = box_height * margin-start / 100%
-  if side-start == "south" {
-    dy1 *= -1
-  } else if side-start == "west" or side-start == "east" { dy1 = 0}
-
-  let dy2 = box_height * margin-end / 100%
-  if side-end == "south" {
-    dy2 *= -1
-  } else if side-end == "west" or side-end == "east" { dy2 = 0}
-
-
-  // points that are closest to the edge points
-  let p1 = (p0.x + dx1, p0.y + dy1)
-  let p5 = (p6.x + dx2, p6.y + dy2)
-
-
-  // middle point
-  let center_x = p0.x + box_width * center_horizontal / 100%
-  let center_y = p0.y + box_height * center_vertical / 100%
-  let p3 = (center_x, center_y)
-
-  // setting up the points for that touch the guides
-  let p2 = (0,0)
-  let p4 = (0,0)
-  if side-start in ("north", "south") {
-    p2 = (horizontal: p3, vertical: p1)
-  } else {
-    p2 = (horizontal: p1, vertical: p3)
-  }
-  if side-end in ("north", "south") {
-    p4 = (horizontal: p3, vertical: p5)
-  } else if side-end in ("east", "west") {
-    p4 = (horizontal: p5, vertical: p3)
-  }
-
-  // returning
-  let points = (
-    start,
-    p1,
-    p2,
-    p3,
-    p4,
-    p5,
-    end
-  )
-  let anchors = (
-    "start": start,
-    "start2": points.at(1),
-    "guide-start": points.at(2),
-    "center": points.at(3),
-    "guide-end": points.at(4),
-    "end2": points.at(5),
-    "end": end
-  )
-  return (points, anchors)
-}
 /// Draws a wire between two points
 /// - id (str): The wire's id, for future reference (anchors)
 /// - pts (array): The two points (as CeTZ compatible coordinates, i.e. XY, relative positions, ids, etc.)
@@ -209,9 +127,6 @@
 /// - dodge-y (number): Y position to dodge the wire to (only with style "dodge")
 /// - dodge-sides (array): The start and end sides (going out of the connected element) of the wire (only with style "dodge")
 /// - dodge-margins (array): The start and end margins (i.e. space before dodging) of the wire (only with style "dodge")
-/// - guided-center (array): the horizontal and vertical guides of the center guides (only with style "guided")
-/// - guided-margins (array): the start and end of guided margins of the wire (only with style "guided")
-/// - guided-sides (array): the side of start and end array (must be either "north", "south", "west", "east") (only work with style "guided")
 #let wire(
   id, pts,
   bus: false,
@@ -222,9 +137,6 @@
   dashed: false,
   style: "direct",
   reverse: false,
-  guided-center: (50%, 50%),
-  guided-margins: (5%, 5%),
-  guided-sides: ("east", "west"),
   directed: false,
   rotate-name: true,
   zigzag-ratio: 50%,
@@ -266,14 +178,6 @@
       dodge-sides,
       ctx
     )
-  } else if style == "guided" {
-    (points, anchors) = get-guided-wire(
-      pts,
-      guided-margins,
-      guided-sides,
-      guided-center,
-      ctx
-    )
   }
 
   let mark = (fill: color)