changed participant name alignment to base

Reviewed-on: #16

src/core/draw/group.typ

@@ -1,7 +1,7 @@
 #import "/src/cetz.typ": draw
 
 #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 render-start(grp) = get-ctx(ctx => {
   let grp = grp
@@ -18,14 +18,21 @@
     )
   )
   ctx.groups = ctx.groups.map(g => {
-    if g.at(1).min-i == grp.min-i { g.at(2) += 1 }
+    if g.group.min-i == grp.min-i { g.start-lvl += 1 }
-    if g.at(1).max-i == grp.max-i { g.at(3) += 1 }
+    if g.group.max-i == grp.max-i { g.end-lvl += 1 }
     g
   })
   if grp.grp-type == "alt" {
     grp.insert("elses", ())
   }
-  ctx.groups.push((ctx.y, grp, 0, 0))
+  ctx.groups.push((
+    start-y: ctx.y,
+    group: grp,
+    start-lvl: 0,
+    end-lvl: 0,
+    min-x: ctx.x-pos.at(grp.min-i) - 10,
+    max-x: ctx.x-pos.at(grp.max-i) + 10
+  ))
   ctx.y -= m.height / 1pt
 
   set-ctx(c => {
@@ -87,9 +94,16 @@
 
 #let render-end(group) = get-ctx(ctx => {
   ctx.y -= Y-SPACE
-  let (start-y, group, start-lvl, end-lvl) = ctx.groups.pop()
+  let (
-  let x0 = ctx.x-pos.at(group.min-i) - start-lvl * 10 - 20
+    start-y,
-  let x1 = ctx.x-pos.at(group.max-i) + end-lvl * 10 + 20
+    group,
+    start-lvl,
+    end-lvl,
+    min-x,
+    max-x
+  ) = ctx.groups.pop()
+  let x0 = min-x - 10
+  let x1 = max-x + 10
   
   draw-group(x0, x1, start-y, ctx.y, group)
 
@@ -104,12 +118,14 @@
     c.groups = ctx.groups
     return c
   })
+
+  expand-parent-group(x0, x1)
 })
 
 #let render-else(else_) = set-ctx(ctx => {
   ctx.y -= Y-SPACE
   let m = measure(text([\[#else_.desc\]], weight: "bold", size: .8em))
-  ctx.groups.last().at(1).elses.push((
+  ctx.groups.last().group.elses.push((
     ctx.y, else_
   ))
   ctx.y -= m.height / 1pt

src/core/draw/note.typ

@@ -1,7 +1,7 @@
 #import "/src/cetz.typ": draw
 
 #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-size(note) = {
   let PAD = if note.shape == "hex" {NOTE-HEX-PAD} else {NOTE-PAD}
@@ -159,5 +159,7 @@
         return c
       })
     }
+
+    expand-parent-group(x0, x2)
   })
 }

src/core/draw/participant.typ

@@ -81,7 +81,7 @@
   draw.content(
     (x, y),
     p.display-name,
-    anchor: if bottom {"north"} else {"south"}
+    anchor: if bottom {"north"} else {"base"}
   )
 }
 
@@ -109,7 +109,7 @@
   draw.content(
     (x, y),
     p.display-name,
-    anchor: if bottom {"north"} else {"south"}
+    anchor: if bottom {"north"} else {"base"}
   )
 }
 
@@ -127,7 +127,7 @@
   draw.content(
     (x, y),
     p.display-name,
-    anchor: if bottom {"north"} else {"south"}
+    anchor: if bottom {"north"} else {"base"}
   )
 }
 
@@ -150,7 +150,7 @@
   draw.content(
     (x, y),
     p.display-name,
-    anchor: if bottom {"north"} else {"south"}
+    anchor: if bottom {"north"} else {"base"}
   )
 }
 
@@ -183,7 +183,7 @@
   draw.content(
     (x, y),
     p.display-name,
-    anchor: if bottom {"north"} else {"south"}
+    anchor: if bottom {"north"} else {"base"}
   )
 }
 
@@ -287,7 +287,7 @@
   draw.content(
     (x, y),
     p.display-name,
-    anchor: if bottom {"north"} else {"south"}
+    anchor: if bottom {"north"} else {"base"}
   )
 }
 

src/core/renderer.typ

@@ -220,7 +220,7 @@
 }
 
 /// Compute remaining widths for longer sequences (spanning multiple columns)
-#let long-seq-min-col-widths(cells, widths) = {
+#let long-seq-min-col-widths(participants, cells, widths) = {
   let widths = widths
   let multicol-cells = cells.filter(c => c.i2 - c.i1 > 1)
   multicol-cells = multicol-cells.sorted(key: c => {
@@ -228,13 +228,23 @@
   })
   for cell in multicol-cells {
     let m = measure(cell.cell)
+
+    let i1 = cell.i1
+    let i2 = cell.i2 - 1
+    let i = i2
+    if cell.i1 == 0 and participants.at(0).name == "[" {
+      i = 0
+      i1 += 1
+      i2 += 1
+    }
     let width = (
       m.width / 1pt +
       COMMENT-PAD -
-      widths.slice(cell.i1, cell.i2 - 1).sum()
+      widths.slice(i1, i2).sum()
     )
-    widths.at(cell.i2 - 1) = calc.max(
+    
-      widths.at(cell.i2 - 1), width
+    widths.at(i) = calc.max(
+      widths.at(i), width
     )
   }
   return widths
@@ -307,7 +317,7 @@
   widths = notes-min-col-widths(elements, widths, pars-i)
   widths = simple-seq-min-col-widths(cells, widths)
   widths = self-seq-min-col-widths(cells, widths)
-  widths = long-seq-min-col-widths(cells, widths)
+  widths = long-seq-min-col-widths(participants, cells, widths)
   widths = col-widths-add-lifelines(participants, widths)
   widths = process-col-elements(elements, widths, pars-i)
   return widths

src/core/utils.typ

@@ -104,4 +104,14 @@
 #let get-ctx(func) = draw.get-ctx(c => {
   let ctx = c.shared-state.chronos
   func(ctx)
+})
+
+#let expand-parent-group(x0, x1) = set-ctx(ctx => {
+  if ctx.groups.len() != 0 {
+    let group = ctx.groups.last()
+    group.min-x = calc.min(group.min-x, x0)
+    group.max-x = calc.max(group.max-x, x1)
+    ctx.groups.last() = group
+  }
+  return ctx
 })

src/misc.typ

@@ -1,4 +1,5 @@
 #import "core/draw/delay.typ"
+#import "core/draw/event.typ": render as evt-render
 #import "core/draw/separator.typ"
 #import "core/draw/sync.typ"
 #import "core/utils.typ": set-ctx