Merge pull request 'Fix group overflows' (#19) from fix/issue-18-group-size into dev

Reviewed-on: #19

src/consts.typ

@@ -28,9 +28,3 @@
 #let COL-GRP-NAME = rgb("#EEEEEE")
 #let COL-SEP-NAME = rgb("#EEEEEE")
 #let COL-NOTE = rgb("#FEFFDD")
-
-#let default-style = (
-  y-space: 10pt,
-  fill: rgb("#EEEEEE"),
-  stroke: black + 1pt,
-)

src/core/draw/delay.typ

@@ -1,30 +1,13 @@
-#import "/src/cetz.typ": draw, styles
+#import "/src/cetz.typ": draw
 
-#import "/src/core/utils.typ": get-ctx, normalize-units, set-ctx
+#import "/src/core/utils.typ": get-ctx, set-ctx
-
-#let delay-default-style = (
-  stroke: (
-    dash: "loosely-dotted",
-    paint: gray.darken(40%),
-    thickness: .8pt
-  ),
-  size: 30pt
-)
 
 #let render(delay) = get-ctx(ctx => {
-  let style = styles.resolve(
-    ctx.style,
-    merge: delay.style,
-    root: "delay",
-    base: delay-default-style
-  )
-  let size = normalize-units(style.size)
-
   let y0 = ctx.y
-  let y1 = ctx.y - size
+  let y1 = ctx.y - delay.size
   for (i, line) in ctx.lifelines.enumerate() {
-    line.events.push((type: "delay-start", y: y0))
+    line.lines.push(("delay-start", y0))
-    line.events.push((type: "delay-end", y: y1, stroke: style.stroke))
+    line.lines.push(("delay-end", y1))
     ctx.lifelines.at(i) = line
   }
   if delay.name != none {
@@ -32,13 +15,13 @@
     let x1 = ctx.x-pos.last()
     draw.content(
       ((x0 + x1) / 2, (y0 + y1) / 2),
-      anchor: "mid",
+      anchor: "center",
       delay.name
     )
   }
-  
+  ctx.y = y1
   set-ctx(c => {
-    c.y = y1
+    c.y = ctx.y
     c.lifelines = ctx.lifelines
     return c
   })

src/core/draw/event.typ

@@ -6,23 +6,23 @@
   let i = ctx.pars-i.at(par-name)
   let par = ctx.participants.at(i)
   let line = ctx.lifelines.at(i)
-  let entry = (type: evt.event, y: ctx.y)
+  let entry = (evt.event, ctx.y)
 
   if evt.event == "disable" {
     line.level -= 1
   } else if evt.event == "enable" {
     line.level += 1
-    entry.insert("style", evt.lifeline-style)
+    entry.push(evt.lifeline-style)
   } else if evt.event == "create" {
     ctx.y -= CREATE-OFFSET
-    entry.y = ctx.y
+    entry.at(1) = ctx.y
     (par.draw)(par, y: ctx.y)
   } else if evt.event == "destroy" {
   } else {
     panic("Unknown event '" + evt.event + "'")
   }
 
-  line.events.push(entry)
+  line.lines.push(entry)
   set-ctx(c => {
     c.lifelines.at(i) = line
     c.y = ctx.y

src/core/draw/group.typ

@@ -1,50 +1,25 @@
-#import "/src/cetz.typ": draw, styles
+#import "/src/cetz.typ": draw
 
 #import "/src/consts.typ": *
-#import "/src/core/utils.typ": expand-parent-group, get-ctx, normalize-units, set-ctx
+#import "/src/core/utils.typ": get-ctx, set-ctx, expand-parent-group
 
-#let group-default-style = (
+#let display-name(name) = text(name, weight: "bold")
-  name: (
+#let display-desc(desc) = text([\[#desc\]], weight: "bold", size: .8em)
-    inset: (
-      x: 5pt,
-      y: 3pt
-    ),
-    stroke: auto,
-    fill: auto
-  ),
-  desc: (
-    inset: 3pt
-  ),
-  divider: (dash: (2pt, 1pt), thickness: .5pt),
-  padding: 10pt,
-  stroke: auto
-)
 
 #let render-start(grp) = get-ctx(ctx => {
-  let style = styles.resolve(
-    ctx.style,
-    merge: grp.style,
-    root: "group",
-    base: group-default-style
-  )
-
   let grp = grp
-  grp.insert("resolved-style", style)
+  ctx.y -= Y-SPACE
-  ctx.y -= ctx.style.y-space
+  let m = measure(
-
+    box(
-  let name = box(
+      grp.name,
-    text(grp.name, weight: "bold"),
+      inset: (
-    inset: style.name.inset
+        left: 5pt,
+        right: 5pt,
+        top: 3pt,
+        bottom: 3pt
+      ),
     )
-  grp.insert("rendered-name", name)
-
-  let desc = box(
-    text([\[#grp.desc\]], weight: "bold", size: .8em),
-    inset: style.desc.inset
   )
-  grp.insert("rendered-desc", desc)
-
-  let m = measure(name)
   ctx.groups = ctx.groups.map(g => {
     if g.group.min-i == grp.min-i { g.start-lvl += 1 }
     if g.group.max-i == grp.max-i { g.end-lvl += 1 }
@@ -62,7 +37,6 @@
     max-x: ctx.x-pos.at(grp.max-i) + 10
   ))
   ctx.y -= m.height / 1pt
-  ctx.y += ctx.style.y-space / 2
 
   set-ctx(c => {
     c.y = ctx.y
@@ -73,62 +47,56 @@
 
 
 #let draw-group(x0, x1, y0, y1, group) = {
-  let style = group.resolved-style
+  let name = display-name(group.name)
-  let name = group.rendered-name
-  let desc = group.rendered-desc
   let m = measure(name)
-  let w = m.width / 1pt
+  let w = m.width / 1pt + 15
-  let h = m.height / 1pt
+  let h = m.height / 1pt + 6
   draw.rect(
     (x0, y0),
-    (x1, y1),
+    (x1, y1)
-    stroke: style.stroke
   )
-
-  let x1 = x0 + w
-  let x2 = x1 + 5
   draw.line(
     (x0, y0),
-    (x2, y0),
+    (x0 + w, y0),
-    (x2, y0 - h / 2),
+    (x0 + w, y0 - h / 2),
-    (x1, y0 - h),
+    (x0 + w - 5, y0 - h),
     (x0, y0 - h),
-    stroke: style.name.stroke,
+    fill: COL-GRP-NAME,
-    fill: style.name.fill,
     close: true
   )
   draw.content(
     (x0, y0),
     name,
-    anchor: "north-west"
+    anchor: "north-west",
+    padding: (left: 5pt, right: 10pt, top: 3pt, bottom: 3pt)
   )
 
   if group.desc != none {
     draw.content(
-      (x2, y0),
+      (x0 + w, y0),
-      desc,
+      display-desc(group.desc),
-      anchor: "north-west"
+      anchor: "north-west",
+      padding: 3pt
     )
   }
 }
 
 #let draw-else(x0, x1, y, elmt) = {
-  let style = elmt.resolved-style
   draw.line(
     (x0, y),
     (x1, y),
-    stroke: style.divider
+    stroke: (dash: (2pt, 1pt), thickness: .5pt)
   )
   draw.content(
     (x0, y),
-    elmt.rendered-desc,
+    display-desc(elmt.desc),
-    anchor: "north-west"
+    anchor: "north-west",
+    padding: 3pt
   )
 }
 
 #let render-end(group) = get-ctx(ctx => {
-  let y = ctx.y - ctx.style.y-space / 2
+  ctx.y -= Y-SPACE
-  ctx.y -= ctx.style.y-space / 2
   let (
     start-y,
     group,
@@ -137,11 +105,26 @@
     min-x,
     max-x
   ) = ctx.groups.pop()
-  let padding = normalize-units(group.resolved-style.padding)
+  let x0 = min-x - 10
-  let x0 = min-x - padding
+  let x1 = max-x + 10
-  let x1 = max-x + padding
   
-  draw-group(x0, x1, start-y, y, group)
+  // Fit name and descriptions
+  let name-m = measure(display-name(group.name))
+  let width = name-m.width / 1pt + 15
+  if group.desc != none {
+    let desc-m = measure(display-desc(group.desc))
+    width += desc-m.width / 1pt + 6
+  }
+  if group.grp-type == "alt" {
+    width = calc.max(width, ..group.elses.map(e => {
+      let elmt = e.at(1)
+      let desc-m = measure(display-desc(elmt.desc))
+      return desc-m.width / 1pt + 6
+    }))
+  }
+  x1 = calc.max(x1, x0 + width + 3)
+  
+  draw-group(x0, x1, start-y, ctx.y, group)
 
   if group.grp-type == "alt" {
     for (else-y, else-elmt) in group.elses {
@@ -158,33 +141,12 @@
   expand-parent-group(x0, x1)
 })
 
-#let render-else(else_) = get-ctx(ctx => {
+#let render-else(else_) = set-ctx(ctx => {
-  let group = ctx.groups.last().group
+  ctx.y -= Y-SPACE
-  let style = styles.resolve(
+  let m = measure(text([\[#else_.desc\]], weight: "bold", size: .8em))
-    ctx.style,
-    merge: group.style,
-    root: "group",
-    base: group-default-style
-  )
-  ctx.y -= ctx.style.y-space / 2
-
-  let desc = box(
-    text([\[#else_.desc\]], weight: "bold", size: .8em),
-    inset: style.desc.inset
-  )
-  let m = measure(desc)
-  let else_ = else_
-  else_.insert("resolved-style", style)
-  else_.insert("rendered-desc", desc)
   ctx.groups.last().group.elses.push((
     ctx.y, else_
   ))
   ctx.y -= m.height / 1pt
-  ctx.y += ctx.style.y-space / 2
+  return ctx
-  
-  set-ctx(c => {
-    c.y = ctx.y
-    c.groups = ctx.groups
-    return c
-  })
 })

src/core/draw/participant.typ

@@ -1,112 +1,316 @@
-#import "/src/cetz.typ": draw, styles
+#import "/src/cetz.typ": draw
 
 #import "/src/consts.typ": *
-#import "/src/core/utils.typ": get-ctx, get-style, is-elmt, set-ctx
+#import "/src/core/utils.typ": get-ctx, get-style, set-ctx
-
-#import "participant/default.typ" as shape-default
-#import "participant/actor.typ" as shape-actor
-#import "participant/boundary.typ" as shape-boundary
-#import "participant/control.typ" as shape-control
-#import "participant/entity.typ" as shape-entity
-#import "participant/database.typ" as shape-database
-#import "participant/collections.typ" as shape-collections
-#import "participant/queue.typ" as shape-queue
-#import "participant/custom.typ" as shape-custom
-
-#let shapes = {
-  let from-module(mod) = {
-    let p = "participant/default.typ"
-    return (mod.name: (
-      get-size: mod.get-size,
-      render: mod.render,
-      default-style: mod.default-style
-    ))
-  }
-  from-module(shape-default)
-  from-module(shape-actor)
-  from-module(shape-boundary)
-  from-module(shape-control)
-  from-module(shape-entity)
-  from-module(shape-database)
-  from-module(shape-collections)
-  from-module(shape-queue)
-  from-module(shape-custom)
-}
-
-#let participant-default-style = (
-  fill: auto,
-  stroke: black + .5pt,
-  from-start: true,
-  show-bottom: true,
-  show-top: true,
-  shape: "participant",
-  track: (
-    dash: "dashed",
-    paint: gray.darken(40%),
-    thickness: .5pt
-  )
-)
-
-#let resolve-style(ctx, par) = {
-  let style = styles.resolve(
-    ctx.style,
-    merge: par.style,
-    root: "participant",
-    base: participant-default-style
-  )
-  let shape-style = shapes.at(style.shape, default: (:))
-                          .at("default-style", default: (:))
-  style = styles.resolve(
-    ctx.style,
-    merge: style,
-    base: shape-style
-  )
-  return style
-}
-
-#let pre-resolve-styles(ctx, elements, participants) = {
-  let idx = (:)
-  for (i, par) in participants.enumerate() {
-    par.insert("resolved-style", resolve-style(ctx, par))
-    participants.at(i) = par
-    idx.insert(par.name, i)
-  }
-  for (i, elmt) in elements.enumerate() {
-    if type(elmt) == function {
-      ctx = elmt(ctx).ctx
-    } else if is-elmt(elmt) {
-      if elmt.type == par {
-        let style = resolve-style(ctx, elmt)
-        elements.at(i).insert("resolved-style", style)
-        let i = idx.at(elmt.name)
-        participants.at(i).resolved-style = style
-      }
-    }
-  }
-  return (elements, participants)
-}
 
 #let get-size(par) = {
   if par.invisible {
     return (width: 0pt, height: 0pt)
   }
-  let style = par.resolved-style
+  let m = measure(box(par.display-name))
-  let func = shapes.at(style.shape).get-size
+  let w = m.width
-  return func(par)
+  let h = m.height
+  let (shape-w, shape-h) = (
+    participant: (w + PAR-PAD.last() * 2, h + PAR-PAD.first() * 2),
+    actor: (ACTOR-WIDTH * 1pt, ACTOR-WIDTH * 2pt + SYM-GAP * 1pt + h),
+    boundary: (BOUNDARY-HEIGHT * 2pt, BOUNDARY-HEIGHT * 1pt + SYM-GAP * 1pt + h),
+    control: (CONTROL-HEIGHT * 1pt, CONTROL-HEIGHT * 1pt + SYM-GAP * 1pt + h),
+    entity: (ENTITY-HEIGHT * 1pt, ENTITY-HEIGHT * 1pt + 2pt + SYM-GAP * 1pt + h),
+    database: (DATABASE-WIDTH * 1pt, DATABASE-WIDTH * 4pt / 3 + SYM-GAP * 1pt + h),
+    collections: (
+      w + COLLECTIONS-PAD.last() * 2 + calc.abs(COLLECTIONS-DX) * 1pt,
+      h + COLLECTIONS-PAD.first() * 2 + calc.abs(COLLECTIONS-DY) * 1pt,
+    ),
+    queue: (
+      w + QUEUE-PAD.last() * 2 + 3 * (h + QUEUE-PAD.first() * 2) / 4,
+      h + QUEUE-PAD.first() * 2
+    ),
+    custom: (
+      measure(par.custom-image).width,
+      measure(par.custom-image).height + SYM-GAP * 1pt + h
+    )
+  ).at(par.shape)
+
+  return (
+    width: calc.max(w, shape-w),
+    height: calc.max(h, shape-h)
+  )
 }
 
-#let render(par, y: 0, bottom: false) = get-ctx(ctx => {
+#let _render-participant(x, y, p, m, bottom) = {
-  let style = resolve-style(ctx, par)
+  let w = m.width / 1pt
-  let func = shapes.at(style.shape).render
+  let h = m.height / 1pt
-  let par = par
+  let x0 = x - w / 2 - PAR-PAD.last() / 1pt
-  par.resolved-style = style
+  let x1 = x + w / 2 + PAR-PAD.last() / 1pt
-  func(ctx.x-pos.at(par.i), y, par, bottom)
+  let y0 = y + h + PAR-PAD.first() / 1pt * 2
+  if bottom {
+    y0 = y
+  }
+  let y1 = y0 - h - PAR-PAD.first() / 1pt * 2
+
+  draw.rect(
+    (x0, y0),
+    (x1, y1),
+    radius: 2pt,
+    fill: p.color,
+    stroke: black + .5pt
+  )
+  draw.content(
+    ((x0 + x1) / 2, (y0 + y1) / 2),
+    p.display-name,
+    anchor: "center"
+  )
+}
+
+#let _render-actor(x, y, p, m, bottom) = {
+  let w2 = ACTOR-WIDTH / 2
+  let head-r = ACTOR-WIDTH / 4
+  let height = ACTOR-WIDTH * 2
+  let arms-y = height * 0.375
+
+  let y0 = if bottom {y - m.height / 1pt - SYM-GAP} else {y + m.height / 1pt + height + SYM-GAP}
+  draw.circle(
+    (x, y0 - head-r),
+    radius: head-r,
+    fill: p.color,
+    stroke: black + .5pt
+  )
+  draw.line((x, y0 - head-r * 2), (x, y0 - height + w2), stroke: black + .5pt)
+  draw.line((x - w2, y0 - arms-y), (x + w2, y0 - arms-y), stroke: black + .5pt)
+  draw.line((x - w2, y0 - height), (x, y0 - height + w2), (x + w2, y0 - height), stroke: black + .5pt)
+  draw.content(
+    (x, y),
+    p.display-name,
+    anchor: if bottom {"north"} else {"base"}
+  )
+}
+
+#let _render-boundary(x, y, p, m, bottom) = {
+  let circle-r = BOUNDARY-HEIGHT / 2
+  let y0 = if bottom {y - m.height / 1pt - SYM-GAP} else {y + m.height / 1pt + BOUNDARY-HEIGHT + SYM-GAP}
+  let x0 = x - BOUNDARY-HEIGHT
+  let y1 = y0 - circle-r
+  let y2 = y0 - BOUNDARY-HEIGHT
+
+  draw.circle(
+    (x + circle-r, y1),
+    radius: circle-r,
+    fill: p.color,
+    stroke: black + .5pt
+  )
+  draw.line(
+    (x0, y0), (x0, y2),
+    stroke: black + .5pt
+  )
+  draw.line(
+    (x0, y1), (x, y1),
+    stroke: black + .5pt
+  )
+  draw.content(
+    (x, y),
+    p.display-name,
+    anchor: if bottom {"north"} else {"base"}
+  )
+}
+
+#let _render-control(x, y, p, m, bottom) = {
+  let r = CONTROL-HEIGHT / 2
+  let y0 = if bottom {y - m.height / 1pt - SYM-GAP} else {y + m.height / 1pt + CONTROL-HEIGHT + SYM-GAP}
+
+  draw.circle(
+    (x, y0 - r),
+    radius: r,
+    fill: p.color,
+    stroke: black + .5pt
+  )
+  draw.mark((x, y0), (x - r / 2, y0), symbol: "stealth", fill: black)
+  draw.content(
+    (x, y),
+    p.display-name,
+    anchor: if bottom {"north"} else {"base"}
+  )
+}
+
+#let _render-entity(x, y, p, m, bottom) = {
+  let r = ENTITY-HEIGHT / 2
+  let y0 = if bottom {y - m.height / 1pt - SYM-GAP} else {y + m.height / 1pt + ENTITY-HEIGHT + SYM-GAP}
+  let y1 = y0 - ENTITY-HEIGHT - 1.5
+
+  draw.circle(
+    (x, y0 - r),
+    radius: r,
+    fill: p.color,
+    stroke: black + .5pt
+  )
+  draw.line(
+    (x - r, y1),
+    (x + r, y1),
+    stroke: black + .5pt
+  )
+  draw.content(
+    (x, y),
+    p.display-name,
+    anchor: if bottom {"north"} else {"base"}
+  )
+}
+
+#let _render-database(x, y, p, m, bottom) = {
+  let height = DATABASE-WIDTH * 4 / 3
+  let rx = DATABASE-WIDTH / 2
+  let ry = rx / 2
+  let y0 = if bottom {y - m.height / 1pt - SYM-GAP} else {y + m.height / 1pt + height + SYM-GAP}
+  let y1 = y0 - height
+
+  draw.merge-path(
+    close: true,
+    fill: p.color,
+    stroke: black + .5pt,
+    {
+      draw.bezier((x - rx, y0 - ry), (x, y0), (x - rx, y0 - ry/2), (x - rx/2, y0))
+      draw.bezier((), (x + rx, y0 - ry), (x + rx/2, y0), (x + rx, y0 - ry/2))
+      draw.line((), (x + rx, y1 + ry))
+      draw.bezier((), (x, y1), (x + rx, y1 + ry/2), (x + rx/2, y1))
+      draw.bezier((), (x - rx, y1 + ry), (x - rx/2, y1), (x - rx, y1 + ry/2))
+    }
+  )
+  draw.merge-path(
+    stroke: black + .5pt,
+    {
+      draw.bezier((x - rx, y0 - ry), (x, y0 - ry*2), (x - rx, y0 - 3*ry/2), (x - rx/2, y0 - ry*2))
+      draw.bezier((), (x + rx, y0 - ry), (x + rx/2, y0 - ry*2), (x + rx, y0 - 3*ry/2))
+    }
+  )
+  draw.content(
+    (x, y),
+    p.display-name,
+    anchor: if bottom {"north"} else {"base"}
+  )
+}
+
+#let _render-collections(x, y, p, m, bottom) = {
+  let w = m.width / 1pt
+  let h = m.height / 1pt
+  let dx = COLLECTIONS-DX
+  let dy = COLLECTIONS-DY
+  let total-w = w + PAR-PAD.last() * 2 / 1pt + calc.abs(dx)
+  let total-h = h + PAR-PAD.first() * 2 / 1pt + calc.abs(dy)
+
+  let x0 = x - total-w / 2
+  let x1 = x0 + calc.abs(dx)
+  let x3 = x0 + total-w
+  let x2 = x3 - calc.abs(dx)
+  
+  let y0 = if bottom {y} else {y + total-h}
+  let y1 = y0 - calc.abs(dy)
+  let y3 = y0 - total-h
+  let y2 = y3 + calc.abs(dy)
+
+  let r1 = (x1, y0, x3, y2)
+  let r2 = (x0, y1, x2, y3)
+
+  if dx < 0 {
+    r1.at(0) = x0
+    r1.at(2) = x2
+    r2.at(0) = x1
+    r2.at(2) = x3
+  }
+
+  if dy < 0 {
+    r1.at(1) = y1
+    r1.at(3) = y3
+    r2.at(1) = y0
+    r2.at(3) = y2
+  }
+  draw.rect(
+    (r1.at(0), r1.at(1)),
+    (r1.at(2), r1.at(3)),
+    fill: p.color,
+    stroke: black + .5pt
+  )
+  draw.rect(
+    (r2.at(0), r2.at(1)),
+    (r2.at(2), r2.at(3)),
+    fill: p.color,
+    stroke: black + .5pt
+  )
+  
+  draw.content(
+    ((r2.at(0) + r2.at(2)) / 2, (r2.at(1) + r2.at(3)) / 2),
+    p.display-name,
+    anchor: "center"
+  )
+}
+
+#let _render-queue(x, y, p, m, bottom) = {
+  let w = (m.width + QUEUE-PAD.last() * 2) / 1pt
+  let h = (m.height + QUEUE-PAD.first() * 2) / 1pt
+  let total-h = h
+  let ry = total-h / 2
+  let rx = ry / 2
+  let total-w = w + 3 + 3 * rx
+
+  let x0 = x - total-w / 2
+  let y0 = if bottom {y} else {y + total-h}
+  let y1 = y0 - total-h
+  let x-left = x0 + rx
+  let x-right = x-left + w + rx
+  draw.merge-path(
+    close: true,
+    fill: p.color,
+    stroke: black + .5pt,
+    {
+      draw.bezier((x-right, y0), (x-right + rx, y0 - ry), (x-right + rx/2, y0), (x-right + rx, y0 - ry/2))
+      draw.bezier((), (x-right, y1), (x-right + rx, y1 + ry/2), (x-right + rx/2, y1))
+      draw.line((), (x-left, y1))
+      draw.bezier((), (x-left - rx, y0 - ry), (x-left - rx/2, y1), (x-left - rx, y1 + ry/2))
+      draw.bezier((), (x-left, y0), (x-left - rx, y0 - ry/2), (x-left - rx/2, y0))
+    }
+  )
+  draw.merge-path(
+    stroke: black + .5pt,
+    {
+      draw.bezier((x-right, y0), (x-right - rx, y0 - ry), (x-right - rx/2, y0), (x-right - rx, y0 - ry/2))
+      draw.bezier((), (x-right, y1), (x-right - rx, y1 + ry/2), (x-right - rx/2, y1))
+    }
+  )
+  draw.content(
+    ((x-left + x-right - rx) / 2, y0 - ry),
+    p.display-name,
+    anchor: "center"
+  )
+}
+
+#let _render-custom(x, y, p, m, bottom) = {
+  let image-m = measure(p.custom-image)
+  let y0 = if bottom {y - m.height / 1pt - SYM-GAP} else {y + m.height / 1pt + image-m.height / 1pt + SYM-GAP}
+  draw.content((x - image-m.width / 2pt, y0), p.custom-image, anchor: "north-west")
+  draw.content(
+    (x, y),
+    p.display-name,
+    anchor: if bottom {"north"} else {"base"}
+  )
+}
+
+#let render(par, y: 0, bottom: false) = draw.group(cetz-ctx => {
+  let ctx = cetz-ctx.shared-state.chronos
+  let m = measure(box(par.display-name))
+  let func = (
+    participant: _render-participant,
+    actor: _render-actor,
+    boundary: _render-boundary,
+    control: _render-control,
+    entity: _render-entity,
+    database: _render-database,
+    collections: _render-collections,
+    queue: _render-queue,
+    custom: _render-custom,
+  ).at(par.shape)
+  func(ctx.x-pos.at(par.i), y, par, m, bottom)
 },)
 
 #let render-lifelines() = get-ctx(ctx => {
   let participants = ctx.participants
   for p in participants.filter(p => not p.invisible) {
-    let style = p.resolved-style
     let x = ctx.x-pos.at(p.i)
 
     // Draw vertical line
@@ -114,61 +318,66 @@
 
     let rects = ()
     let destructions = ()
-    let stack = ()
+    let lines = ()
 
     // Compute lifeline rectangles + destruction positions
-    for event in ctx.lifelines.at(p.i).events {
+    for line in ctx.lifelines.at(p.i).lines {
-      if event.type == "create" {
+      let event = line.first()
+      if event == "create" {
         last-y = line.at(1)
 
-      } else if event.type == "enable" {
+      } else if event == "enable" {
-        if stack.len() == 0 {
+        if lines.len() == 0 {
           draw.line(
             (x, last-y),
-            (x, event.y),
+            (x, line.at(1)),
-            stroke: style.track
+            stroke: p.line-stroke
           )
         }
-        stack.push(event)
+        lines.push(line)
       
-      } else if event.type == "disable" or event.type == "destroy" {
+      } else if event == "disable" or event == "destroy" {
         let lvl = 0
-        if stack.len() != 0 {
+        if lines.len() != 0 {
-          let e = stack.pop()
+          let l = lines.pop()
-          lvl = stack.len()
+          lvl = lines.len()
           rects.push((
             x + lvl * LIFELINE-W / 2,
-            e.y,
+            l.at(1),
-            event.y,
+            line.at(1),
-            e.style
+            l.at(2)
           ))
-          last-y = event.y
+          last-y = line.at(1)
         }
 
-        if event.type == "destroy" {
+        if event == "destroy" {
-          destructions.push((x + lvl * LIFELINE-W / 2, event.y))
+          destructions.push((x + lvl * LIFELINE-W / 2, line.at(1)))
         }
-      } else if event.type == "delay-start" {
+      } else if event == "delay-start" {
         draw.line(
           (x, last-y),
-          (x, event.y),
+          (x, line.at(1)),
-          stroke: style.track
+          stroke: p.line-stroke
         )
-        last-y = event.y
+        last-y = line.at(1)
-      } else if event.type == "delay-end" {
+      } else if event == "delay-end" {
         draw.line(
           (x, last-y),
-          (x, event.y),
+          (x, line.at(1)),
-          stroke: event.stroke
+          stroke: (
+            dash: "loosely-dotted",
+            paint: gray.darken(40%),
+            thickness: .8pt
           )
-        last-y = event.y
+        )
+        last-y = line.at(1)
       }
     }
 
     draw.line(
       (x, last-y),
       (x, ctx.y),
-      stroke: style.track
+      stroke: p.line-stroke
     )
 
     // Draw lifeline rectangles (reverse for bottom to top)
@@ -190,7 +399,7 @@
     }
 
     // Draw participants (end)
-    if style.show-bottom {
+    if p.show-bottom {
       (p.draw)(p, y: ctx.y, bottom: true)
     }
   }

src/core/draw/participant/actor.typ

@@ -1,48 +0,0 @@
-#import "/src/cetz.typ": draw
-
-#import "/src/core/utils.typ": normalize-measure
-#import "/src/consts.typ": *
-
-#let name = "actor"
-
-#let render(x, y, p, bottom) = {
-  let m = measure(p.display-name)
-  let style = p.resolved-style
-  let w2 = ACTOR-WIDTH / 2
-  let head-r = ACTOR-WIDTH / 4
-  let height = ACTOR-WIDTH * 2
-  let arms-y = height * 0.375
-
-  let y0 = if bottom {
-    y - m.height / 1pt - SYM-GAP
-  } else {
-    y + m.height / 1pt + height + SYM-GAP
-  }
-  draw.circle(
-    (x, y0 - head-r),
-    radius: head-r,
-    fill: style.fill,
-    stroke: style.stroke
-  )
-  draw.line((x, y0 - head-r * 2), (x, y0 - height + w2), stroke: black + .5pt)
-  draw.line((x - w2, y0 - arms-y), (x + w2, y0 - arms-y), stroke: black + .5pt)
-  draw.line((x - w2, y0 - height), (x, y0 - height + w2), (x + w2, y0 - height), stroke: black + .5pt)
-  draw.content(
-    (x, y),
-    p.display-name,
-    anchor: if bottom {"north"} else {"base"}
-  )
-}
-
-#let get-size(par) = {
-  let m = normalize-measure(par.display-name)
-
-  //ACTOR-WIDTH * 1pt
-  //ACTOR-WIDTH * 2pt + SYM-GAP * 1pt + h
-
-  return m
-}
-
-#let default-style = (
-  :
-)

src/core/draw/participant/boundary.typ

@@ -1,53 +0,0 @@
-#import "/src/cetz.typ": draw
-
-#import "/src/core/utils.typ": normalize-measure
-#import "/src/consts.typ": *
-
-#let name = "boundary"
-
-#let render(x, y, p, bottom) = {
-  let m = measure(p.display-name)
-  let style = p.resolved-style
-  let circle-r = BOUNDARY-HEIGHT / 2
-  let y0 = if bottom {
-    y - m.height / 1pt - SYM-GAP
-  } else {
-    y + m.height / 1pt + BOUNDARY-HEIGHT + SYM-GAP
-  }
-  let x0 = x - BOUNDARY-HEIGHT
-  let y1 = y0 - circle-r
-  let y2 = y0 - BOUNDARY-HEIGHT
-
-  draw.circle(
-    (x + circle-r, y1),
-    radius: circle-r,
-    fill: style.fill,
-    stroke: style.stroke
-  )
-  draw.line(
-    (x0, y0), (x0, y2),
-    stroke: style.stroke
-  )
-  draw.line(
-    (x0, y1), (x, y1),
-    stroke: style.stroke
-  )
-  draw.content(
-    (x, y),
-    p.display-name,
-    anchor: if bottom {"north"} else {"base"}
-  )
-}
-
-#let get-size(par) = {
-  let m = normalize-measure(par.display-name)
-
-  // BOUNDARY-HEIGHT * 2pt
-  // BOUNDARY-HEIGHT * 1pt + SYM-GAP * 1pt + h
-
-  return m
-}
-
-#let default-style = (
-  :
-)

src/core/draw/participant/collections.typ

@@ -1,75 +0,0 @@
-#import "/src/cetz.typ": draw
-
-#import "/src/core/utils.typ": normalize-measure
-#import "/src/consts.typ": *
-
-#let name = "collections"
-
-#let render(x, y, p, bottom) = {
-  let m = measure(p.display-name)
-  let style = p.resolved-style
-  let w = m.width / 1pt
-  let h = m.height / 1pt
-  let dx = COLLECTIONS-DX
-  let dy = COLLECTIONS-DY
-  let total-w = w + PAR-PAD.last() * 2 / 1pt + calc.abs(dx)
-  let total-h = h + PAR-PAD.first() * 2 / 1pt + calc.abs(dy)
-
-  let x0 = x - total-w / 2
-  let x1 = x0 + calc.abs(dx)
-  let x3 = x0 + total-w
-  let x2 = x3 - calc.abs(dx)
-  
-  let y0 = if bottom {y} else {y + total-h}
-  let y1 = y0 - calc.abs(dy)
-  let y3 = y0 - total-h
-  let y2 = y3 + calc.abs(dy)
-
-  let r1 = (x1, y0, x3, y2)
-  let r2 = (x0, y1, x2, y3)
-
-  if dx < 0 {
-    r1.at(0) = x0
-    r1.at(2) = x2
-    r2.at(0) = x1
-    r2.at(2) = x3
-  }
-
-  if dy < 0 {
-    r1.at(1) = y1
-    r1.at(3) = y3
-    r2.at(1) = y0
-    r2.at(3) = y2
-  }
-  draw.rect(
-    (r1.at(0), r1.at(1)),
-    (r1.at(2), r1.at(3)),
-    fill: style.fill,
-    stroke: style.stroke
-  )
-  draw.rect(
-    (r2.at(0), r2.at(1)),
-    (r2.at(2), r2.at(3)),
-    fill: style.fill,
-    stroke: style.stroke
-  )
-  
-  draw.content(
-    ((r2.at(0) + r2.at(2)) / 2, (r2.at(1) + r2.at(3)) / 2),
-    p.display-name,
-    anchor: "mid"
-  )
-}
-
-#let get-size(par) = {
-  let m = normalize-measure(par.display-name)
-
-  // w + COLLECTIONS-PAD.last() * 2 + calc.abs(COLLECTIONS-DX) * 1pt
-  // h + COLLECTIONS-PAD.first() * 2 + calc.abs(COLLECTIONS-DY) * 1pt
-
-  return m
-}
-
-#let default-style = (
-  :
-)

src/core/draw/participant/control.typ

@@ -1,44 +0,0 @@
-#import "/src/cetz.typ": draw
-
-#import "/src/core/utils.typ": normalize-measure
-#import "/src/consts.typ": *
-
-#let name = "control"
-
-#let render(x, y, p, bottom) = {
-  let m = measure(p.display-name)
-  let style = p.resolved-style
-  let r = CONTROL-HEIGHT / 2
-  let y0 = if bottom {
-    y - m.height / 1pt - SYM-GAP
-  } else {
-    y + m.height / 1pt + CONTROL-HEIGHT + SYM-GAP
-  }
-
-  draw.circle(
-    (x, y0 - r),
-    radius: r,
-    fill: style.fill,
-    stroke: style.stroke
-  )
-  let s = stroke(style.stroke)
-  draw.mark((x, y0), (x - r / 2, y0), symbol: "stealth", fill: s.paint)
-  draw.content(
-    (x, y),
-    p.display-name,
-    anchor: if bottom {"north"} else {"base"}
-  )
-}
-
-#let get-size(par) = {
-  let m = normalize-measure(par.display-name)
-
-  // CONTROL-HEIGHT * 1pt
-  // CONTROL-HEIGHT * 1pt + SYM-GAP * 1pt + h
-
-  return m
-}
-
-#let default-style = (
-  :
-)

src/core/draw/participant/custom.typ

@@ -1,32 +0,0 @@
-#import "/src/cetz.typ": draw
-
-#import "/src/core/utils.typ": normalize-measure
-#import "/src/consts.typ": *
-
-#let name = "custom"
-
-#let render(x, y, p, bottom) = {
-  let m = measure(p.display-name)
-  let style = p.resolved-style
-  let image-m = measure(style.custom-image)
-  let y0 = if bottom {y - m.height / 1pt - SYM-GAP} else {y + m.height / 1pt + image-m.height / 1pt + SYM-GAP}
-  draw.content((x - image-m.width / 2pt, y0), style.custom-image, anchor: "north-west")
-  draw.content(
-    (x, y),
-    p.display-name,
-    anchor: if bottom {"north"} else {"base"}
-  )
-}
-
-#let get-size(par) = {
-  let m = normalize-measure(par.display-name)
-
-  // measure(style.custom-image).width
-  // measure(style.custom-image).height + SYM-GAP * 1pt + h
-
-  return m
-}
-
-#let default-style = (
-  :
-)

src/core/draw/participant/database.typ

@@ -1,58 +0,0 @@
-#import "/src/cetz.typ": draw
-
-#import "/src/core/utils.typ": normalize-measure
-#import "/src/consts.typ": *
-
-#let name = "database"
-
-#let render(x, y, p, bottom) = {
-  let m = measure(p.display-name)
-  let style = p.resolved-style
-  let height = DATABASE-WIDTH * 4 / 3
-  let rx = DATABASE-WIDTH / 2
-  let ry = rx / 2
-  let y0 = if bottom {
-    y - m.height / 1pt - SYM-GAP
-  } else {
-    y + m.height / 1pt + height + SYM-GAP
-  }
-  let y1 = y0 - height
-
-  draw.merge-path(
-    close: true,
-    fill: style.fill,
-    stroke: style.stroke,
-    {
-      draw.bezier((x - rx, y0 - ry), (x, y0), (x - rx, y0 - ry/2), (x - rx/2, y0))
-      draw.bezier((), (x + rx, y0 - ry), (x + rx/2, y0), (x + rx, y0 - ry/2))
-      draw.line((), (x + rx, y1 + ry))
-      draw.bezier((), (x, y1), (x + rx, y1 + ry/2), (x + rx/2, y1))
-      draw.bezier((), (x - rx, y1 + ry), (x - rx/2, y1), (x - rx, y1 + ry/2))
-    }
-  )
-  draw.merge-path(
-    stroke: style.stroke,
-    {
-      draw.bezier((x - rx, y0 - ry), (x, y0 - ry*2), (x - rx, y0 - 3*ry/2), (x - rx/2, y0 - ry*2))
-      draw.bezier((), (x + rx, y0 - ry), (x + rx/2, y0 - ry*2), (x + rx, y0 - 3*ry/2))
-    }
-  )
-  draw.content(
-    (x, y),
-    p.display-name,
-    anchor: if bottom {"north"} else {"base"}
-  )
-}
-
-#let get-size(par) = {
-  let m = normalize-measure(par.display-name)
-
-  // DATABASE-WIDTH * 1pt
-  // DATABASE-WIDTH * 4pt / 3 + SYM-GAP * 1pt + h
-
-  return m
-}
-
-#let default-style = (
-  :
-)

src/core/draw/participant/default.typ

@@ -1,41 +0,0 @@
-#import "/src/cetz.typ": draw
-
-#import "/src/core/utils.typ": normalize-measure
-
-#let name = "participant"
-
-#let render(x, y, p, bottom) = {
-  let style = p.resolved-style
-  let name = box(
-    p.display-name,
-    inset: style.inset,
-    radius: style.radius,
-    fill: style.fill,
-    stroke: style.stroke
-  )
-  let anchor = if bottom {
-    "north"
-  } else {
-    "base"
-  }
-  draw.content(
-    (x, y),
-    name,
-    anchor: anchor
-  )
-}
-
-#let get-size(par) = {
-  return normalize-measure(box(
-    par.display-name,
-    inset: par.resolved-style.inset
-  ))
-}
-
-#let default-style = (
-  inset: (
-    x: 3pt,
-    y: 5pt
-  ),
-  radius: 2pt
-)

src/core/draw/participant/entity.typ

@@ -1,48 +0,0 @@
-#import "/src/cetz.typ": draw
-
-#import "/src/core/utils.typ": normalize-measure
-#import "/src/consts.typ": *
-
-#let name = "entity"
-
-#let render(x, y, p, bottom) = {
-  let m = measure(p.display-name)
-  let style = p.resolved-style
-  let r = ENTITY-HEIGHT / 2
-  let y0 = if bottom {
-    y - m.height / 1pt - SYM-GAP
-  } else {
-    y + m.height / 1pt + ENTITY-HEIGHT + SYM-GAP
-  }
-  let y1 = y0 - ENTITY-HEIGHT - 1.5
-
-  draw.circle(
-    (x, y0 - r),
-    radius: r,
-    fill: style.fill,
-    stroke: style.stroke
-  )
-  draw.line(
-    (x - r, y1),
-    (x + r, y1),
-    stroke: style.stroke
-  )
-  draw.content(
-    (x, y),
-    p.display-name,
-    anchor: if bottom {"north"} else {"base"}
-  )
-}
-
-#let get-size(par) = {
-  let m = normalize-measure(par.display-name)
-
-  // ENTITY-HEIGHT * 1pt
-  // ENTITY-HEIGHT * 1pt + 2pt + SYM-GAP * 1pt + h
-
-  return m
-}
-
-#let default-style = (
-  :
-)

src/core/draw/participant/queue.typ

@@ -1,60 +0,0 @@
-#import "/src/cetz.typ": draw
-
-#import "/src/core/utils.typ": normalize-measure
-#import "/src/consts.typ": *
-
-#let name = "queue"
-
-#let render(x, y, p, bottom) = {
-  let m = measure(p.display-name)
-  let style = p.resolved-style
-  let w = (m.width + QUEUE-PAD.last() * 2) / 1pt
-  let h = (m.height + QUEUE-PAD.first() * 2) / 1pt
-  let total-h = h
-  let ry = total-h / 2
-  let rx = ry / 2
-  let total-w = w + 3 + 3 * rx
-
-  let x0 = x - total-w / 2
-  let y0 = if bottom {y} else {y + total-h}
-  let y1 = y0 - total-h
-  let x-left = x0 + rx
-  let x-right = x-left + w + rx
-  draw.merge-path(
-    close: true,
-    fill: style.fill,
-    stroke: style.stroke,
-    {
-      draw.bezier((x-right, y0), (x-right + rx, y0 - ry), (x-right + rx/2, y0), (x-right + rx, y0 - ry/2))
-      draw.bezier((), (x-right, y1), (x-right + rx, y1 + ry/2), (x-right + rx/2, y1))
-      draw.line((), (x-left, y1))
-      draw.bezier((), (x-left - rx, y0 - ry), (x-left - rx/2, y1), (x-left - rx, y1 + ry/2))
-      draw.bezier((), (x-left, y0), (x-left - rx, y0 - ry/2), (x-left - rx/2, y0))
-    }
-  )
-  draw.merge-path(
-    stroke: style.stroke,
-    {
-      draw.bezier((x-right, y0), (x-right - rx, y0 - ry), (x-right - rx/2, y0), (x-right - rx, y0 - ry/2))
-      draw.bezier((), (x-right, y1), (x-right - rx, y1 + ry/2), (x-right - rx/2, y1))
-    }
-  )
-  draw.content(
-    ((x-left + x-right - rx) / 2, y0 - ry),
-    p.display-name,
-    anchor: "mid"
-  )
-}
-
-#let get-size(par) = {
-  let m = normalize-measure(par.display-name)
-
-  // w + QUEUE-PAD.last() * 2 + 3 * (h + QUEUE-PAD.first() * 2) / 4
-  // h + QUEUE-PAD.first() * 2
-
-  return m
-}
-
-#let default-style = (
-  :
-)

src/core/draw/separator.typ

@@ -1,65 +1,47 @@
-#import "/src/cetz.typ": draw, styles
+#import "/src/cetz.typ": draw
 
 #import "/src/consts.typ": *
-#import "/src/core/utils.typ": get-ctx, normalize-units, set-y
+#import "/src/core/utils.typ": get-ctx, set-ctx
-
-#let separator-default-style = (
-  inset: (
-    x: 3pt, y: 5pt
-  ),
-  fill: auto,
-  stroke: auto,
-  gap: 3pt,
-  outset: 20pt
-)
 
 #let render(sep) = get-ctx(ctx => {
-  let style = styles.resolve(
+  ctx.y -= Y-SPACE
-    ctx.style,
-    merge: sep.style,
-    root: "separator",
-    base: separator-default-style
-  )
-  let gap = normalize-units(style.gap)
-  let outset = normalize-units(style.outset)
 
-  ctx.y -= ctx.style.y-space
+  let x0 = ctx.x-pos.first() - 20
-
+  let x1 = ctx.x-pos.last() + 20
-  let x0 = ctx.x-pos.first() - outset
+  let m = measure(
-  let x1 = ctx.x-pos.last() + outset
+    box(
-  let name = box(
       sep.name,
-    inset: style.inset,
+      inset: (left: 3pt, right: 3pt, top: 5pt, bottom: 5pt)
-    stroke: style.stroke,
+    )
-    fill: style.fill
   )
-  let m = measure(name)
   let w = m.width / 1pt
   let h = m.height / 1pt
   let cx = (x0 + x1) / 2
   let xl = cx - w / 2
   let xr = cx + w / 2
 
-  let y0 = ctx.y
+  ctx.y -= h / 2
-  let y2 = y0 - h
-  let y1 = (y0 + y2) / 2
-
-  let gap-y0 = y1 + gap / 2
-  let gap-y1 = gap-y0 - gap
-
   draw.rect(
-    (x0, gap-y0),
+    (x0, ctx.y),
-    (x1, gap-y1),
+    (x1, ctx.y - 3),
     stroke: none,
-    fill: style.fill
+    fill: white
   )
-  draw.line((x0, gap-y0), (x1, gap-y0))
+  draw.line((x0, ctx.y), (x1, ctx.y))
-  draw.line((x0, gap-y1), (x1, gap-y1))
+  ctx.y -= 3
+  draw.line((x0, ctx.y), (x1, ctx.y))
   draw.content(
-    (cx, y1),
+    ((x0 + x1) / 2, ctx.y + 1.5),
-    name,
+    sep.name,
-    anchor: "mid"
+    anchor: "center",
+    padding: (5pt, 3pt),
+    frame: "rect",
+    fill: COL-SEP-NAME
   )
+  ctx.y -= h / 2
 
-  set-y(y2)
+  set-ctx(c => {
+    c.y = ctx.y
+    return c
+  })
 })

src/core/draw/sequence.typ

@@ -1,8 +1,8 @@
-#import "/src/cetz.typ": draw, vector
+#import "/src/cetz.typ": draw, vector, coordinate
 
 #import "note.typ"
 #import "/src/consts.typ": *
-#import "/src/core/utils.typ": get-ctx, set-ctx
+#import "/src/core/utils.typ": get-ctx, set-ctx, expand-parent-group
 
 #let get-arrow-marks(sym, color) = {
   if sym == none {
@@ -102,23 +102,23 @@
   if seq.disable-src {
     let src-line = ctx.lifelines.at(i1)
     src-line.level -= 1
-    src-line.events.push((type: "disable", y: start-info.y))
+    src-line.lines.push(("disable", start-info.y))
     ctx.lifelines.at(i1) = src-line
   }
   if seq.destroy-src {
     let src-line = ctx.lifelines.at(i1)
-    src-line.events.push((type: "destroy", y: start-info.y))
+    src-line.lines.push(("destroy", start-info.y))
     ctx.lifelines.at(i1) = src-line
   }
   if seq.disable-dst {
     let dst-line = ctx.lifelines.at(i2)
     dst-line.level -= 1
-    dst-line.events.push((type: "disable", y: end-info.y))
+    dst-line.lines.push(("disable", end-info.y))
     ctx.lifelines.at(i2) = dst-line
   }
   if seq.destroy-dst {
     let dst-line = ctx.lifelines.at(i2)
-    dst-line.events.push((type: "destroy", y: end-info.y))
+    dst-line.lines.push(("destroy", end-info.y))
     ctx.lifelines.at(i2) = dst-line
   }
   if seq.enable-dst {
@@ -223,6 +223,11 @@
       ).at(seq.comment-align)
     }
 
+    expand-parent-group(
+      calc.min(x1, x2, x-mid),
+      calc.max(x1, x2, x-mid)
+    )
+
   } else {
     pts = (
       (x1, start-info.y),
@@ -261,6 +266,11 @@
       (p1, p2) = (p2, p1)
     }
     comment-angle = vector.angle2(p1, p2)
+
+    expand-parent-group(
+      calc.min(x1, x2),
+      calc.max(x1, x2)
+    )
   }
 
   // Start circle tip
@@ -335,18 +345,33 @@
       comment,
       anchor: comment-anchor,
       angle: comment-angle,
-      padding: 3pt
+      padding: 3pt,
+      name: "comment"
     )
+
+    // TODO: Improve this
+    draw.get-ctx(c => {
+      let (_, left, right) = coordinate.resolve(
+        c,
+        "comment.west",
+        "comment.east"
+      )
+      expand-parent-group(
+        left.at(0),
+        right.at(0)
+      )
+    })
+
   }
 
   if seq.create-dst {
     let dst-line = ctx.lifelines.at(i2)
-    dst-line.events.push((type: "create", y: end-info.y))
+    dst-line.lines.push(("create", end-info.y))
     ctx.lifelines.at(i2) = dst-line
   }
   if seq.enable-dst {
     let dst-line = ctx.lifelines.at(i2)
-    dst-line.events.push((type: "enable", y: end-info.y, style: seq.lifeline-style))
+    dst-line.lines.push(("enable", end-info.y, seq.lifeline-style))
     ctx.lifelines.at(i2) = dst-line
   }
 

src/core/renderer.typ

@@ -155,7 +155,7 @@
     let m2 = participant.get-size(p2)
     let w1 = m1.width
     let w2 = m2.width
-    widths.push(w1 / 2 + w2 / 2 + PAR-SPACE)
+    widths.push(w1 / 2pt + w2 / 2pt + PAR-SPACE)
   }
   return widths
 }
@@ -326,12 +326,6 @@
 #let setup-ctx(participants, elements) = (ctx => {
   let state = ctx.at("shared-state", default: (:))
 
-  let (elements, participants) = participant.pre-resolve-styles(
-    extract-ctx(ctx, with-style: true),
-    elements,
-    participants
-  )
-
   let chronos-ctx = (
     participants: init-lifelines(participants),
     pars-i: get-participants-i(participants),
@@ -339,7 +333,7 @@
     groups: (),
     lifelines: participants.map(_ => (
       level: 0,
-      events: ()
+      lines: ()
     ))
   )
   chronos-ctx.insert(
@@ -388,8 +382,7 @@
   // Draw participants (start)
   get-ctx(ctx => {
     for p in ctx.participants {
-      let style = p.resolved-style
+      if p.from-start and not p.invisible and p.show-top {
-      if style.from-start and not p.invisible and style.show-top {
         (p.draw)(p)
       }
     }

src/core/utils.typ

@@ -1,6 +1,4 @@
-#import "/src/cetz.typ": draw, styles
+#import "/src/cetz.typ": draw
-
-#import "/src/consts.typ": default-style
 
 #let is-elmt(elmt) = {
   if type(elmt) != dictionary {
@@ -21,15 +19,6 @@
   }
   panic("Unsupported type '" + str(type(value)) + "'")
 }
-
-#let normalize-measure(body) = {
-  let m = measure(body)
-  return (
-    width: normalize-units(m.width),
-    height: normalize-units(m.height)
-  )
-}
-
 #let get-participants-i(participants) = {
   let pars-i = (:)
   for (i, p) in participants.enumerate() {
@@ -44,9 +33,6 @@
   let pars-i = get-participants-i(participants)
 
   for elmt in group.elmts {
-    if not is-elmt(elmt) {
-      continue
-    }
     if elmt.type == "seq" {
       let i1 = pars-i.at(elmt.p1)
       let i2 = pars-i.at(elmt.p2)
@@ -107,41 +93,19 @@
   )
 })
 
-#let extract-ctx(cetz-ctx, with-style: false) = {
-  let state = cetz-ctx.at("shared-state", default: (:))
-  let ctx = state.at("chronos", default: (:))
-  if with-style {
-    ctx.style = styles.resolve(
-      cetz-ctx.style,
-      root: "chronos",
-      base: default-style
-    )
-    // Normalize because it is used very frequently
-    ctx.style.y-space = normalize-units(ctx.style.y-space)
-  }
-  return ctx
-}
-
 #let set-ctx(func) = draw.set-ctx(c => {
-  let ctx = extract-ctx(c)
+  let ctx = c.shared-state.chronos
   let new-ctx = func(ctx)
   assert(new-ctx != none, message: "set-ctx must return a context!")
-  let state = c.at("shared-state", default: (:))
+  c.shared-state.chronos = new-ctx
-  state.chronos = new-ctx
-  c.shared-state = state
   return c
 })
 
 #let get-ctx(func) = draw.get-ctx(c => {
-  let ctx = extract-ctx(c, with-style: true)
+  let ctx = c.shared-state.chronos
   func(ctx)
 })
 
-#let set-y(new-y) = set-ctx(c => {
-  c.y = new-y
-  return c
-})
-
 #let expand-parent-group(x0, x1) = set-ctx(ctx => {
   if ctx.groups.len() != 0 {
     let group = ctx.groups.last()

src/group.typ

@@ -1,25 +1,23 @@
 #import "core/draw/group.typ"
 
-#let _grp(name, desc: none, type: "default", elmts, ..style) = {
+#let _grp(name, desc: none, type: "default", elmts) = {
   return ((
     type: "grp",
     draw: group.render-start,
     name: name,
     desc: desc,
     grp-type: type,
-    elmts: elmts,
+    elmts: elmts
-    style: style.named()
   ),)
 }
 
-#let _alt(desc, elmts, ..elses-style) = {
+#let _alt(desc, elmts, ..args) = {
   let all-elmts = ()
   all-elmts += elmts
-  let elses = elses-style.pos()
+  let args = args.pos()
-  let style = elses-style.named()
+  for i in range(0, args.len(), step: 2) {
-  for i in range(0, elses.len(), step: 2) {
+    let else-desc = args.at(i)
-    let else-desc = elses.at(i)
+    let else-elmts = args.at(i + 1, default: ())
-    let else-elmts = elses.at(i + 1, default: ())
     all-elmts.push((
       type: "else",
       draw: group.render-else,
@@ -28,10 +26,10 @@
     all-elmts += else-elmts
   }
 
-  return _grp("alt", desc: desc, type: "alt", all-elmts, ..style)
+  return _grp("alt", desc: desc, type: "alt", all-elmts)
 }
 
-#let _loop(desc, min: none, max: auto, elmts, ..style) = {
+#let _loop(desc, min: none, max: auto, elmts) = {
   let name = "loop"
   if min != none {
     if max == auto {
@@ -39,7 +37,7 @@
     }
     name += "(" + str(min) + "," + str(max) + ")"
   }
-  _grp(name, desc: desc, type: "loop", elmts, ..style)
+  _grp(name, desc: desc, type: "loop", elmts)
 }
-#let _opt(desc, elmts, ..style) = _grp("opt", desc: desc, type: "opt", elmts, ..style.named())
+#let _opt(desc, elmts) = _grp("opt", desc: desc, type: "opt", elmts)
-#let _break(desc, elmts, ..style) = _grp("break", desc: desc, type: "break", elmts, ..style.named())
+#let _break(desc, elmts) = _grp("break", desc: desc, type: "break", elmts)

src/misc.typ

@@ -4,21 +4,20 @@
 #import "core/draw/sync.typ"
 #import "core/utils.typ": set-ctx
 
-#let _sep(name, ..style) = {
+#let _sep(name) = {
   return ((
     type: "sep",
     draw: separator.render,
-    name: name,
+    name: name
-    style: style.named()
   ),)
 }
 
-#let _delay(name: none, ..style) = {
+#let _delay(name: none, size: 30) = {
   return ((
     type: "delay",
     draw: delay.render,
     name: name,
-    style: style.named()
+    size: size
   ),)
 }
 

src/participant.typ

@@ -17,16 +17,35 @@
 #let _par(
   name,
   display-name: auto,
+  from-start: true,
   invisible: false,
-  ..style
+  shape: "participant",
+  color: DEFAULT-COLOR,
+  line-stroke: (
+    dash: "dashed",
+    paint: gray.darken(40%),
+    thickness: .5pt
+  ),
+  custom-image: none,
+  show-bottom: true,
+  show-top: true,
 ) = {
+  if color == auto {
+    color = DEFAULT-COLOR
+  }
   return ((
     type: "par",
     draw: participant.render,
     name: name,
     display-name: if display-name == auto {name} else {display-name},
-    invisible: false,
+    from-start: from-start,
-    style: style.named()
+    invisible: invisible,
+    shape: shape,
+    color: color,
+    line-stroke: line-stroke,
+    custom-image: custom-image,
+    show-bottom: show-bottom,
+    show-top: show-top
   ),)
 }
 

tests/special-group/.gitignore

@@ -0,0 +1,4 @@
+# generated by tytanic, do not edit
+
+diff/**
+out/**

tests/special-group/test.typ

@@ -0,0 +1,71 @@
+#set page(width: auto, height: auto)
+#import "/src/lib.typ": *
+
+#let preamble = {
+  _par("a", display-name: [Alice])
+  _par("b", display-name: [Bob])
+  _col("a", "b", width: 2cm)
+}
+
+#diagram({
+  preamble
+  _grp("Group 1", {
+    _seq("a", "b")
+  })
+  _grp("Group 2", desc: [Description], {
+    _seq("a", "b")
+  })
+})
+
+#pagebreak()
+
+#diagram({
+  preamble
+  _alt(
+    "case 1", {
+      _seq("a", "b")
+    },
+    "case 2", {
+      _seq("a", "b")
+    },
+    "case 3", {
+      _seq("a", "b")
+    }
+  )
+})
+
+#pagebreak()
+
+#diagram({
+  preamble
+  _loop("loop 1", {
+    _seq("a", "b")
+  })
+  _loop("loop 2", min: 1, {
+    _seq("a", "b")
+  })
+  _loop("loop 3", max: 10, {
+    _seq("a", "b")
+  })
+  _loop("loop 3", min: 1, max: 10, {
+    _seq("a", "b")
+  })
+})
+
+#pagebreak()
+
+#diagram({
+  preamble
+  _opt("Optional", {
+    _seq("a", "b")
+  })
+})
+
+#pagebreak()
+
+#diagram({
+  preamble
+  _break("Break", {
+    _seq("a", "b")
+  })
+})