feat: add s-shape wire style

Introduces a new "s-shape" wire style connecting two ports on opposite
cardinal sides (east<->west or north<->south) via 5 segments joined at
4 corners (u1-start, u1-end, u2-start, u2-end). The axis is auto-detected
from port anchors; when both endpoints share the same perpendicular
coordinate (single-block loopback) `s-ratio-mid` is reinterpreted as an
absolute signed offset so the crossbar can still be placed above or
below the endpoints.

Supports anchor-based placement via the `s-at-*` family of parameters
(s-at-1, s-at-mid, s-at-2) analogous to `zigzag-at` and `u-at`.

README.md

@@ -3,7 +3,7 @@
 Circuiteria is a [Typst](https://typst.app) package for drawing block circuit diagrams using the [CeTZ](https://typst.app/universe/package/cetz) package.
 
 <p align="center">
-  <img src="./gallery/platypus.png" alt="Perry the platypus">
+  <img src="./gallery/platypus.png" alt="A platypus / Perry the Platypus meme made with colored rounded rectangles">
 </p>
 
 ## Examples
@@ -11,17 +11,17 @@ Circuiteria is a [Typst](https://typst.app) package for drawing block circuit di
   <tr>
     <td colspan="2">
       <a href="./gallery/test.typ">
-        <img src="./gallery/test.png" width="500px">
+        <img src="./gallery/test.png" width="500px" alt="Block diagram of a multi-cycle RISC-V FPGA processor">
       </a>
     </td>
   </tr>
   <tr>
-    <td colspan="2">A bit of eveything</td>
+    <td colspan="2">A bit of everything</td>
   </tr>
   <tr>
     <td colspan="2">
       <a href="./gallery/test5.typ">
-        <img src="./gallery/test5.png" width="500px">
+        <img src="./gallery/test5.png" width="500px" alt="Block diagram of a single-cycle RISC-V processor">
       </a>
     </td>
   </tr>
@@ -31,12 +31,12 @@ Circuiteria is a [Typst](https://typst.app) package for drawing block circuit di
   <tr>
     <td>
       <a href="./gallery/test4.typ">
-        <img src="./gallery/test4.png" width="250px">
+        <img src="./gallery/test4.png" width="250px" alt="Top-level block diagram of a single-cycle RISC-V processor">
       </a>
     </td>
     <td>
       <a href="./gallery/test6.typ">
-        <img src="./gallery/test6.png" width="250px">
+        <img src="./gallery/test6.png" width="250px" alt="Block diagram of a simple single-cycle RISC-V ALU">
       </a>
     </td>
   </tr>
@@ -56,7 +56,7 @@ For more information, see the [manual](manual.pdf)
 
 To use this package, simply import [circuiteria](https://typst.app/universe/package/circuiteria) and call the `circuit` function:
 ```typ
-#import "@preview/circuiteria:0.2.0"
+#import "@preview/circuiteria:0.2.1"
 #circuiteria.circuit({
   import circuiteria: *
   ...

doc/examples.typ

@@ -56,7 +56,7 @@ for i in range(3) {
 ```)
 
 #let wires = example(```
-for i in range(3) {
+for i in range(5) {
   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,8 +65,216 @@ 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"))
+wire.wire("w5", ("p8", "p9"), style: "u-shape",
+          u-side: "east", u-depth: 0.5)
 ```, vertical: true)
 
+#let zigzag-at = example(
+  ```
+  // `zigzag-at` places the middle bend of a zigzag wire
+  // on the axis of a referenced anchor, overriding
+  // `zigzag-ratio`.
+  element.block(x: 0, y: 0, w: 1.5, h: 1.5, id: "src",
+    ports: (east: ((id: "o", name: "O"),),))
+  element.block(x: 3, y: -1.2, w: 1, h: 1, id: "ref",
+    fill: util.colors.pink,
+    ports: (west: ((id: "p", name: "R"),),))
+  element.block(x: 5.5, y: -2, w: 1.5, h: 1.5, id: "dst",
+    ports: (west: ((id: "i", name: "I"),),))
+  // String form: anchor name of a port.
+  wire.wire("w1", ("src-port-o", "dst-port-i"),
+            style: "zigzag",
+            zigzag-at: "ref-port-p")
+  // Ergonomic offset: shift 8pt right of ref.east.
+  wire.wire("w2", ("src-port-o", "dst-port-i"),
+            style: "zigzag",
+            zigzag-at: (rel: 8pt, to: "ref.east"))
+  ```,
+  vertical: true,
+)
+
+#let u-shape-wire = example(
+  ```
+  // east <-> east (u-side auto-detected)
+  element.block(x: 0,   y: 0,    w: 1.5, h: 1.5, id: "eA",
+    fill: util.colors.orange,
+    ports: (east: ((id: "out"),)))
+  element.block(x: 0.5, y: -2.5, w: 1.5, h: 1.5, id: "eB",
+    fill: util.colors.orange,
+    ports: (east: ((id: "out"),)))
+  wire.wire("uEE", ("eA-port-out", "eB-port-out"),
+            style: "u-shape", u-depth: 0.5)
+
+  // west <-> west (auto-detected)
+  element.block(x: 6,   y: 0,    w: 1.5, h: 1.5, id: "wA",
+    fill: util.colors.yellow,
+    ports: (west: ((id: "in"),)))
+  element.block(x: 6.5, y: -2.5, w: 1.5, h: 1.5, id: "wB",
+    fill: util.colors.yellow,
+    ports: (west: ((id: "in"),)))
+  wire.wire("uWW", ("wA-port-in", "wB-port-in"),
+            style: "u-shape", u-depth: 0.5)
+
+  // north <-> north (auto-detected)
+  element.block(x: 10,   y: -3,   w: 1.5, h: 1.5, id: "nA",
+    fill: util.colors.green,
+    ports: (north: ((id: "out"),)))
+  element.block(x: 12.5, y: -2.5, w: 1.5, h: 1.5, id: "nB",
+    fill: util.colors.green,
+    ports: (north: ((id: "out"),)))
+  wire.wire("uNN", ("nA-port-out", "nB-port-out"),
+            style: "u-shape", u-depth: 0.5)
+
+  // south <-> south with explicit u-side override
+  element.block(x: 16,   y: -3,   w: 1.5, h: 1.5, id: "sA",
+    fill: util.colors.pink,
+    ports: (south: ((id: "out"),)))
+  element.block(x: 18.5, y: -3.5, w: 1.5, h: 1.5, id: "sB",
+    fill: util.colors.pink,
+    ports: (south: ((id: "out"),)))
+  wire.wire("uSS", ("sA-port-out", "sB-port-out"),
+            style: "u-shape", u-side: "south", u-depth: 0.5)
+  ```,
+  vertical: true,
+)
+
+#let u-at = example(
+  ```
+  // `u-at` places the U-bend crossbar on the axis
+  // of a referenced anchor, overriding `u-depth`.
+  element.block(x: 0, y: 0,    w: 1.5, h: 1.5, id: "eA",
+    fill: util.colors.orange,
+    ports: (east: ((id: "o1"), (id: "o2"))))
+  element.block(x: 0, y: -3.5, w: 1.5, h: 1.5, id: "eB",
+    fill: util.colors.orange,
+    ports: (east: ((id: "i1"), (id: "i2"))))
+  element.block(x: 4, y: -2.25, w: 0.6, h: 0.6, id: "ref",
+    fill: util.colors.pink)
+  // Align one U crossbar with ref.east.
+  wire.wire("u1", ("eA-port-o1", "eB-port-i1"),
+            style: "u-shape",
+            u-at: "ref.east")
+  // Ergonomic scalar offset: 1 right of ref.east.
+  wire.wire("u2", ("eA-port-o2", "eB-port-i2"),
+            style: "u-shape", color: util.colors.blue,
+            u-at: (rel: 1, to: "ref.east"))
+  ```,
+  vertical: true,
+)
+
+#let s-shape-wire = example(
+  ```
+  // `s-shape` connects endpoints on opposite sides
+  // via 5 segments joined at 4 corners (u1-start,
+  // u1-end, u2-start, u2-end). Auto-detects axis
+  // from port anchors.
+  element.block(x: 0, y: 0, w: 1, h: 1, id: "A",
+    fill: util.colors.orange,
+    ports: (west: ((id: "out"),)))
+  element.block(x: 2.5, y: -1.75, w: 1, h: 1, id: "B",
+    fill: util.colors.orange,
+    ports: (east: ((id: "in"),)))
+  wire.wire("s1", ("A-port-out", "B-port-in"),
+            style: "s-shape")
+
+  // Anchor-based override of the crossbar position.
+  element.block(x: 5.5, y: 0, w: 1, h: 1, id: "C",
+    fill: util.colors.yellow,
+    ports: (west: ((id: "out"),)))
+  element.block(x: 8.5, y: -1.75, w: 1, h: 1, id: "D",
+    fill: util.colors.yellow,
+    ports: (east: ((id: "in"),)))
+  element.block(x: 7, y: -0.7, w: 0.5, h: 0.5, id: "ref",
+    fill: util.colors.pink)
+  wire.wire("s2", ("C-port-out", "D-port-in"),
+            style: "s-shape",
+            s-at-mid: "ref.south")
+
+  // C-shape degeneration: crossbar outside the
+  // endpoint span (s-ratio-mid > 100%).
+  element.block(x: 11, y: 0, w: 1, h: 1, id: "E",
+    fill: util.colors.green,
+    ports: (west: ((id: "out"),)))
+  element.block(x: 14, y: -0.75, w: 1, h: 1, id: "F",
+    fill: util.colors.green,
+    ports: (east: ((id: "in"),)))
+  wire.wire("s3", ("E-port-out", "F-port-in"),
+            style: "s-shape",
+            s-ratio-mid: 200%)
+  ```,
+  vertical: true,
+)
+
+#let s-shape-wire-vertical = example(
+  ```
+  // `s-shape` on the vertical axis (north <-> south):
+  // seg1 and seg5 are vertical, the crossbar is
+  // vertical, and the two horizontals connect them.
+  element.block(x: 0, y: 0, w: 1, h: 1, id: "A",
+    fill: util.colors.orange,
+    ports: (north: ((id: "out"),)))
+  element.block(x: 2, y: -3, w: 1, h: 1, id: "B",
+    fill: util.colors.orange,
+    ports: (south: ((id: "in"),)))
+  wire.wire("s1", ("A-port-out", "B-port-in"),
+            style: "s-shape")
+
+  // Anchor-based override of the vertical crossbar.
+  element.block(x: 5, y: 0, w: 1, h: 1, id: "C",
+    fill: util.colors.yellow,
+    ports: (north: ((id: "out"),)))
+  element.block(x: 7, y: -3, w: 1, h: 1, id: "D",
+    fill: util.colors.yellow,
+    ports: (south: ((id: "in"),)))
+  element.block(x: 6.25, y: -1.5, w: 0.5, h: 0.5, id: "vref",
+    fill: util.colors.pink)
+  wire.wire("s2", ("C-port-out", "D-port-in"),
+            style: "s-shape",
+            s-at-mid: "vref.east")
+  ```,
+  vertical: true,
+)
+
+#let s-shape-wire-loopback = example(
+  ```
+  // `s-shape` looping back on a single block that
+  // has a west output and an east input. The wire
+  // exits west, wraps around below the block via a
+  // C-shape, and enters from the east.
+  //
+  // Since both endpoints share the same y, the
+  // crossbar's position is set by `s-ratio-mid`
+  // as an absolute distance below the endpoint y.
+  element.block(x: 2, y: 0, w: 1.5, h: 1.5, id: "A",
+    fill: util.colors.orange,
+    ports: (
+      west: ((id: "out"),),
+      east: ((id: "in"),),
+    ))
+  wire.wire("s1", ("A-port-out", "A-port-in"),
+            style: "s-shape",
+            s-depth-1: 1.5, s-depth-2: 1.5,
+            s-ratio-mid: 150%)
+
+  // Negative `s-ratio-mid` routes the crossbar the
+  // other way (above the block).
+  element.block(x: 7, y: 0, w: 1.5, h: 1.5, id: "B",
+    fill: util.colors.yellow,
+    ports: (
+      west: ((id: "out"),),
+      east: ((id: "in"),),
+    ))
+  wire.wire("s2", ("B-port-out", "B-port-in"),
+            style: "s-shape",
+            s-depth-1: 1.5, s-depth-2: 1.5,
+            s-ratio-mid: -150%)
+  ```,
+  vertical: true,
+)
+
 #let stub = example(```
 draw.circle((0, 0), radius: .1, name: "p")
 wire.stub("p", "north", name: "north", length: 1)
@@ -115,6 +323,46 @@ 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"),
@@ -147,4 +395,4 @@ wire.wire("w1", ((0, 0), (1, 1)), style: "zigzag")
 wire.wire("w2", ((0, 0), (1, -.5)),
           style: "zigzag", zigzag-ratio: 80%)
 wire.intersection("w1.zig")
-```)
+```)

gallery/platypus.typ

@@ -1,4 +1,4 @@
-#import "../src/lib.typ": *
+#import "@preview/circuiteria:0.2.1": *
 
 #set page(width: auto, height: auto, margin: .5cm)
 

gallery/target_api.typ

@@ -1,286 +0,0 @@
-#import "../src/lib.typ": *
-#import "/src/cetz.typ": draw
-
-#set text(font: "Source Sans 3")
-#set page(width: auto, height: auto, margin: .5cm)
-
-#circuit({
-  element.block(
-    size: (1.5, 2.2),
-    id: "PCBuf",
-    fill: util.colors.orange,
-    ports: (
-      west: "PCNext",
-      north: (id: "CLK", clock: true),
-      east: "PC",
-      south: (("EN", "EN"),)
-    )
-  )
-  
-  wire.stub("PCBuf.CLK", name: "CLK")
-  wire.stub("PCBuf.EN", name: "PCWrite")
-  
-  element.multiplexer(
-    pos: (
-      3, (align: "in0", with: "PCBuf.PC")
-    ),
-    size: (1, 2),
-    id: "AdrSrc-MP",
-    fill: util.colors.orange,
-    entries: 2
-  )
-  wire.wire(
-    "PCBuf.PC",
-    "AdrSrc-MP.in0",
-    id: "wPCBuf-InstDataMgr",
-    name: "PC",
-    bus: true
-  )
-  wire.stub("AdrSrc-MP.north", side: "north", name: "AdrSrc")
-  
-  element.block(
-    pos: (
-      6, (align: "A", with: "AdrSrc-MP.out")
-    ),
-    size: (3, 4),
-    id: "InstDataMgr",
-    fill: util.colors.yellow,
-    ports: (
-      west: (
-        ("A", "A"),
-        ("WD", "WD")
-      ),
-      north: (
-        (id: "CLK", clock: true),
-        (id: "WE", name: "WE", vertical: true),
-        (id: "IRWrite", name: "IRWrite", vertical: true)
-      ),
-      east: (
-        ("Instr", "Instr."),
-        ("RD", "RD")
-      )
-    ),
-    ports-margins: (
-      west: (30%, 0%),
-      east: (40%, 0%)
-    )
-  )
-  wire.wire(
-    "AdrSrc-MP.out",
-    "InstDataMgr.A",
-    id: "wAdrSrcMP-InstDataMgr",
-    name: (none, "Adr"),
-    bus: true
-  )
-  
-  wire.stub("InstDataMgr.CLK", name: "CLK")
-  wire.stub("InstDataMgr.WE")
-  wire.stub("InstDataMgr.IRWrite")
-  wire.stub("InstDataMgr.WD")
-
-  element.block(
-    pos: (
-      15, (align: "WD3", with: "InstDataMgr.RD")
-    ),
-    size: (3, 4),
-    id: "RegFile",
-    fill: util.colors.pink,
-    ports: (
-      west: (
-        ("A1", "A1"),
-        ("A2", "A2"),
-        ("A3", "A3"),
-        ("WD3", "WD3"),
-      ),
-      north: (
-        (id: "CLK", clock: true),
-        (id: "WE3", name: "WE3", vertical: true)
-      ),
-      east: (
-        ("RD1", "RD1"),
-        ("RD2", "RD2"),
-      )
-    ),
-    ports-margins: (
-      east: (20%, 20%)
-    )
-  )
-  wire.stub("RegFile.CLK", name: "CLK")
-  wire.stub("RegFile.WE3", name: "Regwrite", name-offset: 0.6)
-  wire.stub("RegFile.A2")
-  wire.stub("RegFile.RD2")
-
-  element.extender(
-    pos: (15, -3.5),
-    size: (3, 1),
-    id: "Extender",
-    fill: util.colors.green
-  )
-  wire.wire(
-    "Extender.north",
-    (18, -2),
-    id: "wExtender-ImmSrc",
-    style: "zigzag",
-    zigzag-ratio: 0%,
-    name: (none, "ImmSrc"),
-    bus: true
-  )
-
-  
-  let mid = ("InstDataMgr.east", 50%, "RegFile.west")
-  wire.wire(
-    "InstDataMgr.Instr",
-    (vertical: (), horizontal: mid),
-    id: "wInstDataMgr-Bus",
-    name: ("Instr", none),
-    bus: true
-  )
-  wire.wire(
-    (v => (v.at(0), -3.5), mid),
-    (horizontal: (), vertical: (0, 3.5)),
-    id: "wBus",
-    bus: true
-  )
-  wire.wire(
-    "RegFile.A1",
-    (horizontal: mid, vertical: ()),
-    id: "wBus-RegFile-A1",
-    name: (none, "RS1"),
-    slice: (19, 15),
-    reverse: true,
-    bus: true
-  )
-  wire.wire(
-    "RegFile.A3",
-    (horizontal: mid, vertical: ()),
-    id: "wBus-RegFile-A3",
-    name: (none, "RD"),
-    slice: (11, 7),
-    reverse: true,
-    bus: true
-  )
-  wire.wire(
-    "Extender.in",
-    (horizontal: mid, vertical: ()),
-    id: "wBus-Extender",
-    slice: (31, 7),
-    reverse: true,
-    bus: true
-  )
-  
-  element.alu(
-    pos: (
-      22, (align: "in1", with: "RegFile.RD1")
-    ),
-    size: (1, 2),
-    id: "ALU",
-    fill: util.colors.purple
-  )
-  wire.wire(
-    "RegFile.RD1",
-    "ALU.in1",
-    id: "wRegFile-ALU",
-    name: ("A", "SrcA"),
-    bus: true
-  )
-  wire.stub("ALU.north", side: "north")
-
-  element.block(
-    pos: (
-      26, (align: "in", with: "ALU.out")
-    ),
-    size: (1.5, 2),
-    id: "OutBuf",
-    fill: util.colors.orange,
-    ports: (
-      west: "in",
-      north: (id: "CLK", clock: true),
-      east: "out"
-    )
-  )
-  wire.stub("OutBuf.CLK", name: "CLK")
-  wire.wire(
-    "ALU.out",
-    "OutBuf.in",
-    id: "wALU-OutBuf",
-    name: "ALUResult",
-    bus: true
-  )
-
-  element.multiplexer(
-    pos: (
-      30, (align: "in0", with: "OutBuf.out")
-    ),
-    size: (1, 2.5),
-    id: "Res-MP",
-    fill: util.colors.orange,
-    entries: 3
-  )
-  wire.stub("Res-MP.north", side: "north", name: "ResultSrc")
-  wire.stub("Res-MP.in2")
-  wire.wire(
-    "OutBuf.out",
-    "Res-MP.in0",
-    id: "wOutBuf-ResMP",
-    name: "ALUOut",
-    bus: true
-  )
-
-  wire.wire(
-    "Extender.out",
-    "ALU.in2",
-    id: "wExt-ALU",
-    name: ("ImmExt", "SrcB"),
-    bus: true,
-    style: "zigzag",
-    zigzag-ratio: 60%
-  )
-
-  wire.wire(
-    "InstDataMgr.RD",
-    "Res-MP.in1",
-    id: "wInstDataMgr-ResMP",
-    style: "dodge",
-    dodge-y: -4,
-    dodge-sides: ("east", "west"),
-    name: ("Data", none),
-    bus: true
-  )
-
-  wire.wire(
-    "Res-MP.out",
-    "AdrSrc-MP.in1",
-    id: "wResMP-AdrSrc",
-    style: "dodge",
-    dodge-y: -5,
-    dodge-sides: ("east", "west"),
-    dodge-margins: (0.5, 1),
-    bus: true
-  )
-
-  wire.wire(
-    "Res-MP.out",
-    "RegFile.WD3",
-    id: "wResMP-RegFile",
-    style: "dodge",
-    dodge-y: -5,
-    dodge-sides: ("east", "west"),
-    dodge-margins: (0.5, 1),
-    bus: true
-  )
-
-  wire.wire(
-    "Res-MP.out",
-    "PCBuf.PCNext",
-    id: "wResMP-PCBuf",
-    style: "dodge",
-    dodge-y: -5,
-    dodge-sides: ("east", "west"),
-    dodge-margins: (0.5, 1.5),
-    name: (none, "PCNext"),
-    bus: true
-  )
-
-  wire.intersection("wResMP-RegFile.dodge-end", radius: .2)
-  wire.intersection("wResMP-AdrSrc.dodge-end", radius: .2)
-})

gallery/test.typ

@@ -1,4 +1,4 @@
-#import "../src/lib.typ": circuit, element, util, wire
+#import "@preview/circuiteria:0.2.1": circuit, element, util, wire
 
 #set page(width: auto, height: auto, margin: .5cm)
 

gallery/test2.typ

@@ -1,4 +1,4 @@
-#import "../src/lib.typ": circuit, element, util, wire
+#import "@preview/circuiteria:0.2.1": circuit, element, util, wire
 
 #set page(width: auto, height: auto, margin: .5cm)
 

gallery/test3.typ

@@ -1,5 +1,4 @@
-#import "/src/cetz.typ": draw
-#import "../src/lib.typ": circuit, element, util, wire
+#import "@preview/circuiteria:0.2.1": circuit, element, util, wire
 
 #set page(width: auto, height: auto, margin: .5cm)
 

gallery/test4.typ

@@ -1,5 +1,5 @@
 #import "/src/cetz.typ": draw
-#import "../src/lib.typ": *
+#import "@preview/circuiteria:0.2.1": *
 
 #set page(width: auto, height: auto, margin: .5cm)
 

gallery/test5.typ

@@ -1,5 +1,5 @@
 #import "/src/cetz.typ": draw
-#import "../src/lib.typ": *
+#import "@preview/circuiteria:0.2.1": *
 
 #set page(width: auto, height: auto, margin: .5cm)
 

gallery/test6.typ

@@ -1,5 +1,5 @@
-#import "/src/cetz.typ": draw, vector
-#import "../src/lib.typ": *
+#import "/src/cetz.typ": draw
+#import "@preview/circuiteria:0.2.1": *
 
 #set page(width: auto, height: auto, margin: .5cm)
 

gallery/test7.typ

@@ -0,0 +1,97 @@
+#import "@preview/circuiteria:0.2.1": 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")
+  }
+})

gallery/test_ushape.typ

@@ -0,0 +1,53 @@
+// Demonstrates the u-shape wire style.
+// The u-side is auto-detected from the port anchors when both endpoints
+// belong to elements (deduced from the port position vs the element's
+// center anchor). It can also be set explicitly with u-side.
+#import "/src/lib.typ": circuit, element, util, wire
+
+#set page(width: auto, height: auto, margin: .5cm)
+
+#circuit({
+  // ---- east <-> east (auto-detected) ----
+  element.block(x: 0,   y: 0,    w: 1.5, h: 1.5, id: "eA",
+    fill: util.colors.orange,
+    ports: (east: ((id: "out"),)))
+  element.block(x: 0.5, y: -2.5, w: 1.5, h: 1.5, id: "eB",
+    fill: util.colors.orange,
+    ports: (east: ((id: "out"),)))
+  wire.wire("uEE", ("eA-port-out", "eB-port-out"),
+            style: "u-shape", u-depth: 0.6,
+            name: "E-E")
+
+  // ---- west <-> west (auto-detected) ----
+  element.block(x: 6,   y: 0,    w: 1.5, h: 1.5, id: "wA",
+    fill: util.colors.yellow,
+    ports: (west: ((id: "in"),)))
+  element.block(x: 6.5, y: -2.5, w: 1.5, h: 1.5, id: "wB",
+    fill: util.colors.yellow,
+    ports: (west: ((id: "in"),)))
+  wire.wire("uWW", ("wA-port-in", "wB-port-in"),
+            style: "u-shape", u-depth: 0.6,
+            name: "W-W")
+
+  // ---- north <-> north (auto-detected) ----
+  element.block(x: 10,   y: -3,   w: 1.5, h: 1.5, id: "nA",
+    fill: util.colors.green,
+    ports: (north: ((id: "out"),)))
+  element.block(x: 12.5, y: -2.5, w: 1.5, h: 1.5, id: "nB",
+    fill: util.colors.green,
+    ports: (north: ((id: "out"),)))
+  wire.wire("uNN", ("nA-port-out", "nB-port-out"),
+            style: "u-shape", u-depth: 0.6,
+            name: "N-N")
+
+  // ---- south <-> south (explicit u-side override) ----
+  element.block(x: 16,   y: 0,    w: 1.5, h: 1.5, id: "sA",
+    fill: util.colors.pink,
+    ports: (south: ((id: "out"),)))
+  element.block(x: 18.5, y: -0.5, w: 1.5, h: 1.5, id: "sB",
+    fill: util.colors.pink,
+    ports: (south: ((id: "out"),)))
+  wire.wire("uSS", ("sA-port-out", "sB-port-out"),
+            style: "u-shape", u-side: "south", u-depth: 0.6,
+            name: "S-S")
+})

manual.typ

@@ -1,4 +1,4 @@
-#import "@preview/tidy:0.4.1"
+#import "@preview/tidy:0.4.3"
 #import "/src/cetz.typ": draw, canvas
 #import "src/lib.typ"
 #import "doc/examples.typ"
@@ -105,7 +105,7 @@ This package provides a way to make beautiful block circuit diagrams using the C
 
 Simply import Circuiteria and call the `circuit` function:
 #pad(left: 1em)[```typ
-#import "@preview/circuiteria:0.2.0"
+#import "@preview/circuiteria:0.2.1"
 #circuiteria.circuit({
   import circuiteria: *
   ...
@@ -195,7 +195,12 @@ 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"),
+  read("src/elements/logic/xor.typ") + "\n" +
+  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/cetz.typ

@@ -1 +1 @@
-#import "@preview/cetz:0.3.4": *
+#import "@preview/cetz:0.5.2": *

src/circuit.typ

@@ -1,5 +1,5 @@
 #import "/src/cetz.typ": canvas
-#import "@preview/tidy:0.3.0"
+#import "@preview/tidy:0.4.3"
 
 /// Draws a block circuit diagram
 ///
@@ -9,52 +9,5 @@
 /// - length (length, ratio): Optional base unit
 /// -> none
 #let circuit(body, length: 2em) = {
-  let next-id = 0
-  let elements = (:)
-  let ids = ()
-  for e in body {
-    if type(e) == dictionary and "id" in e {
-      ids.push(e.id)
-    }
-  }
-
-  for element in body {
-    let internal = type(element) == dictionary and "id" in element
-    let eid = if internal {element.id} else {auto}
-    if eid == auto {
-      while str(next-id) in ids {
-        next-id += 1
-      }
-      eid = str(next-id)
-      ids.push(eid)
-      if internal {
-        element.id = eid
-      }
-      next-id += 1
-    }
-    if eid in elements {
-      panic("An element with the id '" + eid + "' already exists. Please use a different id")
-    }
-    elements.insert(eid, element)
-  }
-
-  for element in elements.values() {
-    if type(element) == dictionary and "pre-process" in element {
-      elements = (element.pre-process)(elements, element)
-      assert(
-        type(elements) == dictionary,
-        message: "The `pre-process` method of element '" + element.id + "' did not return the elements dictionary"
-      )
-    }
-  }
-
-  canvas(length: length, {
-    for element in elements.values() {
-      if type(element) == dictionary and "draw" in element {
-        (element.draw)(element)
-      } else {
-        (element,)
-      }
-    }
-  })
-}
+  canvas(length: length, body)
+}

src/element.typ

@@ -11,5 +11,10 @@
 #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/alu.typ

@@ -1,40 +1,45 @@
 #import "/src/cetz.typ": draw
 #import "element.typ"
 #import "ports.typ": add-port
-#import "../util.typ"
-
-#let draw-shape(elmt, bounds) = {
-  let tl = bounds.tl
-  let tr = bounds.tr
-  let bl = bounds.bl
-  let br = bounds.br
 
+#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
   let p0 = tl
-  let p1 = util.lerp(tr, 10%, br)
-  let p2 = util.lerp(tr, 90%, br)
+  let p1 = (tr, 10%, br)
+  let p2 = (tr, 90%, br)
   let p3 = bl
-  let p4 = util.lerp(tl, 55%, bl)
-  let p5 = util.lerp(tl, 50%, br)
-  let p6 = util.lerp(tl, 45%, bl)
-
-  let bounds2 = element.complete-bounds(elmt, (
-    tl: p0,
-    tr: p1,
-    br: p2,
-    bl: p3
-  ))
+  let p4 = (tl, 55%, bl)
+  let p5 = (tl, 50%, br)
+  let p6 = (tl, 45%, bl)
   
-  let f = {
-    draw.line(
-      p0, p1, p2, p3, p4, p5, p6,
-      fill: elmt.fill,
-      stroke: elmt.stroke,
-      close: true
+  let f1 = draw.group(name: id, {
+    
+    draw.merge-path(
+      inset: 0.5em,
+      fill: fill,
+      stroke: stroke,
+      close: true,
+      draw.line(p0, p1, p2, p3, p4, p5, p6)
     )
+    draw.anchor("north", (p0, 50%, p1))
+    draw.anchor("south", (p2, 50%, p3))
+    draw.anchor("west", (p0, 50%, p3))
+    draw.anchor("east", (p1, 50%, p2))
+    draw.anchor("north-west", p0)
+    draw.anchor("north-east", p1)
+    draw.anchor("south-east", p2)
+    draw.anchor("south-west", p3)
     draw.anchor("name", (p5, 50%, (p1, 50%, p2)))
+  })
+
+  let f2 = add-port(id, "west", (id: "in1"), (p0, 50%, p6))
+  let f3 = add-port(id, "west", (id: "in2"), (p3, 50%, p4))
+  let f4 = add-port(id, "east", (id: "out"), (p1, 50%, p2))
+
+  let f = {
+    f1; f2; f3; f4
   }
 
-  return (f, bounds2)
+  return (f, tl, tr, br, bl)
 }
 
 /// Draws an ALU with two inputs
@@ -42,7 +47,18 @@
 /// #examples.alu
 /// For parameters description, see #doc-ref("element.elmt")
 #let alu(
-  ..args
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false
+  )
 ) = {
   let ports = (
     west: (
@@ -54,18 +70,24 @@
     )
   )
   
-  return element.elmt(
+  element.elmt(
     draw-shape: draw-shape,
+    x: x,
+    y: y,
+    w: w,
+    h: h,
+    name: name,
+    name-anchor: name-anchor,
     ports: ports,
-    ports-pos: (
-      west: (
-        in1: l => l * 0.225,
-        in2: l => l * 0.775,
-      ),
-      east: (
-        out: l => l * 0.5
-      )
+    fill: fill,
+    stroke: stroke,
+    id: id,
+    auto-ports: false,
+    ports-y: (
+      in1: (h) => {h * 0.225},
+      in2: (h) => {h * 0.775},
+      out: (h) => {h * 0.5}
     ),
-    ..args
+    debug: debug
   )
 }

src/elements/block.typ

@@ -1,25 +1,51 @@
 #import "/src/cetz.typ": draw
 #import "element.typ"
 
-#let draw-shape(elmt, bounds) = {
+#let draw-shape(id, tl, tr, br, bl, fill, stroke, radius: 0.5em) = {
   let f = draw.rect(
-    radius: 0.5em,
+    radius: radius,
     inset: 0.5em,
-    fill: elmt.fill,
-    stroke: elmt.stroke,
-    bounds.bl, bounds.tr
+    fill: fill,
+    stroke: stroke,
+    name: id,
+    bl, tr
   )
-  return (f, bounds)
+  return (f, tl, tr, br, bl)
 }
 
 /// Draws a block element
 ///
 /// #examples.block
-/// For parameters description, see #doc-ref("element.elmt")
+/// For other parameters description, see #doc-ref("element.elmt")
+/// - radius (number, length, ratio, dictionary): The corner radius of the block. See CeTZ documentation for more information
 #let block(
-  ..args
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  ports: (),
+  ports-margins: (),
+  fill: none,
+  radius: 0.5em,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false
+  )
 ) = element.elmt(
-  cls: "block",
-  draw-shape: draw-shape,
-  ..args
-)
+  draw-shape: draw-shape.with(radius: radius),
+  x: x,
+  y: y,
+  w: w,
+  h: h,
+  name: name,
+  name-anchor: name-anchor,
+  ports: ports,
+  ports-margins: ports-margins,
+  fill: fill,
+  stroke: stroke,
+  id: id,
+  debug: debug
+)

src/elements/element.typ

@@ -1,5 +1,5 @@
-#import "/src/cetz.typ": draw, coordinate, matrix, vector
-#import "ports.typ": add-ports, add-port, get-port-pos, get-port-idx
+#import "/src/cetz.typ": draw, coordinate
+#import "ports.typ": add-ports, add-port
 #import "../util.typ"
 
 #let find-port(ports, id) = {
@@ -10,234 +10,13 @@
       }
     }
   }
-  panic("Could not find port with id '" + str(id) + "' in ports " + repr(ports))
+  panic("Could not find port with id " + str(id))
 }
 
-#let local-to-global(origin, u, v, points) = {
-  return points-real = points.map(p => {
-    let (pu, pv) = p
-    return vector.add(
-      origin,
-      vector.add(
-        vector.scale(u, pu),
-        vector.scale(v, pv)
-      )
-    )
-  })
+#let default-draw-shape(id, tl, tr, br, bl, fill, stroke) = {
+  return ({}, tl, tr, br, bl)
 }
 
-#let default-draw-shape(elmt, bounds) = {
-  return ({}, bounds)
-}
-
-#let default-pre-process(elements, element) = {
-  return elements
-}
-
-#let resolve-offset(ctx, offset, from, axis) = {
-  let (ctx, pos) = coordinate.resolve(
-    ctx,
-    (rel: offset, to: from)
-  )
-  return pos.at(axis)
-}
-
-#let resolve-align(ctx, elmt, bounds, align, with, axis) = {
-  let (align-side, i) = find-port(elmt.ports, align)
-  let margins = (0%, 0%)
-  if align-side in elmt.ports-margins {
-    margins = elmt.ports-margins.at(align-side)
-  }
-
-  let parallel-sides = (
-    ("north", "south"),
-    ("west", "east")
-  ).at(axis)
-
-  let ortho-sides = (
-    ("west", "east"),
-    ("north", "south")
-  ).at(axis)
-
-  let dl
-  let start-margin
-  let len = elmt.size.at(axis)
-  if align-side in parallel-sides {
-    let used-pct = 100% - margins.at(0) - margins.at(1)
-    let used-len = len * used-pct / 100%
-    start-margin = len * margins.at(0) / 100%
-    
-    //dl = used-len * (i + 1) / (elmt.ports.at(align-side).len() + 1)
-    dl = get-port-pos(elmt, bounds, align-side, align, get-port-idx(elmt, align, side: align-side))
-    /*if not elmt.auto-ports {
-      start-margin = 0
-      dl = elmt.ports-pos.at(align)(len)
-    }*/
-  } else if align-side == ortho-sides.first() {
-    dl = 0
-    start-margin = 0
-  } else {
-    dl = len
-    start-margin = 0
-  }
-
-  if axis == 1 {
-    dl = len - dl
-  }
-  
-  let (ctx, with-pos) = coordinate.resolve(ctx, with)
-  return with-pos.at(axis) - dl + start-margin
-}
-
-#let resolve-coordinate(ctx, elmt, bounds, coord, axis) = {
-  if type(coord) == dictionary {
-    let offset = coord.at("offset", default: none)
-    let from = coord.at("from", default: none)
-    let align = coord.at("align", default: none)
-    let with = coord.at("with", default: none)
-
-    if none not in (offset, from) {
-      if type(offset) != array {
-        let a = (0, 0)
-        a.at(axis) = offset
-        offset = a
-      }
-      return resolve-offset(ctx, offset, from, axis)
-      
-    } else if none not in (align, with) {
-      return resolve-align(ctx, elmt, bounds, align, with, axis)
-    } else {
-      panic("Dictionnary must either provide both 'offset' and 'from', or 'align' and 'with'")
-    }
-  }
-  if type(coord) not in (int, float, length) {
-    panic("Invalid " + "xy".at(axis) + " coordinate: " + repr(coord))
-  }
-  return coord
-}
-
-#let complete-bounds(elmt, bounds) = {
-  let b = bounds
-  bounds += (
-    center: (
-      (b.br.at(0) + b.tl.at(0))/2,
-      (b.br.at(1) + b.tl.at(1))/2
-    ),
-    b: (
-      (b.br.at(0) + b.bl.at(0))/2,
-      (b.br.at(1) + b.bl.at(1))/2
-    ),
-    t: (
-      (b.tr.at(0) + b.tl.at(0))/2,
-      (b.tr.at(1) + b.tl.at(1))/2
-    ),
-    l: (
-      (b.bl.at(0) + b.tl.at(0))/2,
-      (b.bl.at(1) + b.tl.at(1))/2
-    ),
-    r: (
-      (b.br.at(0) + b.tr.at(0))/2,
-      (b.br.at(1) + b.tr.at(1))/2
-    ),
-    sides: (
-      north: (bounds.tl, bounds.tr),
-      south: (bounds.bl, bounds.br),
-      west: (bounds.tl, bounds.bl),
-      east: (bounds.tr, bounds.br),
-    ),
-    lengths: (
-      north: (bounds.tr.at(0) - bounds.tl.at(0)),
-      south: (bounds.br.at(0) - bounds.bl.at(0)),
-      west: (bounds.tl.at(1) - bounds.bl.at(1)),
-      east: (bounds.tr.at(1) - bounds.br.at(1)),
-    ),
-    ports: (:)
-  )
-  for (side, props) in bounds.sides.pairs() {
-    let props2 = props
-    if side in elmt.ports-margins {
-      let (pt0, pt1) = props
-      let margins = elmt.ports-margins.at(side)
-      let a = util.lerp(pt0, margins.at(0), pt1)
-      let b = util.lerp(pt0, 100% - margins.at(1), pt1)
-      props2 = (a, b)
-    }
-    bounds.ports.insert(side, props2)
-  }
-  return bounds
-}
-
-#let make-bounds(elmt, x, y, w, h) = {
-  let w2 = w / 2
-  let h2 = h / 2
-  
-  let bounds = (
-    bl: (x, y),
-    tl: (x, y + h),
-    tr: (x + w, y + h),
-    br: (x + w, y),
-  )
-  return complete-bounds(elmt, bounds)
-}
-
-#let render(draw-shape, elmt) = draw.group(name: elmt.id, ctx => {
-  let width = elmt.size.first()
-  let height = elmt.size.last()
-
-  let x = elmt.pos.first()
-  let y = elmt.pos.last()
-
-  let bounds = make-bounds(elmt, 0, 0, width, height)
-  x = resolve-coordinate(ctx, elmt, bounds, x, 0)
-  y = resolve-coordinate(ctx, elmt, bounds, y, 1)
-  bounds = make-bounds(elmt, x, y, width, height)
-
-  // Workaround because CeTZ needs to have all draw functions in the body
-  let func = {}
-  let res = draw-shape(elmt, bounds)
-  assert(
-    type(res) == array and res.len() == 2,
-    message: "The drawing function of element '" + elmt.id + "' did not return a function and new bounds"
-  )
-  (func, bounds) = res
-  if type(func) == function {
-    func = (func,)
-  }
-  assert(
-    type(bounds) == dictionary,
-    message: "The drawing function of element '" + elmt.id + "' did not return the correct bounds dictionary"
-  )
-  func
-
-  draw.anchor("north", bounds.t)
-  draw.anchor("south", bounds.b)
-  draw.anchor("west", bounds.l)
-  draw.anchor("east", bounds.r)
-  draw.anchor("north-west", bounds.tl)
-  draw.anchor("north-east", bounds.tr)
-  draw.anchor("south-east", bounds.br)
-  draw.anchor("south-west", bounds.bl)
-
-  if elmt.name != none {
-    draw.content(
-      (name: elmt.id, anchor: elmt.name-anchor),
-      anchor: if elmt.name-anchor in util.valid-anchors {elmt.name-anchor} else {"center"},
-      padding: 0.5em,
-      align(center)[*#elmt.name*]
-    )
-  }
-
-  add-ports(elmt, bounds)
-
-  if elmt.debug.bounds {
-    draw.line(
-      bounds.tl, bounds.tr, bounds.br, bounds.bl,
-      stroke: red,
-      close: true
-    )
-  }
-})
-
 /// Draws an element
 /// - draw-shape (function): Draw function
 /// - x (number, dictionary): The x position (bottom-left corner).
@@ -266,59 +45,101 @@
 ///   Supported fields include:
 ///     - `ports`: if true, shows dots on all ports of the element
 #let elmt(
-  cls: "element",
   draw-shape: default-draw-shape,
-  pre-process: default-pre-process,
-  pos: (0, 0),
-  size: (1, 1),
+  x: none,
+  y: none,
+  w: none,
+  h: none,
   name: none,
   name-anchor: "center",
   ports: (:),
   ports-margins: (:),
   fill: none,
   stroke: black + 1pt,
-  id: auto,
-  ports-pos: auto,
+  id: "",
+  auto-ports: true,
+  ports-y: (:),
   debug: (
-    bounds: false,
     ports: false
-  ),
-  extra: (:)
-) = {
-  for (key, side-ports) in ports.pairs() {
-    if type(side-ports) == str {
-      side-ports = ((id: side-ports),)
-    } else if type(side-ports) == dictionary {
-      side-ports = (side-ports,)
+  )
+) = 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 (to-side, i) = find-port(ports, to)
+    let margins = (0%, 0%)
+    if to-side in ports-margins {
+      margins = ports-margins.at(to-side)
     }
 
-    for (i, port) in side-ports.enumerate() {
-      if type(port) == array {
-        side-ports.at(i) = (
-          id: port.at(0, default: ""),
-          name: port.at(1, default: "")
-        )
-      } else if type(port) == str {
-        side-ports.at(i) = (id: port)
+    let dy
+    let top-margin
+    if to-side in ("east", "west") {
+      let used-pct = 100% - margins.at(0) - margins.at(1)
+      let used-height = height * used-pct / 100%
+      top-margin = height * margins.at(0) / 100%
+      
+      dy = used-height * (i + 1) / (ports.at(to-side).len() + 1)
+
+      if not auto-ports {
+        top-margin = 0
+        dy = ports-y.at(to)(height)
       }
+    } else if to-side == "north" {
+      dy = 0
+      top-margin = 0
+    } else if to-side == "south" {
+      dy = height
+      top-margin = 0
     }
-    ports.at(key) = side-ports
+    
+    let (ctx, from-pos) = coordinate.resolve(ctx, from)
+    y = from-pos.at(1) + dy - height + top-margin
   }
 
-  return ((
-    cls: cls,
-    id: id,
-    draw: render.with(draw-shape),
-    pre-process: pre-process,
-    pos: pos,
-    size: size,
-    name: name,
-    name-anchor: name-anchor,
-    ports: ports,
-    ports-margins: ports-margins,
-    fill: fill,
-    stroke: stroke,
-    ports-pos: ports-pos,
-    debug: debug
-  ) + extra,)
-}
+  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)
+  func
+
+  if (name != none) {
+    draw.content(
+      (name: id, anchor: name-anchor),
+      anchor: if name-anchor in util.valid-anchors {name-anchor} else {"center"},
+      padding: 0.5em,
+      align(center)[*#name*]
+    )
+  }
+
+  if auto-ports {
+    add-ports(
+      id,
+      tl, tr, br, bl,
+      ports,
+      ports-margins,
+      debug: debug.ports
+    )
+  }
+})

src/elements/extender.typ

@@ -1,25 +1,41 @@
 #import "/src/cetz.typ": draw
 #import "element.typ"
 #import "ports.typ": add-port
-#import "../util.typ"
 
-#let draw-shape(elmt, bounds) = {
-  let ratio = elmt.l-ratio / 100%
-  let tl2 = util.lerp(bounds.bl, elmt.l-ratio, bounds.tl)
-  let bounds2 = element.complete-bounds(elmt, (
-    tl: tl2,
-    tr: bounds.tr,
-    br: bounds.br,
-    bl: bounds.bl,
-  ))
+#let draw-shape(id, tl, tr, br, bl, fill, stroke, h-ratio: 75%, align-out: true) = {
+  let (x, y) = bl
+  let (width, height) = (tr.at(0) - x, tr.at(1) - y)
 
-  let f = draw.line(
-    bounds2.tl, bounds2.tr, bounds2.br, bounds2.bl,
-    fill: elmt.fill,
-    stroke: elmt.stroke,
-    close: true
-  )
-  return (f, bounds2)
+  let ratio = h-ratio / 100%
+
+  tl = (x, y + height * ratio)
+  let tr2 = (x + width, y + height * ratio)
+  let br = (x + width, y)
+  
+  if align-out {
+    (tr, tr2) = (tr2, tr)
+  } else {
+    (tr, tr2) = (tr, tr)
+  }
+
+  let f = draw.group(name: id, {
+    draw.merge-path(
+      inset: 0.5em,
+      fill: fill,
+      stroke: stroke,
+      close: true,
+      draw.line(tl, tr2, br, bl)
+    )
+    draw.anchor("north", (tl, 50%, tr2))
+    draw.anchor("south", (bl, 50%, br))
+    draw.anchor("west", (tl, 50%, bl))
+    draw.anchor("east", (tr2, 50%, br))
+    draw.anchor("north-west", tl)
+    draw.anchor("north-east", tr2)
+    draw.anchor("south-east", br)
+    draw.anchor("south-west", bl)
+  })
+  return (f, tl, tr, br, bl)
 }
 
 /// Draws a bit extender
@@ -29,28 +45,54 @@
 /// - h-ratio (ratio): The height ratio of the left side relative to the full height
 /// - align-out (bool): If true, the output and input ports are aligned, otherwise, the output port is centered on the right side
 #let extender(
-  l-ratio: 75%,
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  h-ratio: 75%,
   align-out: true,
-  ..args
+  debug: (
+    ports: false
+  )
 ) = {
   let ports = (
-    west: ((id: "in"),),
-    east: ((id: "out"),)
+    west: (
+      (id: "in"),
+    ),
+    east: (
+      (id: "out"),
+    )
   )
-  let out-pct = if align-out {l-ratio / 2} else {50%}
-  let ports-pos = (
-    "east": (l, i) => {l - l * (out-pct / 100%)}
+  let out-pct = if align-out {h-ratio / 2} else {50%}
+  let ports-y = (
+    "in": (h) => {h - h * (h-ratio / 200%)},
+    "out": (h) => {h - h * (out-pct / 100%)}
   )
   
-  return element.elmt(
-    cls: "extender",
-    draw-shape: draw-shape,
+  element.elmt(
+    draw-shape: draw-shape.with(h-ratio: h-ratio, align-out: align-out),
+    x: x,
+    y: y,
+    w: w,
+    h: h,
+    name: name,
+    name-anchor: name-anchor,
     ports: ports,
-    ports-pos: ports-pos,
-    extra: (
-      l-ratio: l-ratio,
-      align-out: align-out
-    ),
-    ..args
+    auto-ports: false,
+    ports-y: ports-y,
+    fill: fill,
+    stroke: stroke,
+    id: id,
+    debug: debug
   )
+
+  let in-pos = (rel: (0, h * (h-ratio / 200%)), to: id+".south-west")
+  let out-pos = (id+".south-east", out-pct, id+".north-east")
+  add-port(id, "west", ports.west.first(), in-pos)
+  add-port(id, "east", ports.east.first(), out-pos)
 }

src/elements/logic/gate.typ

@@ -63,6 +63,12 @@
     if to == "out" {
       dy = height / 2
     } else {
+      let all-ports = range(inputs).map(i => "in" + str(i))
+      let i = all-ports.position(p => p == to)
+      assert(
+        i != none,
+        message: "Unknown port '" + y.to + "' must be one of " + repr(all-ports)
+      )
       dy = height * (i + 0.5) / inputs
     }
     

src/elements/logic/iec_and.typ

@@ -0,0 +1,70 @@
+#import "/src/cetz.typ": 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

@@ -0,0 +1,68 @@
+#import "/src/cetz.typ": 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

@@ -0,0 +1,125 @@
+#import "/src/cetz.typ": 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

@@ -0,0 +1,67 @@
+#import "/src/cetz.typ": 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

@@ -0,0 +1,67 @@
+#import "/src/cetz.typ": 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/elements/multiplexer.typ

@@ -3,24 +3,29 @@
 #import "element.typ"
 #import "ports.typ": add-port
 
-#let draw-shape(elmt, bounds) = {
-  let margin = (100% - elmt.l-ratio) / 2
-  let tr2 = util.lerp(bounds.tr, margin, bounds.br)
-  let br2 = util.lerp(bounds.br, margin, bounds.tr)
-  let bounds2 = element.complete-bounds(elmt, (
-    tl: bounds.tl,
-    bl: bounds.bl,
-    tr: tr2,
-    br: br2,
-  ))
-  let f = draw.line(
-    bounds2.tl, bounds2.tr, bounds2.br, bounds2.bl,
-    close: true,
-    fill: elmt.fill,
-    stroke: elmt.stroke
-  )
+#let draw-shape(id, tl, tr, br, bl, fill, stroke, h-ratio: 60%) = {
+  let margin = (100% - h-ratio) / 2
+  let tr2 = (tr, margin, br)
+  let br2 = (br, margin, tr)
+  let f = draw.group(name: id, {
+    draw.merge-path(
+      inset: 0.5em,
+      fill: fill,
+      stroke: stroke,
+      close: true,
+      draw.line(tl, tr2, br2, bl)
+    )
+    draw.anchor("north", (tl, 50%, tr2))
+    draw.anchor("south", (bl, 50%, br2))
+    draw.anchor("west", (tl, 50%, bl))
+    draw.anchor("east", (tr2, 50%, br2))
+    draw.anchor("north-west", tl)
+    draw.anchor("north-east", tr2)
+    draw.anchor("south-east", br2)
+    draw.anchor("south-west", bl)
+  })
 
-  return (f, bounds2)
+  return (f, tl, tr, br, bl)
 }
 
 /// Draws a multiplexer
@@ -30,44 +35,64 @@
 /// - entries (int, array): If it is an integer, it defines the number of input ports (automatically named with their binary index). If it is an array of strings, it defines the name of each input.
 /// - h-ratio (ratio): The height ratio of the right side relative to the full height
 #let multiplexer(
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
   entries: 2,
-  l-ratio: 60%,
-  ..args
+  h-ratio: 60%,
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false
+  )
 ) = {
-  let in-ports = ()
-  let ports-pos = (
-    "east": auto,
+  let ports = ()
+  let ports-y = (
+    out: (h) => {h * 0.5}
   )
 
   if (type(entries) == int) {
     let nbits = calc.ceil(calc.log(entries, base: 2))
     for i in range(entries) {
       let bits = util.lpad(str(i, base: 2), nbits)
-      in-ports.push((id: "in" + str(i), name: bits))
+      ports.push((id: "in" + str(i), name: bits))
     }
   } else {
     for (i, port) in entries.enumerate() {
-      in-ports.push((id: "in" + str(i), name: port))
+      ports.push((id: "in" + str(i), name: port))
     }
   }
 
-  let n = in-ports.len()
-  ports-pos.insert("west", (l, i) => {l * (i + 0.5) / n})
+  let space = 100% / ports.len()
+  let l = ports.len()
+  for (i, port) in ports.enumerate() {
+    ports-y.insert(port.id, (h) => {h * (i + 0.5) / l})
+  }
   
   element.elmt(
-    cls: "multiplexer",
-    draw-shape: draw-shape,
-    ports: (west: in-ports, east: ((id: "out"),)),
-    ports-pos: ports-pos,
-    extra: (l-ratio: l-ratio),
-    ..args
+    draw-shape: draw-shape.with(h-ratio: h-ratio),
+    x: x,
+    y: y,
+    w: w,
+    h: h,
+    name: name,
+    name-anchor: name-anchor,
+    ports: (west: ports, east: ((id: "out"),)),
+    fill: fill,
+    stroke: stroke,
+    id: id,
+    ports-y: ports-y,
+    auto-ports: false,
+    debug: debug
   )
 
-  /*
   for (i, port) in ports.enumerate() {
     let pct = (i + 0.5) * space
     add-port(id, "west", port, (id+".north-west", pct, id+".south-west"))
   }
   add-port(id, "east", (id: "out"), (id+".north-east", 50%, id+".south-east"))
-  */
 }

src/elements/ports.typ

@@ -1,76 +1,6 @@
 #import "/src/cetz.typ": draw
 #import "../util.typ": rotate-anchor
 
-#let get-port-side(elmt, port) = {
-  for (side, ports) in elmt.ports {
-    for p in ports {
-      if p.id == port {
-        return side
-      }
-    }
-  }
-  panic(
-    "Unknown port '" + port + "' on element '" + elmt.id + "', could not automatically determine side"
-  )
-}
-
-#let get-port-idx(elmt, port, side: auto) = {
-  if side == auto {
-    side = get-port-side(elmt, port)
-  }
-  assert(
-    side in elmt.ports,
-    message: "No ports on side '" + side + "' of element '" + elmt.id + "'"
-  )
-  let i = elmt.ports.at(side).position(p => p.id == port)
-  assert(
-    i != none,
-    message: "Could not find port '" + port + "' on side '" + side + "' of element '" + elmt.id + "'"
-  )
-  return i
-}
-
-#let get-port-pos(elmt, bounds, side, port, port-i) = {
-  let (pt0, pt1) = bounds.ports.at(side)
-  let side-len = if side in ("north", "south") {
-    pt1.at(0) - pt0.at(0)
-  } else {
-    pt0.at(1) - pt1.at(1)
-  }
-
-  let offset = if (
-    elmt.ports-pos == auto or
-    elmt.ports-pos.at(side, default: auto) == auto
-  ) {
-    let space = 100% / (elmt.ports.at(side, default: ()).len() + 1)
-    (port-i + 1) * space
-  } else {
-    assert(
-      side in elmt.ports-pos,
-      message: "Could not reliably compute port position (missing side)"
-    )
-    let side-pos = elmt.ports-pos.at(side)
-    if type(side-pos) == function {
-      (side-pos)(side-len, port-i)
-    } else if type(side-pos) == array {
-      (side-pos.at(i))(side-len)
-    } else if type(side-pos) == dictionary {
-      assert(
-        port in side-pos,
-        message: "Could not reliably compute port position (missing port)"
-      )
-      (side-pos.at(port))(side-len)
-    } else {
-      panic("Could not reliably compute port position (invalid type)")
-    }
-  }
-
-  if type(offset) == ratio {
-    offset = offset * side-len / 100%
-  }
-  return offset
-}
-
 #let add-port(
   elmt-id, side, port, pos,
   prev: none,
@@ -104,10 +34,12 @@
     angle: if name-rotate {90deg} else {0deg},
     name
   )
+  let id = elmt-id + "-port-" + port.at("id")
 
   if debug {
     draw.circle(
       pos,
+      name: id,
       radius: .1,
       stroke: none,
       fill: red
@@ -117,48 +49,53 @@
     draw.hide(draw.circle(
       pos,
       radius: 0,
-      stroke: none
+      stroke: none,
+      name: id
     ))
   }
-  draw.anchor(port.id, pos)
 }
 
 #let add-ports(
-  elmt,
-  bounds
+  elmt-id,
+  tl, tr, br, bl,
+  ports,
+  ports-margins,
+  debug: false
 ) = {
-  let debug = elmt.debug.at("ports", default: false)
+  let sides = (
+    "north": (tl, tr),
+    "east": (tr, br),
+    "south": (bl, br),
+    "west": (tl, bl)
+  )
 
-  if type(elmt.ports) != dictionary {
+  if type(ports) != dictionary {
     return
   }
 
-  for (side, props) in bounds.ports {
-    let side-ports = elmt.ports.at(side, default: ())
+  for (side, props) in sides {
+    let side-ports = ports.at(side, default: ())
     let space = 100% / (side-ports.len() + 1)
-    
-    let (pt0, pt1) = props
-    let side-len = if side in ("north", "south") {
-      pt1.at(0) - pt0.at(0)
-    } else {
-      pt0.at(1) - pt1.at(1)
-    }
-    for (i, port) in side-ports.enumerate() {
-      let offset = get-port-pos(elmt, bounds, side, port.id, i)
 
-      let pos = (pt0, offset, pt1)
-      let offset-prev = if type(offset) == ratio {
-        offset - space / 2
-      } else {
-        offset - space * side-len / 200%
+    for (i, port) in side-ports.enumerate() {
+      let pct = (i + 1) * space
+      let pt0 = props.at(0)
+      let pt1 = props.at(1)
+
+      if side in ports-margins {
+        let (a, b) = (pt0, pt1)
+        let margins = ports-margins.at(side)
+        a = (pt0, margins.at(0), pt1)
+        b = (pt0, 100% - margins.at(1), pt1)
+        pt0 = a
+        pt1 = b
       }
-      let offset-next = if type(offset) == ratio {
-        offset + space / 2
-      } else {
-        offset + space * side-len / 200%
-      }
-      let pos-prev = (pt0, offset-prev, pt1)
-      let pos-next = (pt0, offset-next, pt1)
+      
+      let pos = (pt0, pct, pt1)
+      let pct-prev = (i + 0.5) * space
+      let pct-next = (i + 1.5) * space
+      let pos-prev = (pt0, pct-prev, pt1)
+      let pos-next = (pt0, pct-next, pt1)
 
       if port.at("small", default: false) {
         pos-prev = (pos, 4pt, pt0)
@@ -166,7 +103,7 @@
       }
 
       add-port(
-        elmt.id,
+        elmt-id,
         side,
         port,
         pos,

src/gates.typ

@@ -2,4 +2,9 @@
 #import "elements/logic/and.typ": gate-and, gate-nand
 #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/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

@@ -1,4 +1,5 @@
-#let version = version(0, 2, 0)
+#let version = version(0, 2, 1)
+#let name = "circuiteria"
 
 #import "circuit.typ": circuit
 #import "element.typ"

src/util.typ

@@ -75,9 +75,43 @@
   "north-east", "north-west", "south-east", "south-west"
 )
 
-#let lerp(pt0, ratio, pt1) = {
-  return (
-    (pt1.at(0) - pt0.at(0)) * ratio / 100% + pt0.at(0),
-    (pt1.at(1) - pt0.at(1)) * ratio / 100% + pt0.at(1)
-  )
+/// Normalizes a coordinate so that 2D points (x, y) are padded
+/// to (x, y, 0) as required by CeTZ's coordinate resolver.
+/// Also handles function-based and dictionary-based coordinates
+/// recursively.
+///
+/// - coord (any): A CeTZ-compatible coordinate
+/// -> any
+#let normalize-coord(coord) = {
+  if type(coord) == array {
+    if coord.len() == 2 {
+      let (a, b) = coord
+      // Raw 2D point: (x, y) -> (x, y, 0)
+      if type(a) in (int, float) and type(b) in (int, float) {
+        return (a, b, 0)
+      }
+      // Function-based coordinate: (fn, point)
+      if type(a) == function {
+        let orig = a
+        return (v => {
+          let result = orig(v)
+          if type(result) == array and result.len() == 2 {
+            let (rx, ry) = result
+            if type(rx) in (int, float) and type(ry) in (int, float) {
+              return (rx, ry, 0)
+            }
+          }
+          return result
+        }, b)
+      }
+    }
+  }
+  if type(coord) == dictionary {
+    let result = (:)
+    for (key, value) in coord {
+      result.insert(key, normalize-coord(value))
+    }
+    return result
+  }
+  return coord
 }

src/wire.typ

@@ -1,11 +1,27 @@
 #import "/src/cetz.typ": draw, coordinate
-#import "util.typ": opposite-anchor
-#import "elements/ports.typ": get-port-side
-#import "elements/element.typ"
+#import "util.typ": opposite-anchor, normalize-coord
 
 /// List of valid wire styles
 /// #examples.wires
-#let wire-styles = ("direct", "zigzag", "dodge")
+///
+/// The `"u-shape"` style connects two ports that face the same cardinal side.
+/// #examples.u-shape-wire
+///
+/// The `"u-shape"` crossbar can also be aligned to an anchor via `u-at`
+/// (analogous to `zigzag-at`).
+/// #examples.u-at
+///
+/// The `"s-shape"` style connects two ports that face opposite cardinal sides
+/// (east↔west or north↔south) via 5 segments.
+/// #examples.s-shape-wire
+///
+/// The `"s-shape"` style also supports the vertical axis (north↔south):
+/// #examples.s-shape-wire-vertical
+///
+/// The `"s-shape"` style can also loop a single block's output back to its
+/// own input by wrapping around above (or below) via a C-shape:
+/// #examples.s-shape-wire-loopback
+#let wire-styles = ("direct", "zigzag", "dodge", "guided", "u-shape", "s-shape")
 #let signal-width = 1pt
 #let bus-width = 1.5pt
 
@@ -26,29 +42,95 @@
   return (pts, anchors)
 }
 
-#let get-zigzag-wire(pts, ratio, dir) = {
+// Normalize an anchor-based placement value used by `zigzag-at`, `u-at`, and
+// the `s-at-*` family.
+//
+// `axis` selects which cartesian component the offset applies to:
+//   - `"x"` → offset in x (used when the placement fixes an x coordinate, e.g.
+//             a vertical bend line for horizontal wire flow).
+//   - `"y"` → offset in y (used when the placement fixes a y coordinate).
+//
+// Accepted forms:
+//   - `none`                              → unset; caller falls back to
+//                                           depth/ratio-based placement.
+//   - `str` / tuple / native CeTZ dict    → passed through as a CeTZ coordinate.
+//   - `(rel: <length>, to: <coord>)` with a *scalar* `rel`
+//                                         → ergonomic axial offset, rewritten
+//                                           to `(rel: (rel, 0), to: to)` for
+//                                           `axis == "x"` or
+//                                           `(rel: (0, rel), to: to)` for
+//                                           `axis == "y"`. If `rel` is already
+//                                           an array/tuple, the value is
+//                                           passed through unchanged.
+#let normalize-scalar-offset(at, axis) = {
+  if at == none { return none }
+  if type(at) == dictionary and "rel" in at and "to" in at and type(at.rel) != array {
+    let r = at.rel
+    if axis == "x" {
+      return (rel: (r, 0), to: at.to)
+    } else {
+      return (rel: (0, r), to: at.to)
+    }
+  }
+  return at
+}
+
+// Backwards-compatible wrapper: translates the old `dir` vocabulary
+// (`"vertical"` / `"horizontal"`) to the `axis` vocabulary used by
+// `normalize-scalar-offset`.
+#let normalize-zigzag-at(at, dir) = {
+  let axis = if dir == "vertical" { "x" } else { "y" }
+  return normalize-scalar-offset(at, axis)
+}
+
+#let get-zigzag-wire(pts, ratio, dir, at: none) = {
   let start = pts.first()
   let end = pts.last()
-  let mid = if dir == "vertical" {
-    (start, ratio, (horizontal: end, vertical: ()))
-  } else {
-    (start, ratio, (horizontal: (), vertical: end))
-  }
 
-  let points = if dir == "vertical" {
-    (
-      start,
-      (horizontal: mid, vertical: ()),
-      (horizontal: (), vertical: end),
-      end
-    )
+  let points
+  if at == none {
+    // Ratio-based placement (default).
+    let mid = if dir == "vertical" {
+      (start, ratio, (horizontal: end, vertical: ()))
+    } else {
+      (start, ratio, (horizontal: (), vertical: end))
+    }
+
+    points = if dir == "vertical" {
+      (
+        start,
+        (horizontal: mid, vertical: ()),
+        (horizontal: (), vertical: end),
+        end
+      )
+    } else {
+      (
+        start,
+        (horizontal: (), vertical: mid),
+        (horizontal: end, vertical: ()),
+        end
+      )
+    }
   } else {
-    (
-      start,
-      (horizontal: (), vertical: mid),
-      (horizontal: end, vertical: ()),
-      end
-    )
+    // Anchor-based placement: the middle bend segment sits on the axis
+    // extracted from `at` via CeTZ's perpendicular operator `|-`:
+    //   - vertical:   middle segment at x = at.x
+    //   - horizontal: middle segment at y = at.y
+    points = if dir == "vertical" {
+      (
+        start,
+        (at, "|-", start),
+        (at, "|-", end),
+        end
+      )
+    } else {
+      (
+        start,
+        (start, "|-", at),
+        (end, "|-", at),
+        end
+      )
+    }
   }
   let anchors = (
     "start": start,
@@ -70,8 +152,8 @@
   
   let (ctx, p0) = coordinate.resolve(ctx, start)
   let (ctx, p3) = coordinate.resolve(ctx, end)
-  p0 = (x: p0.first(), y: p0.last())
-  p3 = (x: p3.first(), y: p3.last())
+  p0 = (x: p0.first(), y: p0.at(1))
+  p3 = (x: p3.first(), y: p3.at(1))
 
   let dx1 = margin-start
   let dx2 = margin-end
@@ -88,13 +170,13 @@
   if side-end == "east" {
     dx2 *= -1
   }
-  p1 = (p0.x + dx1, p0.y)
-  p2 = (p3.x - dx2, p0.y)
+  p1 = (p0.x + dx1, p0.y, 0)
+  p2 = (p3.x - dx2, p0.y, 0)
 
   let points = (
     start,
     (horizontal: p1, vertical: ()),
-    (horizontal: (), vertical: (0, dodge-y)),
+    (horizontal: (), vertical: (0, dodge-y, 0)),
     (horizontal: p2, vertical: ()),
     (horizontal: (), vertical: end),
     end
@@ -111,6 +193,397 @@
   return (points, anchors)
 }
 
+#let _u-valid-sides = ("east", "west", "north", "south")
+
+// Try to deduce the cardinal side a port anchor faces by comparing its
+// position to the center of the element it belongs to. Returns none if the
+// anchor is not a port-style anchor (i.e. does not contain "-port-") or if
+// resolution fails.
+#let detect-port-side(anchor, ctx) = {
+  if type(anchor) != str { return none }
+  let sep = "-port-"
+  if not anchor.contains(sep) { return none }
+  let elmt-id = anchor.split(sep).first()
+  let port-pos = none
+  let center-pos = none
+  // coordinate.resolve panics on unknown anchors; there is no try/catch in
+  // Typst, so we assume port anchors created by add-port always come with a
+  // matching group of the same name. If not, the user must set u-side
+  // explicitly.
+  let (_, p1) = coordinate.resolve(ctx, anchor)
+  let (_, p2) = coordinate.resolve(ctx, elmt-id + ".center")
+  port-pos = p1
+  center-pos = p2
+  let dx = port-pos.at(0) - center-pos.at(0)
+  let dy = port-pos.at(1) - center-pos.at(1)
+  if calc.abs(dx) >= calc.abs(dy) {
+    return if dx >= 0 { "east" } else { "west" }
+  } else {
+    return if dy >= 0 { "north" } else { "south" }
+  }
+}
+
+#let get-u-shape-wire(pts, u-depth, u-side, u-at, ctx) = {
+  let start = pts.first()
+  let end = pts.last()
+
+  // Resolve the (auto|explicit) side
+  let side = u-side
+  if side == auto {
+    let side-start = detect-port-side(start, ctx)
+    let side-end = detect-port-side(end, ctx)
+    if side-start != none and side-end != none and side-start != side-end {
+      panic(
+        "u-shape: start port faces '" + side-start
+        + "' but end port faces '" + side-end
+        + "'; both must face the same side, or set u-side explicitly"
+      )
+    }
+    if side-start != none { side = side-start }
+    else if side-end != none { side = side-end }
+    else {
+      panic(
+        "u-shape: could not auto-detect u-side (endpoints are not port anchors); "
+        + "please set u-side explicitly to one of " + repr(_u-valid-sides)
+      )
+    }
+  }
+  if not side in _u-valid-sides {
+    panic("u-shape: invalid u-side '" + repr(side) + "'; must be one of " + repr(_u-valid-sides))
+  }
+
+  let (ctx, s) = coordinate.resolve(ctx, start)
+  let (ctx, e) = coordinate.resolve(ctx, end)
+  let (sx, sy, ..) = s
+  let (ex, ey, ..) = e
+
+  // If `u-at` is set, resolve its coordinate and extract the relevant axis
+  // component; use it as the crossbar position instead of computing from
+  // `u-depth`.
+  let bar-at = none
+  if u-at != none {
+    let axis = if side == "east" or side == "west" { "x" } else { "y" }
+    let at-norm = normalize-scalar-offset(u-at, axis)
+    let (ctx2, r) = coordinate.resolve(ctx, at-norm)
+    bar-at = if axis == "x" { r.first() } else { r.at(1) }
+  }
+
+  let p1
+  let p2
+  if side == "east" {
+    let bx = if bar-at != none { bar-at } else { calc.max(sx, ex) + u-depth }
+    p1 = (bx, sy, 0)
+    p2 = (bx, ey, 0)
+  } else if side == "west" {
+    let bx = if bar-at != none { bar-at } else { calc.min(sx, ex) - u-depth }
+    p1 = (bx, sy, 0)
+    p2 = (bx, ey, 0)
+  } else if side == "north" {
+    let by = if bar-at != none { bar-at } else { calc.max(sy, ey) + u-depth }
+    p1 = (sx, by, 0)
+    p2 = (ex, by, 0)
+  } else if side == "south" {
+    let by = if bar-at != none { bar-at } else { calc.min(sy, ey) - u-depth }
+    p1 = (sx, by, 0)
+    p2 = (ex, by, 0)
+  }
+
+  let points = (start, p1, p2, end)
+  let anchors = (
+    "start": start,
+    "u-start": p1,
+    "u-end": p2,
+    "end": end
+  )
+  return (points, anchors)
+}
+
+// Valid combinations of endpoint sides for an S-shape wire.
+// Keyed by (sorted) pair; value is the wire axis.
+#let _s-axis-from-sides(a, b) = {
+  if a == none or b == none { return none }
+  let pair = (a, b)
+  if ("east" in pair) and ("west" in pair) { return "horizontal" }
+  if ("north" in pair) and ("south" in pair) { return "vertical" }
+  return none
+}
+
+// S-shape wire: 5 segments, 4 corners; connects endpoints on opposite sides.
+//
+// Horizontal axis (east ↔ west): sequence exits/enters through horizontal
+// segments; two vertical segments join them via a horizontal crossbar.
+//
+// Corner layout (horizontal axis):
+//   start ── c1
+//            │
+//            c2 ─────────── c3
+//                           │
+//                           c4 ── end
+//
+// (or mirrored, depending on which endpoint faces east vs west, and on the
+// relative y of the endpoints; when y_mid is outside the endpoint span the
+// shape degenerates into a C-shape.)
+#let get-s-shape-wire(
+  pts,
+  s-axis,
+  s-depth-1,
+  s-ratio-mid,
+  s-depth-2,
+  s-at-1,
+  s-at-mid,
+  s-at-2,
+  strict,
+  ctx,
+) = {
+  let start = pts.first()
+  let end = pts.last()
+
+  // Detect endpoint sides
+  let side-start = detect-port-side(start, ctx)
+  let side-end = detect-port-side(end, ctx)
+
+  // Resolve (auto|explicit) axis
+  let axis = s-axis
+  if axis == auto {
+    let detected = _s-axis-from-sides(side-start, side-end)
+    if detected == none {
+      panic(
+        "s-shape: could not auto-detect s-axis; endpoints must be port anchors "
+        + "facing opposite sides on the same axis (east+west or north+south). "
+        + "Detected start='" + repr(side-start) + "', end='" + repr(side-end)
+        + "'. Set s-axis explicitly to \"horizontal\" or \"vertical\"."
+      )
+    }
+    axis = detected
+  }
+  if axis != "horizontal" and axis != "vertical" {
+    panic("s-shape: invalid s-axis '" + repr(axis) + "'; must be \"horizontal\" or \"vertical\"")
+  }
+
+  // Effective depth/ratio (auto → defaults)
+  let depth-1 = if s-depth-1 == auto { 0.5 } else { s-depth-1 }
+  let depth-2 = if s-depth-2 == auto { 0.5 } else { s-depth-2 }
+  let ratio-mid-raw = if s-ratio-mid == auto { 50% } else { s-ratio-mid }
+  let ratio-mid = ratio-mid-raw / 100%
+
+  let (ctx, s) = coordinate.resolve(ctx, start)
+  let (ctx, e) = coordinate.resolve(ctx, end)
+  let (sx, sy, ..) = s
+  let (ex, ey, ..) = e
+
+  // Determine outward directions from each port
+  let outward(side) = {
+    if side == "east" { return (1, 0) }
+    if side == "west" { return (-1, 0) }
+    if side == "north" { return (0, 1) }
+    if side == "south" { return (0, -1) }
+    return none
+  }
+  let out-s = outward(side-start)
+  let out-e = outward(side-end)
+  // Fallback when a port side isn't known (e.g. non-port endpoint): infer from
+  // the axis, assuming the wire flows toward the far endpoint.
+  if out-s == none {
+    if axis == "horizontal" { out-s = (if ex > sx { 1 } else { -1 }, 0) }
+    else { out-s = (0, if ey > sy { 1 } else { -1 }) }
+  }
+  if out-e == none {
+    if axis == "horizontal" { out-e = (if sx > ex { 1 } else { -1 }, 0) }
+    else { out-e = (0, if sy > ey { 1 } else { -1 }) }
+  }
+
+  // Resolve the three placement overrides
+  let resolve-axial(at, ax) = {
+    if at == none { return none }
+    let at-norm = normalize-scalar-offset(at, ax)
+    let (_, r) = coordinate.resolve(ctx, at-norm)
+    return if ax == "x" { r.first() } else { r.at(1) }
+  }
+
+  let c1x
+  let c1y
+  let c2x
+  let c2y
+  let c3x
+  let c3y
+  let c4x
+  let c4y
+
+  if axis == "horizontal" {
+    // seg1 and seg5 are horizontal; the two verticals sit at x = x1 and x = x2.
+    let x1-at = resolve-axial(s-at-1, "x")
+    let x2-at = resolve-axial(s-at-2, "x")
+    let y-mid-at = resolve-axial(s-at-mid, "y")
+
+    let x1 = if x1-at != none { x1-at } else { sx + out-s.at(0) * depth-1 }
+    let x2 = if x2-at != none { x2-at } else { ex + out-e.at(0) * depth-2 }
+    // When the endpoints share the same y (degenerate span), the ratio-based
+    // formula collapses to sy. Fall back to a unit offset scaled by ratio-mid
+    // so the crossbar can still be pushed away from the endpoint axis
+    // (e.g. for single-block loopbacks). Direction defaults to "down" (-y).
+    let y-mid = if y-mid-at != none {
+      y-mid-at
+    } else if ey == sy {
+      sy - ratio-mid
+    } else {
+      sy + ratio-mid * (ey - sy)
+    }
+
+    c1x = x1; c1y = sy
+    c2x = x1; c2y = y-mid
+    c3x = x2; c3y = y-mid
+    c4x = x2; c4y = ey
+
+    // Sanity checks (strict-only)
+    if strict {
+      // seg1 must extend outward: sign(x1 - sx) should match out-s.x
+      if (x1 - sx) * out-s.at(0) <= 0 {
+        panic("s-shape: seg1 does not extend outward from start port "
+          + "(x1=" + str(x1) + ", start.x=" + str(sx) + ", outward.x="
+          + str(out-s.at(0)) + "). Adjust s-depth-1 or s-at-1.")
+      }
+      if (x2 - ex) * out-e.at(0) <= 0 {
+        panic("s-shape: seg5 does not extend outward from end port "
+          + "(x2=" + str(x2) + ", end.x=" + str(ex) + ", outward.x="
+          + str(out-e.at(0)) + "). Adjust s-depth-2 or s-at-2.")
+      }
+    }
+  } else {
+    // vertical axis: seg1 and seg5 are vertical; the two horizontals sit at
+    // y = y1 and y = y2; the middle crossbar is vertical at x = x-mid.
+    let y1-at = resolve-axial(s-at-1, "y")
+    let y2-at = resolve-axial(s-at-2, "y")
+    let x-mid-at = resolve-axial(s-at-mid, "x")
+
+    let y1 = if y1-at != none { y1-at } else { sy + out-s.at(1) * depth-1 }
+    let y2 = if y2-at != none { y2-at } else { ey + out-e.at(1) * depth-2 }
+    // Degenerate-span fallback: see comment in the horizontal branch.
+    let x-mid = if x-mid-at != none {
+      x-mid-at
+    } else if ex == sx {
+      sx + ratio-mid
+    } else {
+      sx + ratio-mid * (ex - sx)
+    }
+
+    c1x = sx; c1y = y1
+    c2x = x-mid; c2y = y1
+    c3x = x-mid; c3y = y2
+    c4x = ex; c4y = y2
+
+    if strict {
+      if (y1 - sy) * out-s.at(1) <= 0 {
+        panic("s-shape: seg1 does not extend outward from start port "
+          + "(y1=" + str(y1) + ", start.y=" + str(sy) + ", outward.y="
+          + str(out-s.at(1)) + "). Adjust s-depth-1 or s-at-1.")
+      }
+      if (y2 - ey) * out-e.at(1) <= 0 {
+        panic("s-shape: seg5 does not extend outward from end port "
+          + "(y2=" + str(y2) + ", end.y=" + str(ey) + ", outward.y="
+          + str(out-e.at(1)) + "). Adjust s-depth-2 or s-at-2.")
+      }
+    }
+  }
+
+  let c1 = (c1x, c1y, 0)
+  let c2 = (c2x, c2y, 0)
+  let c3 = (c3x, c3y, 0)
+  let c4 = (c4x, c4y, 0)
+
+  let points = (start, c1, c2, c3, c4, end)
+  let anchors = (
+    "start": start,
+    "u1-start": c1,
+    "u1-end": c2,
+    "u2-start": c3,
+    "u2-end": c4,
+    "end": end,
+  )
+  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, 0)
+  let p5 = (p6.x + dx2, p6.y + dy2, 0)
+
+
+  // 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, 0)
+
+  // setting up the points for that touch the guides
+  let p2 = (0, 0, 0)
+  let p4 = (0, 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.)
@@ -124,36 +597,115 @@
 /// - reverse (bool): If true, the start and end points will be swapped (useful in cases where the start point depends on the end point, for example with perpendiculars)
 /// - directed (bool): If true, the wire will be directed, meaning an arrow will be drawn at the endpoint
 /// - rotate-name (bool): If true, the name will be rotated according to the wire's slope
-/// - zigzag-ratio (ratio): Position of the zigzag vertical relative to the horizontal span (only with style "zigzag")
-/// - zigzag-dir (str): The zigzag's direction. As either "vertical" or "horizontal" (only with dstyle "zigzag")
+/// - zigzag-ratio (auto, ratio): Position of the zigzag middle bend segment relative to the horizontal (or vertical) span, as a fraction between the two endpoints (only with style "zigzag"). Defaults to `auto`, which resolves to `50%`. Panics if combined with an explicitly set `zigzag-at`.
+/// - zigzag-dir (auto, str): The zigzag's direction, as either "vertical" or "horizontal" (only with style "zigzag"). If `auto`, it is deduced from the endpoints when they are port anchors of the form `<elmt-id>-port-<port-id>` by comparing each port's position with its element's `.center` anchor: east/west-facing ports yield `"vertical"` (wire exits horizontally) and north/south-facing ports yield `"horizontal"`. If the direction cannot be deduced (no port anchor on either endpoint, or conflicting directions), it falls back to `"vertical"`.
+/// - zigzag-at (none, str, array, dictionary): Optional. Anchor-based placement of the zigzag middle bend segment (only with style "zigzag"). When set, overrides `zigzag-ratio` (which must be left at its default `auto`). The middle segment sits on the axis extracted from the given coordinate: `x` for `zigzag-dir: "vertical"`, `y` for `"horizontal"`. Accepted forms: a raw CeTZ anchor name string (e.g. `"elmt.center"` or `"elmt-port-a"`); any native CeTZ coordinate (tuple, dict such as `(rel: (dx, dy), to: anchor)`); or the ergonomic scalar-offset form `(rel: <length>, to: <coord>)`, which is rewritten to a `(dx, 0)` offset for `"vertical"` and `(0, dy)` for `"horizontal"`. See #examples.zigzag-at
 /// - 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")
+/// - u-side (auto, str): The cardinal side both endpoints face (one of "east", "west", "north", "south"). If `auto`, it is deduced from the endpoints when they are port anchors of the form `<elmt-id>-port-<port-id>` by comparing each port's position with its element's `.center` anchor. Auto-detection panics if the two endpoints resolve to different sides, or if neither endpoint is a port anchor (only with style "u-shape")
+/// - u-depth (auto, number): Distance between the outermost endpoint (in the `u-side` direction) and the U-bend line (only with style "u-shape"). Defaults to `auto`, which resolves to `0.5`. Panics if combined with an explicitly set `u-at`.
+/// - u-at (none, str, array, dictionary): Optional. Anchor-based placement of the U-bend crossbar (only with style "u-shape"). When set, overrides `u-depth` (which must be left at its default `auto`). The crossbar sits on the axis extracted from the given coordinate: `x` for `u-side` in `("east", "west")`, `y` for `("north", "south")`. Accepted forms mirror `zigzag-at`: raw CeTZ anchor name string, any native CeTZ coordinate, or the ergonomic scalar-offset form `(rel: <length>, to: <coord>)`, which is rewritten to `(dx, 0)` for east/west and `(0, dy)` for north/south.
+/// - s-axis (auto, str): The s-shape wire axis, one of "horizontal" or "vertical" (only with style "s-shape"). If `auto`, it is deduced from the endpoint port anchors: opposite east/west ports yield `"horizontal"`, opposite north/south ports yield `"vertical"`. Auto-detection panics on same-side, cross-axis, or non-port endpoints.
+/// - s-depth-1 (auto, number): Distance seg1 (the first outward segment) extends from the start port (only with style "s-shape"). Defaults to `auto`, which resolves to `0.5`. Panics if combined with an explicit `s-at-1`.
+/// - s-ratio-mid (auto, ratio): Position of the s-shape crossbar between the endpoints along the axis perpendicular to `s-axis` (only with style "s-shape"). Defaults to `auto`, which resolves to `50%`. Values outside `0%..100%` are allowed and yield a C-shape variant. When the two endpoints share the same perpendicular coordinate (e.g. a single-block loopback where both ports are at the same y), the endpoint span is zero and `s-ratio-mid` is instead interpreted as an absolute offset from that shared coordinate: the crossbar sits `s-ratio-mid` units below the endpoints for horizontal S, or `s-ratio-mid` units right for vertical S (using `1` = ratio unit). Panics if combined with an explicit `s-at-mid`.
+/// - s-depth-2 (auto, number): Distance seg5 (the last inward segment) extends from the end port (only with style "s-shape"). Defaults to `auto`, which resolves to `0.5`. Panics if combined with an explicit `s-at-2`.
+/// - s-at-1 (none, str, array, dictionary): Optional. Anchor-based placement overriding `s-depth-1` (only with style "s-shape"). Fixes the x (horizontal S) or y (vertical S) of the first vertical bend line. Accepted forms mirror `zigzag-at`.
+/// - s-at-mid (none, str, array, dictionary): Optional. Anchor-based placement overriding `s-ratio-mid` (only with style "s-shape"). Fixes the y (horizontal S) or x (vertical S) of the crossbar. Accepted forms mirror `zigzag-at`.
+/// - s-at-2 (none, str, array, dictionary): Optional. Anchor-based placement overriding `s-depth-2` (only with style "s-shape"). Fixes the x (horizontal S) or y (vertical S) of the second vertical bend line. Accepted forms mirror `zigzag-at`.
+/// - strict (bool): If true, s-shape performs sanity checks and panics when seg1/seg5 do not extend outward from their port (only with style "s-shape"). Defaults to `false`.
 #let wire(
-  pt0,
-  pt1,
-  id: none,
+  id, pts,
   bus: false,
   name: none,
+  name-pos: "middle",
   slice: none,
   color: black,
   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%,
-  zigzag-dir: "vertical",
+  zigzag-ratio: auto,
+  zigzag-dir: auto,
+  zigzag-at: none,
   dodge-y: 0,
   dodge-sides: ("east", "west"),
   dodge-margins: (5%, 5%),
-  ..args
+  u-side: auto,
+  u-depth: auto,
+  u-at: none,
+  s-axis: auto,
+  s-depth-1: auto,
+  s-ratio-mid: auto,
+  s-depth-2: auto,
+  s-at-1: none,
+  s-at-mid: none,
+  s-at-2: none,
+  strict: false,
 ) = draw.get-ctx(ctx => {
   if not style in wire-styles {
     panic("Invalid wire style '" + style + "'")
   }
 
-  let pts = (pt0, pt1)
+  if pts.len() != 2 {
+    panic("Wrong number of points (got " + str(pts.len()) + " instead of 2)")
+  }
+
+  // `zigzag-at` validation.
+  if zigzag-at != none {
+    if style != "zigzag" {
+      panic("wire '" + id + "': `zigzag-at` requires style: \"zigzag\" (got \""
+        + style + "\")")
+    }
+    if zigzag-ratio != auto {
+      panic("wire '" + id
+        + "': cannot combine `zigzag-at` with an explicit `zigzag-ratio`")
+    }
+  }
+  let zigzag-ratio-effective = if zigzag-ratio == auto { 50% } else { zigzag-ratio }
+
+  // `u-at` validation.
+  if u-at != none {
+    if style != "u-shape" {
+      panic("wire '" + id + "': `u-at` requires style: \"u-shape\" (got \""
+        + style + "\")")
+    }
+    if u-depth != auto {
+      panic("wire '" + id
+        + "': cannot combine `u-at` with an explicit `u-depth`")
+    }
+  }
+  let u-depth-effective = if u-depth == auto { 0.5 } else { u-depth }
+
+  // `s-at-*` validation.
+  let s-params-set = (
+    s-axis != auto or s-depth-1 != auto or s-ratio-mid != auto
+    or s-depth-2 != auto or s-at-1 != none or s-at-mid != none
+    or s-at-2 != none
+  )
+  if s-params-set and style != "s-shape" {
+    panic("wire '" + id + "': `s-*` parameters require style: \"s-shape\" (got \""
+      + style + "\")")
+  }
+  if s-at-1 != none and s-depth-1 != auto {
+    panic("wire '" + id + "': cannot combine `s-at-1` with an explicit `s-depth-1`")
+  }
+  if s-at-mid != none and s-ratio-mid != auto {
+    panic("wire '" + id + "': cannot combine `s-at-mid` with an explicit `s-ratio-mid`")
+  }
+  if s-at-2 != none and s-depth-2 != auto {
+    panic("wire '" + id + "': cannot combine `s-at-2` with an explicit `s-depth-2`")
+  }
+
+  // Normalize user-provided coordinates: (x, y) -> (x, y, 0)
+  let pts = pts.map(normalize-coord)
   
   let stroke = (
     paint: color,
@@ -170,7 +722,26 @@
     (points, anchors) = get-direct-wire(pts)
     
   } else if style == "zigzag" {
-    (points, anchors) = get-zigzag-wire(pts, zigzag-ratio, zigzag-dir)
+    let zz-dir = zigzag-dir
+    if zz-dir == auto {
+      let side-start = detect-port-side(pts.first(), ctx)
+      let side-end = detect-port-side(pts.last(), ctx)
+      let dir-from-side(s) = if s == none { none } else if s == "east" or s == "west" { "vertical" } else { "horizontal" }
+      let d-start = dir-from-side(side-start)
+      let d-end = dir-from-side(side-end)
+      // Fall back to "vertical" (the previous default) when the direction
+      // cannot be deduced (no port anchors, or conflicting endpoints).
+      if d-start != none and d-end != none and d-start != d-end { zz-dir = "vertical" }
+      else if d-start != none { zz-dir = d-start }
+      else if d-end != none { zz-dir = d-end }
+      else { zz-dir = "vertical" }
+    }
+    (points, anchors) = get-zigzag-wire(
+      pts,
+      zigzag-ratio-effective,
+      zz-dir,
+      at: normalize-zigzag-at(zigzag-at, zz-dir),
+    )
     
   } else if style == "dodge" {
     (points, anchors) = get-dodge-wire(
@@ -180,9 +751,38 @@
       dodge-sides,
       ctx
     )
-  }
+  } else if style == "guided" {
+    (points, anchors) = get-guided-wire(
+      pts,
+      guided-margins,
+      guided-sides,
+      guided-center,
+      ctx
+    )
+   } else if style == "u-shape" {
+     (points, anchors) = get-u-shape-wire(
+       pts,
+       u-depth-effective,
+       u-side,
+       u-at,
+       ctx
+     )
+   } else if style == "s-shape" {
+     (points, anchors) = get-s-shape-wire(
+       pts,
+       s-axis,
+       s-depth-1,
+       s-ratio-mid,
+       s-depth-2,
+       s-at-1,
+       s-at-mid,
+       s-at-2,
+       strict,
+       ctx,
+     )
+   }
 
-  let mark = (fill: color)
+   let mark = (fill: color)
   if directed {
     mark = (end: ">", fill: color)
   }
@@ -218,7 +818,7 @@
     let names = ()
     
     if type(name) == str {
-      names = ((name, "middle"),)
+      names = ((name, name-pos),)
       
     } else if type(name) == array {
       names = (
@@ -228,9 +828,6 @@
     }
 
     for (name, pos) in names {
-      if name == none {
-        continue
-      }
       let point
       let anchor
       
@@ -272,73 +869,40 @@
 /// - vertical (bool): Whether the name should be displayed vertically
 /// - length (number): The length of the stub
 /// - name-offset (number): The name offset, perpendicular to the stub
-#let stub(anchor, side: auto, name: none, vertical: false, length: 1em, name-offset: 0) = {
-  if "." not in anchor {
-    panic("`anchor` must be a valid anchor of an element")
-  }
-  let parts = anchor.split(".")
-  let port-id = parts.last()
-  let port-elmt-id = parts.slice(0, -1).join(".")
+#let stub(port-id, side, name: none, vertical: false, length: 1em, name-offset: 0) = {
+  let end-offset = (
+    north: (0, length),
+    east: (length, 0),
+    south: (0, -length),
+    west: (-length, 0)
+  ).at(side)
+  
+  let name-offset = (
+    north: (name-offset, length),
+    east: (length, name-offset),
+    south: (name-offset, -length),
+    west: (-length, name-offset)
+  ).at(side)
 
-  let pre-process = (elements, elmt) => {
-    let eid = elmt.id
-
-    let side = side
-    if side == auto {
-      if port-elmt-id not in elements {
-        panic("Unknown element " + port-elmt-id)
-      }
-      let port-elmt = elements.at(port-elmt-id)
-      side = get-port-side(port-elmt, port-id)
-    }
-    elements.at(eid).insert("side", side)
-    return elements
-  }
-
-  let draw-func(elmt, bounds) = {
-    let side = elmt.side
-    let end-offset = (
-      north: (0, length),
-      east: (length, 0),
-      south: (0, -length),
-      west: (-length, 0)
-    ).at(side)
-    
-    let name-offset = (
-      north: (name-offset, length),
-      east: (length, name-offset),
-      south: (name-offset, -length),
-      west: (-length, name-offset)
-    ).at(side)
-
-    let shapes = ()
-    shapes += draw.line(
-      anchor,
-      (rel: end-offset, to: anchor)
-    )
-    if name != none {
-      let text-anchor = if vertical {
-        (
-          "north": "west",
-          "south": "east",
-          "west": "south",
-          "east": "north"
-        ).at(side)
-      } else { opposite-anchor(side) }
-      shapes += draw.content(
-        anchor: text-anchor,
-        padding: 0.2em,
-        angle: if vertical {90deg} else {0deg},
-        (rel: name-offset, to: anchor),
-        name
-      )
-    }
-
-    return (shapes, bounds)
-  }
-
-  return element.elmt(
-    draw-shape: draw-func,
-    pre-process: pre-process
+  draw.line(
+    port-id,
+    (rel: end-offset, to: port-id)
   )
-}
+  if name != none {
+    let text-anchor = if vertical {
+      (
+        "north": "west",
+        "south": "east",
+        "west": "south",
+        "east": "north"
+      ).at(side)
+    } else { opposite-anchor(side) }
+    draw.content(
+      anchor: text-anchor,
+      padding: 0.2em,
+      angle: if vertical {90deg} else {0deg},
+      (rel: name-offset, to: port-id),
+      name
+    )
+  }
+}

typst.toml

@@ -1,7 +1,7 @@
 [package]
 name = "circuiteria"
-version = "0.2.0"
-compiler = "0.13.0"
+version = "0.2.1"
+compiler = "0.15.0"
 repository = "https://git.kb28.ch/HEL/circuiteria"
 entrypoint = "src/lib.typ"
 authors = [
@@ -9,6 +9,6 @@ authors = [
 ]
 categories = [ "visualization" ]
 license = "Apache-2.0"
-description = "Drawing block circuits with Typst made easy, using CeTZ"
+description = "Drawing block circuits made easy, using CeTZ"
 keywords = [ "circuit", "block", "draw" ]
 exclude = [ "gallery", "justfile", "doc" ]