gallery/example2.typ

@@ -6,15 +6,15 @@
   _seq("User", "A", comment: "DoWork", enable-dst: true)
   _seq("A", "B", comment: [#sym.quote.angle.l createRequest #sym.quote.angle.r], enable-dst: true)
   _seq("B", "C", comment: "DoWork", enable-dst: true)
-  _seq("C", "B", comment: "WorkDone", destroy-src: true, disable-src: true, dashed: true)
+  _seq("C", "B", comment: "WorkDone", destroy-src: true, dashed: true)
   _seq("B", "A", comment: "RequestCreated", disable-src: true, dashed: true)
   _seq("A", "User", comment: "Done", disable-src: true)
 })
 
 #chronos.diagram({
   import chronos: *
-  _seq("User", "A", comment: "DoWork", enable-dst: true, lifeline-style: (fill: rgb("#FFBBBB")))
+  _seq("User", "A", comment: "DoWork", enable-dst: true)
-  _seq("A", "A", comment: "Internal call", enable-dst: true, lifeline-style: (fill: rgb("#E9967A")))
+  _seq("A", "A", comment: "Internal call", enable-dst: true)
   _seq("A", "B", comment: [#sym.quote.angle.l createRequest #sym.quote.angle.r], enable-dst: true)
   _seq("B", "A", comment: "RequestCreated", disable-src: true, disable-dst: true, dashed: true)
   _seq("A", "User", comment: "Done", disable-src: true)
@@ -24,8 +24,8 @@
   import chronos: *
   _seq("alice", "bob", comment: "hello", enable-dst: true)
   _seq("bob", "bob", comment: "self call", enable-dst: true)
-  _seq("bill", "bob", comment: "hello from thread 2", enable-dst: true, lifeline-style: (fill: rgb("#005500")))
+  _seq("bill", "bob", comment: "hello from thread 2", enable-dst: true)
-  _seq("bob", "george", comment: "create", create-dst: true)
+  _seq("bob", "george", comment: "create", enable-dst: true)
   _seq("bob", "bill", comment: "done in thread 2", disable-src: true, dashed: true)
   _seq("bob", "bob", comment: "rc", disable-src: true, dashed: true)
   _seq("bob", "george", comment: "delete", destroy-dst: true)
@@ -38,4 +38,3 @@
   _seq("bob", "charlie", comment: "hello2", enable-dst: true, disable-src: true)
   _seq("charlie", "alice", comment: "ok", dashed: true, disable-src: true)
 })
-

src/diagram.typ

@@ -39,18 +39,11 @@
         participants.push(_par(elmt.p1).first())
       }
       if not participant._exists(participants, elmt.p2) {
-        let par = _par(elmt.p2, from-start: not elmt.create-dst).first()
+        participants.push(_par(elmt.p2).first())
-        participants.push(par)
       }
     }
   }
 
-  // Add index to participant
-  for (i, p) in participants.enumerate() {
-    p.insert("i", i)
-    participants.at(i) = p
-  }
-
   // Compute groups spans (horizontal)
   for (i, elmt) in elmts.enumerate() {
     if elmt.type == "grp" {

src/participant.typ

@@ -1,12 +1,9 @@
-#import "@preview/cetz:0.2.2": draw
+#let _par(name, display-name: auto, start-at: 0) = {
-#import "consts.typ": *
-
-#let _par(name, display-name: auto, from-start: true) = {
   return ((
     type: "par",
     name: name,
     display-name: if display-name == auto {name} else {display-name},
-    from-start: from-start
+    start-at: start-at
   ),)
 }
 
@@ -18,14 +15,3 @@
   }
   return false
 }
-
-#let render(x-pos, p, y: 0) = {
-  draw.content(
-    (x-pos.at(p.i), y),
-    p.display-name,
-    name: p.name,
-    frame: "rect",
-    padding: PAR-PAD,
-    anchor: "south"
-  )
-}

src/renderer.typ

@@ -1,7 +1,6 @@
 #import "@preview/cetz:0.2.2": canvas, draw
-#import "utils.typ": get-participants-i, get-style
+#import "utils.typ": get-participants-i
 #import "group.typ"
-#import "participant.typ"
 #import "sequence.typ"
 #import "separator.typ"
 #import "consts.typ": *
@@ -108,16 +107,16 @@
     x-pos.push(x-pos.last() + width)
   }
   
-  let draw-seq = sequence.render.with(pars-i, x-pos, participants)
-  let draw-group = group.render.with()
-  let draw-sep = separator.render.with(x-pos)
-  let draw-par = participant.render.with(x-pos)
-  
   // Draw participants (start)
-  for p in participants {
+  for (i, p) in participants.enumerate() {
-    if p.from-start {
+    shapes += draw.content(
-      shapes += draw-par(p)
+      (x-pos.at(i), 0),
-    }
+      p.display-name,
+      name: p.name,
+      frame: "rect",
+      padding: PAR-PAD,
+      anchor: "south"
+    )
   }
 
   let y = -Y-SPACE
@@ -127,6 +126,10 @@
     lines: ()
   ))
 
+  let draw-seq = sequence.render.with(pars-i, x-pos)
+  let draw-group = group.render.with()
+  let draw-sep = separator.render.with(x-pos)
+
   // Draw elemnts
   for elmt in elements {
     // Sequences
@@ -178,7 +181,11 @@
       let x = x-pos.at(i)
 
       // Draw vertical line
-      let last-y = 0
+      draw.line(
+        (x, 0),
+        (x, y),
+        stroke: (dash: "dashed", paint: gray.darken(40%))
+      )
 
       let rects = ()
       let destructions = ()
@@ -187,53 +194,25 @@
       // Compute lifeline rectangles + destruction positions
       for line in lifelines.at(i).lines {
         let event = line.first()
-        if event == "create" {
+        if event == "enable" {
-          last-y = line.at(1)
-
-        } else if event == "enable" {
-          if lines.len() == 0 {
-            draw.line(
-              (x, last-y),
-              (x, line.at(1)),
-              stroke: (dash: "dashed", paint: gray.darken(40%))
-            )
-          }
           lines.push(line)
         
         } else if event == "disable" or event == "destroy" {
-          let lvl = 0
+          let l = lines.pop()
-          if lines.len() != 0 {
+          let lvl = lines.len()
-            let l = lines.pop()
+          rects.push((x + lvl * LIFELINE-W / 2, l.at(1), line.at(1)))
-            lvl = lines.len()
-            rects.push((
-              x + lvl * LIFELINE-W / 2,
-              l.at(1),
-              line.at(1),
-              l.at(2)
-            ))
-            last-y = line.at(1)
-          }
-
           if event == "destroy" {
             destructions.push((x + lvl * LIFELINE-W / 2, line.at(1)))
           }
         }
       }
 
-      draw.line(
-        (x, last-y),
-        (x, y),
-        stroke: (dash: "dashed", paint: gray.darken(40%))
-      )
-
       // Draw lifeline rectangles (reverse for bottom to top)
       for rect in rects.rev() {
-        let (cx, y0, y1, style) = rect
+        let (cx, y0, y1) = rect
-        let style = get-style("lifeline", style)
         draw.rect(
           (cx - LIFELINE-W / 2, y0),
-          (cx + LIFELINE-W / 2, y1),
+          (cx + LIFELINE-W / 2, y1)
-          ..style
         )
       }
 

src/sequence.typ

@@ -1,6 +1,5 @@
-#import "@preview/cetz:0.2.2": draw
 #import "consts.typ": *
-#import "participant.typ"
+#import "@preview/cetz:0.2.2": draw
 
 #let _seq(
   p1,
@@ -11,12 +10,10 @@
   color: black,
   flip: false,
   enable-dst: false,
-  create-dst: false,
   disable-dst: false,
   destroy-dst: false,
   disable-src: false,
   destroy-src: false,
-  lifeline-style: auto
 ) = {
   return ((
     type: "seq",
@@ -28,64 +25,48 @@
     color: color,
     flip: flip,
     enable-dst: enable-dst,
-    create-dst: create-dst,
     disable-dst: disable-dst,
     destroy-dst: destroy-dst,
     disable-src: disable-src,
     destroy-src: destroy-src,
-    lifeline-style: lifeline-style,
   ),)
 }
 
-#let render(pars-i, x-pos, participants, elmt, y, lifelines) = {
+#let render(pars-i, x-pos, elmt, y, lifelines) = {
   let shapes = ()
 
-  // Reserve space for comment
-  if elmt.comment != none {
-    y -= measure(box(elmt.comment)).height / 1pt + 6
-  }
-
   let i1 = pars-i.at(elmt.p1)
   let i2 = pars-i.at(elmt.p2)
 
-  let start-info = (
+  if elmt.comment != none {
-    i: i1,
+    y -= measure(box(elmt.comment)).height / 1pt + 6
-    x: x-pos.at(i1),
+  }
-    y: y,
-    ll-lvl: lifelines.at(i1).level * LIFELINE-W / 2
-  )
-  let end-info = (
-    i: i2,
-    x: x-pos.at(i2),
-    y: y,
-    ll-lvl: lifelines.at(i2).level * LIFELINE-W / 2
-  )
-
-  let ll-lvl1 = lifelines.at(i1).level * LIFELINE-W / 2
-
-  let x1 = x-pos.at(i1)
-  let x2 = x-pos.at(i2)
 
   if elmt.disable-src {
     let src-line = lifelines.at(i1)
     src-line.level -= 1
-    src-line.lines.push(("disable", y))
+    src-line.lines.push(("disable", y, auto))
     lifelines.at(i1) = src-line
   }
   if elmt.destroy-src {
     let src-line = lifelines.at(i1)
-    src-line.lines.push(("destroy", y))
+    src-line.level -= 1
+    src-line.lines.push(("destroy", y, auto))
     lifelines.at(i1) = src-line
   }
+
+  let ll-lvl1 = lifelines.at(i1).level * LIFELINE-W / 2
+
   if elmt.disable-dst {
     let dst-line = lifelines.at(i2)
     dst-line.level -= 1
-    dst-line.lines.push(("disable", y))
+    dst-line.lines.push(("disable", y, auto))
     lifelines.at(i2) = dst-line
   }
   if elmt.destroy-dst {
     let dst-line = lifelines.at(i2)
-    dst-line.lines.push(("destroy", y))
+    dst-line.level -= 1
+    dst-line.lines.push(("destroy", y, auto))
     lifelines.at(i2) = dst-line
   }
   if elmt.enable-dst {
@@ -93,14 +74,10 @@
     dst-line.level += 1
     lifelines.at(i2) = dst-line
   }
-  if elmt.create-dst {
-    let par = participants.at(i2)
-    let m = measure(box(par.display-name))
-    x2 -= (m.width + PAR-PAD.last() * 2) / 2pt
-    shapes += participant.render(x-pos, par, y: y)
-  }
 
-  end-info.ll-lvl = lifelines.at(i2).level * LIFELINE-W / 2
+  let x1 = x-pos.at(i1)
+  let x2 = x-pos.at(i2)
+
   let ll-lvl2 = lifelines.at(i2).level * LIFELINE-W / 2
 
   let f = if elmt.flip {-1} else {1}
@@ -165,12 +142,7 @@
   }
   if elmt.enable-dst {
     let dst-line = lifelines.at(i2)
-    dst-line.lines.push(("enable", y, elmt.lifeline-style))
+    dst-line.lines.push(("enable", y, auto))
-    lifelines.at(i2) = dst-line
-  }
-  if elmt.create-dst {
-    let dst-line = lifelines.at(i2)
-    dst-line.lines.push(("create", y))
     lifelines.at(i2) = dst-line
   }
   y -= Y-SPACE

src/utils.typ

@@ -25,19 +25,3 @@
   }
   return (min-i, max-i)
 }
-
-#let get-style(base-name, mods) = {
-  let style = if base-name == "lifeline" {(
-    fill: white,
-    stroke: black + 1pt
-  )}
-
-  if mods == auto {
-    return style
-  }
-  if type(mods) == dictionary {
-    return style + mods
-  }
-
-  panic("Invalid type for parameter mods, expected auto or dictionary, got " + str(type(mods)))
-}