add arrow on stub

README.md

@@ -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.1.0"
 #circuiteria.circuit({
   import circuiteria: *
   ...

doc/example.typ

@@ -1,4 +1,4 @@
-#import "/src/cetz.typ": draw
+#import "@preview/cetz:0.2.2": draw
 #import "../src/circuit.typ": circuit
 #import "../src/util.typ"
 

gallery.bash

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+PDFS=false
+
+while getopts "p" flag
+do
+    case "${flag}" in
+        p) PDFS=true;;
+    esac
+done
+
+echo "Generating gallery images"
+
+set -- ./gallery/*.typ
+cnt="$#"
+i=1
+for f
+do
+    f2="${f/typ/png}"
+    echo "($i/$cnt) $f -> $f2"
+    typst c --root ./ "$f" "$f2"
+    i=$((i+1))
+done
+
+if [ "$PDFS" = true ]
+then
+    echo
+    echo "Generating gallery PDFs"
+
+    set -- ./gallery/*.typ
+    cnt="$#"
+    i=1
+    for f
+    do
+        f2="${f/typ/pdf}"
+        echo "($i/$cnt) $f -> $f2"
+        typst c --root ./ "$f" "$f2"
+        i=$((i+1))
+    done
+fi

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

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

gallery/test4.typ

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

gallery/test5.typ

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

gallery/test6.typ

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

justfile

@@ -1,11 +0,0 @@
-# Local Variables:
-# mode: makefile
-# End:
-gallery_dir := "./gallery"
-set shell := ["bash", "-uc"]
-
-manual:
-  typst c manual.typ manual.pdf
-
-gallery:
-  for f in "{{gallery_dir}}"/*.typ; do typst c --root . "$f" "${f%typ}png"; done

manual.typ

@@ -1,5 +1,5 @@
-#import "@preview/tidy:0.4.1"
+#import "@preview/tidy:0.3.0"
-#import "/src/cetz.typ": draw, canvas
+#import "@preview/cetz:0.2.2": draw, canvas
 #import "src/lib.typ"
 #import "doc/examples.typ"
 #import "src/circuit.typ": circuit
@@ -12,7 +12,7 @@
   numbering("1.1", ..num)
 })
 #{
-  outline(indent: auto, depth: 3)
+  outline(indent: true, depth: 3)
 }
 
 #show link: set text(blue)
@@ -47,7 +47,7 @@
 
 #set page(numbering: "1/1", header: align(right)[circuiteria #sym.dash.em v#lib.version])
 #set page(
-  header: context {
+  header: locate(loc => {
     let txt = [circuiteria #sym.dash.em v#lib.version]
     let cnt = counter(heading)
     let cnt-val = cnt.get()
@@ -65,8 +65,8 @@
         #rect(width: 100%, height: .5em, radius: .25em, stroke: none, fill: util.colors.values().at(i))
       ]
     )
-  },
+  }),
-  footer: context {
+  footer: locate(loc => {
     let cnt = counter(heading)
     let cnt-val = cnt.get()
     if cnt-val.len() < 2 { return }
@@ -80,12 +80,12 @@
       ],
       counter(page).display("1/1", both: true)
     )
-  }
+  })
 )
 
 #let doc-ref(target, full: false, var: false) = {
   let (module, func) = target.split(".")
-  let label-name = module + "-" + func
+  let label-name = module + func
   let display-name = func
   if full {
     display-name = target
@@ -94,7 +94,7 @@
     label-name += "()"
     display-name += "()"
   }
-  link(label(label-name), raw(display-name))
+  link(label(label-name))[#display-name]
 }
 
 = Introduction
@@ -103,21 +103,11 @@ This package provides a way to make beautiful block circuit diagrams using the C
 
 = Usage
 
-Simply import Circuiteria and call the `circuit` function:
+Simply import #link("src/lib.typ") and call the `circuit` function:
 #pad(left: 1em)[```typ
-#import "@preview/circuiteria:0.2.0"
+#import "src/lib.typ"
-#circuiteria.circuit({
+#lib.circuit({
-  import circuiteria: *
+  import lib: *
-  ...
-})
-```]
-
-== Project installation
-If you have installed Circuiteria directly in your project, import #link("src/lib.typ") and call the `circuit` function:
-#pad(left: 1em)[```typ
-#import "src/lib.typ" as circuiteria
-#circuiteria.circuit({
-  import circuiteria: *
   ...
 })
 ```]
@@ -127,7 +117,6 @@ If you have installed Circuiteria directly in your project, import #link("src/li
 #let circuit-docs = tidy.parse-module(
   read("src/circuit.typ"),
   name: "circuit",
-  old-syntax: true,
   require-all-parameters: true
 )
 #tidy.show-module(circuit-docs)
@@ -137,7 +126,6 @@ If you have installed Circuiteria directly in your project, import #link("src/li
 #let util-docs = tidy.parse-module(
   read("src/util.typ"),
   name: "util",
-  old-syntax: true,
   require-all-parameters: true,
   scope: (
     util: util,
@@ -152,7 +140,6 @@ If you have installed Circuiteria directly in your project, import #link("src/li
 #let wire-docs = tidy.parse-module(
   read("src/wire.typ"),
   name: "wire",
-  old-syntax: true,
   require-all-parameters: true,
   scope: (
     wire: wire,
@@ -174,7 +161,6 @@ If you have installed Circuiteria directly in your project, import #link("src/li
   read("src/elements/multiplexer.typ") + "\n" +
   read("src/elements/group.typ"),
   name: "element",
-  old-syntax: true,
   scope: (
     element: element,
     circuit: circuit,
@@ -197,7 +183,6 @@ If you have installed Circuiteria directly in your project, import #link("src/li
   read("src/elements/logic/or.typ") + "\n" +
   read("src/elements/logic/xor.typ"),
   name: "gates",
-  old-syntax: true,
   scope: (
     element: element,
     circuit: circuit,

src/cetz.typ

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

src/circuit.typ

@@ -1,4 +1,4 @@
-#import "/src/cetz.typ": canvas
+#import "@preview/cetz:0.2.2": canvas
 #import "@preview/tidy:0.3.0"
 
 /// Draws a block circuit diagram
@@ -9,52 +9,6 @@
 /// - length (length, ratio): Optional base unit
 /// -> none
 #let circuit(body, length: 2em) = {
-  let next-id = 0
+  // set text(font: "Source Sans 3")
-  let elements = (:)
+  canvas(length: length, body)
-  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,)
-      }
-    }
-  })
 }

src/elements/alu.typ

@@ -1,40 +1,45 @@
-#import "/src/cetz.typ": draw
+#import "@preview/cetz:0.2.2": 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 p1 = (tr, 10%, br)
-  let p2 = util.lerp(tr, 90%, br)
+  let p2 = (tr, 90%, br)
   let p3 = bl
-  let p4 = util.lerp(tl, 55%, bl)
+  let p4 = (tl, 55%, bl)
-  let p5 = util.lerp(tl, 50%, br)
+  let p5 = (tl, 50%, br)
-  let p6 = util.lerp(tl, 45%, bl)
+  let p6 = (tl, 45%, bl)
-
-  let bounds2 = element.complete-bounds(elmt, (
-    tl: p0,
-    tr: p1,
-    br: p2,
-    bl: p3
-  ))
   
-  let f = {
+  let f1 = draw.group(name: id, {
-    draw.line(
+    
-      p0, p1, p2, p3, p4, p5, p6,
+    draw.merge-path(
-      fill: elmt.fill,
+      inset: 0.5em,
-      stroke: elmt.stroke,
+      fill: fill,
-      close: true
+      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: (
+    fill: fill,
-      west: (
+    stroke: stroke,
-        in1: l => l * 0.225,
+    id: id,
-        in2: l => l * 0.775,
+    auto-ports: false,
-      ),
+    ports-y: (
-      east: (
+      in1: (h) => {h * 0.225},
-        out: l => l * 0.5
+      in2: (h) => {h * 0.775},
-      )
+      out: (h) => {h * 0.5}
     ),
-    ..args
+    debug: debug
   )
 }

src/elements/block.typ

@@ -1,15 +1,16 @@
-#import "/src/cetz.typ": draw
+#import "@preview/cetz:0.2.2": draw
 #import "element.typ"
 
-#let draw-shape(elmt, bounds) = {
+#let draw-shape(id, tl, tr, br, bl, fill, stroke) = {
   let f = draw.rect(
     radius: 0.5em,
     inset: 0.5em,
-    fill: elmt.fill,
+    fill: fill,
-    stroke: elmt.stroke,
+    stroke: stroke,
-    bounds.bl, bounds.tr
+    name: id,
+    bl, tr
   )
-  return (f, bounds)
+  return (f, tl, tr, br, bl)
 }
 
 /// Draws a block element
@@ -17,9 +18,32 @@
 /// #examples.block
 /// For parameters description, see #doc-ref("element.elmt")
 #let block(
-  ..args
+  x: none,
+  y: none,
+  w: none,
+  h: none,
+  name: none,
+  name-anchor: "center",
+  ports: (),
+  ports-margins: (),
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false
+  )
 ) = element.elmt(
-  cls: "block",
   draw-shape: draw-shape,
-  ..args
+  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 "@preview/cetz:0.2.2": draw, coordinate
-#import "ports.typ": add-ports, add-port, get-port-pos, get-port-idx
+#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) = {
+#let default-draw-shape(id, tl, tr, br, bl, fill, stroke) = {
-  return points-real = points.map(p => {
+  return ({}, tl, tr, br, bl)
-    let (pu, pv) = p
-    return vector.add(
-      origin,
-      vector.add(
-        vector.scale(u, pu),
-        vector.scale(v, pv)
-      )
-    )
-  })
 }
 
-#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,90 @@
 ///   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,
+  x: none,
-  pos: (0, 0),
+  y: none,
-  size: (1, 1),
+  w: none,
+  h: none,
   name: none,
   name-anchor: "center",
   ports: (:),
   ports-margins: (:),
   fill: none,
   stroke: black + 1pt,
-  id: auto,
+  id: "",
-  ports-pos: auto,
+  auto-ports: true,
+  ports-y: (:),
   debug: (
-    bounds: false,
     ports: false
-  ),
+  )
-  extra: (:)
+) = draw.get-ctx(ctx => {
-) = {
+  let width = w
-  for (key, side-ports) in ports.pairs() {
+  let height = h
-    if type(side-ports) == str {
-      side-ports = ((id: side-ports),)
-    } else if type(side-ports) == dictionary {
-      side-ports = (side-ports,)
-    }
 
-    for (i, port) in side-ports.enumerate() {
+  let x = x
-      if type(port) == array {
+  let y = y
-        side-ports.at(i) = (
+  if x == none { panic("Parameter x must be set") }
-          id: port.at(0, default: ""),
+  if y == none { panic("Parameter y must be set") }
-          name: port.at(1, default: "")
+  if w == none { panic("Parameter w must be set") }
-        )
+  if h == none { panic("Parameter h must be set") }
-      } else if type(port) == str {
+
-        side-ports.at(i) = (id: port)
+  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)
     }
-    ports.at(key) = side-ports
+    let used-pct = 100% - margins.at(0) - margins.at(1)
+    let used-height = height * used-pct / 100%
+    let top-margin = height * margins.at(0) / 100%
+    
+    let dy = used-height * (i + 1) / (ports.at(to-side).len() + 1)
+
+    if not auto-ports {
+      top-margin = 0
+      dy = ports-y.at(to)(height)
+    }
+    
+    let (ctx, from-pos) = coordinate.resolve(ctx, from)
+    y = from-pos.at(1) + dy - height + top-margin
   }
 
-  return ((
+  let tl = (x, y + height)
-    cls: cls,
+  let tr = (x + width, y + height)
-    id: id,
+  let br = (x + width, y)
-    draw: render.with(draw-shape),
+  let bl = (x, y)
-    pre-process: pre-process,
+
-    pos: pos,
+  // Workaround because CeTZ needs to have all draw functions in the body
-    size: size,
+  let func = {}
-    name: name,
+  (func, tl, tr, br, bl) = draw-shape(id, tl, tr, br, bl, fill, stroke)
-    name-anchor: name-anchor,
+  func
-    ports: ports,
+
-    ports-margins: ports-margins,
+  if (name != none) {
-    fill: fill,
+    draw.content(
-    stroke: stroke,
+      (name: id, anchor: name-anchor),
-    ports-pos: ports-pos,
+      anchor: if name-anchor in util.valid-anchors {name-anchor} else {"center"},
-    debug: debug
+      padding: 0.5em,
-  ) + extra,)
+      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 "@preview/cetz:0.2.2": draw
 #import "element.typ"
 #import "ports.typ": add-port
-#import "../util.typ"
 
-#let draw-shape(elmt, bounds) = {
+#let draw-shape(id, tl, tr, br, bl, fill, stroke, h-ratio: 75%, align-out: true) = {
-  let ratio = elmt.l-ratio / 100%
+  let (x, y) = bl
-  let tl2 = util.lerp(bounds.bl, elmt.l-ratio, bounds.tl)
+  let (width, height) = (tr.at(0) - x, tr.at(1) - y)
-  let bounds2 = element.complete-bounds(elmt, (
-    tl: tl2,
-    tr: bounds.tr,
-    br: bounds.br,
-    bl: bounds.bl,
-  ))
 
-  let f = draw.line(
+  let ratio = h-ratio / 100%
-    bounds2.tl, bounds2.tr, bounds2.br, bounds2.bl,
+
-    fill: elmt.fill,
+  tl = (x, y + height * ratio)
-    stroke: elmt.stroke,
+  let tr2 = (x + width, y + height * ratio)
-    close: true
+  let br = (x + width, y)
-  )
+  
-  return (f, bounds2)
+  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"),),
+    west: (
-    east: ((id: "out"),)
+      (id: "in"),
+    ),
+    east: (
+      (id: "out"),
+    )
   )
-  let out-pct = if align-out {l-ratio / 2} else {50%}
+  let out-pct = if align-out {h-ratio / 2} else {50%}
-  let ports-pos = (
+  let ports-y = (
-    "east": (l, i) => {l - l * (out-pct / 100%)}
+    "in": (h) => {h - h * (h-ratio / 200%)},
+    "out": (h) => {h - h * (out-pct / 100%)}
   )
   
-  return element.elmt(
+  element.elmt(
-    cls: "extender",
+    draw-shape: draw-shape.with(h-ratio: h-ratio, align-out: align-out),
-    draw-shape: draw-shape,
+    x: x,
+    y: y,
+    w: w,
+    h: h,
+    name: name,
+    name-anchor: name-anchor,
     ports: ports,
-    ports-pos: ports-pos,
+    auto-ports: false,
-    extra: (
+    ports-y: ports-y,
-      l-ratio: l-ratio,
+    fill: fill,
-      align-out: align-out
+    stroke: stroke,
-    ),
+    id: id,
-    ..args
+    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/group.typ

@@ -1,4 +1,4 @@
-#import "/src/cetz.typ": draw, coordinate
+#import "@preview/cetz:0.2.2": draw, coordinate
 #import "../util.typ"
 
 /// Draws a group of elements

src/elements/logic/and.typ

@@ -1,4 +1,4 @@
-#import "/src/cetz.typ": draw
+#import "@preview/cetz:0.2.2": draw
 #import "gate.typ"
 
 #let draw-shape(id, tl, tr, br, bl, fill, stroke) = {

src/elements/logic/buf.typ

@@ -1,4 +1,4 @@
-#import "/src/cetz.typ": draw
+#import "@preview/cetz:0.2.2": draw
 #import "gate.typ"
 
 #let draw-shape(id, tl, tr, br, bl, fill, stroke) = {

src/elements/logic/gate.typ

@@ -1,4 +1,4 @@
-#import "/src/cetz.typ": draw, coordinate
+#import "@preview/cetz:0.2.2": draw, coordinate
 #import "../ports.typ": add-ports, add-port
 #import "../element.typ"
 
@@ -54,20 +54,24 @@
     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 offset = y.rel
     let to = y.to
-    
+    let (ctx, to-pos) = coordinate.resolve(ctx, (rel: (0, offset), to: to))
-    let dy
+    y = to-pos.at(1)
-    if to == "out" {
+    // let from = y.from
-      dy = height / 2
+    // let to = y.to
-    } else {
+
-      dy = height * (i + 0.5) / inputs
+    // let dy
-    }
+    // if to == "out" {
-    
+    //   dy = height / 2
-    let (ctx, from-pos) = coordinate.resolve(ctx, from)
+    // } else {
-    y = from-pos.at(1) + dy - height
+    //   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)

src/elements/logic/or.typ

@@ -1,4 +1,4 @@
-#import "/src/cetz.typ": draw
+#import "@preview/cetz:0.2.2": draw
 #import "gate.typ"
 
 #let draw-shape(id, tl, tr, br, bl, fill, stroke) = {

src/elements/logic/xor.typ

@@ -1,4 +1,4 @@
-#import "/src/cetz.typ": draw
+#import "@preview/cetz:0.2.2": draw
 #import "gate.typ"
 
 #let space = 10%

src/elements/multiplexer.typ

@@ -1,26 +1,31 @@
-#import "/src/cetz.typ": draw
+#import "@preview/cetz:0.2.2": draw
 #import "../util.typ"
 #import "element.typ"
 #import "ports.typ": add-port
 
-#let draw-shape(elmt, bounds) = {
+#let draw-shape(id, tl, tr, br, bl, fill, stroke, h-ratio: 60%) = {
-  let margin = (100% - elmt.l-ratio) / 2
+  let margin = (100% - h-ratio) / 2
-  let tr2 = util.lerp(bounds.tr, margin, bounds.br)
+  let tr2 = (tr, margin, br)
-  let br2 = util.lerp(bounds.br, margin, bounds.tr)
+  let br2 = (br, margin, tr)
-  let bounds2 = element.complete-bounds(elmt, (
+  let f = draw.group(name: id, {
-    tl: bounds.tl,
+    draw.merge-path(
-    bl: bounds.bl,
+      inset: 0.5em,
-    tr: tr2,
+      fill: fill,
-    br: br2,
+      stroke: stroke,
-  ))
+      close: true,
-  let f = draw.line(
+      draw.line(tl, tr2, br2, bl)
-    bounds2.tl, bounds2.tr, bounds2.br, bounds2.bl,
+    )
-    close: true,
+    draw.anchor("north", (tl, 50%, tr2))
-    fill: elmt.fill,
+    draw.anchor("south", (bl, 50%, br2))
-    stroke: elmt.stroke
+    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%,
+  h-ratio: 60%,
-  ..args
+  fill: none,
+  stroke: black + 1pt,
+  id: "",
+  debug: (
+    ports: false
+  )
 ) = {
-  let in-ports = ()
+  let ports = ()
-  let ports-pos = (
+  let ports-y = (
-    "east": auto,
+    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()
+  let space = 100% / ports.len()
-  ports-pos.insert("west", (l, i) => {l * (i + 0.5) / n})
+  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.with(h-ratio: h-ratio),
-    draw-shape: draw-shape,
+    x: x,
-    ports: (west: in-ports, east: ((id: "out"),)),
+    y: y,
-    ports-pos: ports-pos,
+    w: w,
-    extra: (l-ratio: l-ratio),
+    h: h,
-    ..args
+    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 "@preview/cetz:0.2.2": 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,
+  elmt-id,
-  bounds
+  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 {
+  for (side, props) in sides {
-    let side-ports = elmt.ports.at(side, default: ())
+    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)
+    for (i, port) in side-ports.enumerate() {
-      let offset-prev = if type(offset) == ratio {
+      let pct = (i + 1) * space
-        offset - space / 2
+      let pt0 = props.at(0)
-      } else {
+      let pt1 = props.at(1)
-        offset - space * side-len / 200%
+
+      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
+      let pos = (pt0, pct, pt1)
-      } else {
+      let pct-prev = (i + 0.5) * space
-        offset + space * side-len / 200%
+      let pct-next = (i + 1.5) * space
-      }
+      let pos-prev = (pt0, pct-prev, pt1)
-      let pos-prev = (pt0, offset-prev, pt1)
+      let pos-next = (pt0, pct-next, pt1)
-      let pos-next = (pt0, offset-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/lib.typ

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

src/util.typ

@@ -73,11 +73,4 @@
 #let valid-anchors = (
   "center", "north", "east", "west", "south",
   "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)
-  )
-}

src/wire.typ

@@ -1,7 +1,5 @@
-#import "/src/cetz.typ": draw, coordinate
+#import "@preview/cetz:0.2.2": draw, coordinate
 #import "util.typ": opposite-anchor
-#import "elements/ports.typ": get-port-side
-#import "elements/element.typ"
 
 /// List of valid wire styles
 /// #examples.wires
@@ -21,7 +19,7 @@
 #let get-direct-wire(pts) = {
   let anchors = (
     "start": pts.first(),
-    "end": pts.last()
+    "end": pts.last(),
   )
   return (pts, anchors)
 }
@@ -40,21 +38,21 @@
       start,
       (horizontal: mid, vertical: ()),
       (horizontal: (), vertical: end),
-      end
+      end,
     )
   } else {
     (
       start,
       (horizontal: (), vertical: mid),
       (horizontal: end, vertical: ()),
-      end
+      end,
     )
   }
   let anchors = (
     "start": start,
     "zig": points.at(1),
     "zag": points.at(2),
-    "end": end
+    "end": end,
   )
   return (points, anchors)
 }
@@ -67,7 +65,7 @@
 
   let p1 = (start, margin-start, end)
   let p2 = (end, margin-end, start)
-  
+
   let (ctx, p0) = coordinate.resolve(ctx, start)
   let (ctx, p3) = coordinate.resolve(ctx, end)
   p0 = (x: p0.first(), y: p0.last())
@@ -75,7 +73,7 @@
 
   let dx1 = margin-start
   let dx2 = margin-end
-  
+
   if type(margin-start) == ratio {
     dx1 = calc.abs(p3.x - p0.x) * margin-start / 100%
   }
@@ -97,7 +95,7 @@
     (horizontal: (), vertical: (0, dodge-y)),
     (horizontal: p2, vertical: ()),
     (horizontal: (), vertical: end),
-    end
+    end,
   )
   let anchors = (
     "start": start,
@@ -105,7 +103,7 @@
     "dodge-start": points.at(2),
     "dodge-end": points.at(3),
     "end2": points.at(4),
-    "end": end
+    "end": end,
   )
 
   return (points, anchors)
@@ -130,11 +128,11 @@
 /// - 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")
 #let wire(
-  pt0,
+  id,
-  pt1,
+  pts,
-  id: none,
   bus: false,
   name: none,
+  name-pos: "middle",
   slice: none,
   color: black,
   dashed: false,
@@ -147,17 +145,22 @@
   dodge-y: 0,
   dodge-sides: ("east", "west"),
   dodge-margins: (5%, 5%),
-  ..args
 ) = 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)")
+  }
+
   let stroke = (
     paint: color,
-    thickness: if bus {bus-width} else {signal-width}
+    thickness: if bus {
+      bus-width
+    } else {
+      signal-width
+    },
   )
   if dashed {
     stroke.insert("dash", "dashed")
@@ -168,17 +171,17 @@
 
   if style == "direct" {
     (points, anchors) = get-direct-wire(pts)
-    
+
   } else if style == "zigzag" {
     (points, anchors) = get-zigzag-wire(pts, zigzag-ratio, zigzag-dir)
-    
+
   } else if style == "dodge" {
     (points, anchors) = get-dodge-wire(
       pts,
       dodge-y,
       dodge-margins,
       dodge-sides,
-      ctx
+      ctx,
     )
   }
 
@@ -186,12 +189,15 @@
   if directed {
     mark = (end: ">", fill: color)
   }
-  draw.group(name: id, {
+  draw.group(
-    draw.line(..points, stroke: stroke, mark: mark)
+    name: id,
-    for (anchor-name, anchor-pos) in anchors {
+    {
-      draw.anchor(anchor-name, anchor-pos)
+      draw.line(..points, stroke: stroke, mark: mark)
-    }
+      for (anchor-name, anchor-pos) in anchors {
-  })
+        draw.anchor(anchor-name, anchor-pos)
+      }
+    },
+  )
 
   let first-pt = id + ".start"
   let last-pt = id + ".end"
@@ -200,12 +206,12 @@
   if reverse {
     (first-pt, last-pt) = (last-pt, first-pt)
   }
-  
+
   let angle = 0deg
   if rotate-name {
     (ctx, first-pos) = coordinate.resolve(ctx, first-pos)
     (ctx, second-pos) = coordinate.resolve(ctx, second-pos)
-    
+
     if reverse {
       (first-pos, second-pos) = (second-pos, first-pos)
     }
@@ -213,27 +219,24 @@
     let (x2, y2, ..) = second-pos
     angle = calc.atan2(x2 - x1, y2 - y1)
   }
-  
+
   if name != none {
     let names = ()
-    
+
-    if type(name) == str {
+    if type(name) == str or type(name) == content {
-      names = ((name, "middle"),)
+      names = ((name, name-pos),)
-      
+
     } else if type(name) == array {
       names = (
         (name.at(0), "start"),
-        (name.at(1), "end")
+        (name.at(1), "end"),
       )
     }
 
     for (name, pos) in names {
-      if name == none {
-        continue
-      }
       let point
       let anchor
-      
+
       if pos == "middle" {
         point = (first-pt, 50%, last-pt)
         anchor = "south"
@@ -253,12 +256,12 @@
 
   if slice != none {
     let slice-txt = "[" + slice.map(b => str(b)).join(":") + "]"
-    
+
     draw.content(
       first-pt,
       anchor: "south-west",
       padding: 3pt,
-      text(slice-txt, size: 0.75em)
+      text(slice-txt, size: 0.75em),
     )
   }
 })
@@ -272,73 +275,60 @@
 /// - 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) = {
+#let stub(
-  if "." not in anchor {
+  port-id,
-    panic("`anchor` must be a valid anchor of an element")
+  side,
+  name: none,
+  vertical: false,
+  length: 1em,
+  name-offset: 0,
+  color: black,
+  directed: none,
+) = {
+  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 mark = (fill: color)
+  if directed != none {
+    mark = ((directed): ">", fill: color)
   }
-  let parts = anchor.split(".")
+  draw.line(
-  let port-id = parts.last()
+    port-id,
-  let port-elmt-id = parts.slice(0, -1).join(".")
+    (rel: end-offset, to: port-id),
-
+    mark: mark,
-  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
   )
+  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"
+version = "0.1.0"
-compiler = "0.13.0"
+compiler = "0.11.0"
 repository = "https://git.kb28.ch/HEL/circuiteria"
 entrypoint = "src/lib.typ"
 authors = [
@@ -11,4 +11,4 @@ categories = [ "visualization" ]
 license = "Apache-2.0"
 description = "Drawing block circuits with Typst made easy, using CeTZ"
 keywords = [ "circuit", "block", "draw" ]
-exclude = [ "gallery", "justfile", "doc" ]
+exclude = [ "gallery", "gallery.bash", "doc" ]