what changed?

Reviewed-on: #27

src/core/draw/sequence.typ

@@ -1,8 +1,8 @@
-#import "/src/cetz.typ": draw, vector, coordinate
+#import "/src/cetz.typ": coordinate, draw, vector
 
 #import "note.typ"
 #import "/src/consts.typ": *
-#import "/src/core/utils.typ": get-ctx, set-ctx, expand-parent-group
+#import "/src/core/utils.typ": expand-parent-group, get-ctx, set-ctx
 
 #let get-arrow-marks(sym, color) = {
   if sym == none {
@@ -13,12 +13,23 @@
   }
   (
     "": none,
-    ">": (symbol: ">", fill: color),
-    ">>": (symbol: "straight"),
-    "\\": (symbol: ">", fill: color, harpoon: true),
-    "\\\\": (symbol: "straight", harpoon: true),
-    "/": (symbol: ">", fill: color, harpoon: true, flip: true),
-    "//": (symbol: "straight", harpoon: true, flip: true),
+    ">": (symbol: ">", fill: color, stroke: (dash: "solid")),
+    ">>": (symbol: "straight", stroke: (dash: "solid")),
+    "\\": (symbol: ">", fill: color, harpoon: true, stroke: (dash: "solid")),
+    "\\\\": (symbol: "straight", harpoon: true, stroke: (dash: "solid")),
+    "/": (
+      symbol: ">",
+      fill: color,
+      harpoon: true,
+      flip: true,
+      stroke: (dash: "solid"),
+    ),
+    "//": (
+      symbol: "straight",
+      harpoon: true,
+      flip: true,
+      stroke: (dash: "solid"),
+    ),
     "x": none,
     "o": none,
   ).at(sym)
@@ -56,11 +67,11 @@
   let width = calc.abs(ctx.x-pos.at(i1) - ctx.x-pos.at(i2))
 
   let h = 0
-  let comment = if seq.comment == none {none} else {
+  let comment = if seq.comment == none { none } else {
     let w = calc.min(width * 1pt, measure(seq.comment).width)
     box(
-      width: if i1 == i2 {auto} else {w},
-      seq.comment
+      width: if i1 == i2 { auto } else { w },
+      seq.comment,
     )
   }
   // Reserve space for comment
@@ -71,7 +82,7 @@
     h,
     ..seq.linked-notes.map(n => {
       note.get-size(n).height / 2
-    })
+    }),
   )
   ctx.y -= h
 
@@ -79,13 +90,13 @@
     i: i1,
     x: ctx.x-pos.at(i1),
     y: ctx.y,
-    ll-lvl: ctx.lifelines.at(i1).level * LIFELINE-W / 2
+    ll-lvl: ctx.lifelines.at(i1).level * LIFELINE-W / 2,
   )
   let end-info = (
     i: i2,
     x: ctx.x-pos.at(i2),
     y: ctx.y,
-    ll-lvl: ctx.lifelines.at(i2).level * LIFELINE-W / 2
+    ll-lvl: ctx.lifelines.at(i2).level * LIFELINE-W / 2,
   )
   let slant = if seq.slant == auto {
     DEFAULT-SLANT
@@ -129,9 +140,9 @@
   if seq.create-dst {
     let par = ctx.participants.at(i2)
     let m = measure(box(par.display-name))
-    let f = if i1 > i2 {-1} else {1}
+    let f = if i1 > i2 { -1 } else { 1 }
     end-info.x -= (m.width + PAR-PAD.last() * 2) / 2pt * f
-    (par.draw)(par, y: end-info.y)
+    (par.draw)(par, y: end-info.y - m.height / 1pt)
   }
 
   end-info.ll-lvl = ctx.lifelines.at(i2).level * LIFELINE-W / 2
@@ -142,11 +153,11 @@
   let start-lx = start-info.x
   let end-lx = end-info.x
   if seq.outer-lifeline-connect {
-    if start-info.ll-lvl != 0 {start-lx -= LIFELINE-W / 2}
-    if end-info.ll-lvl != 0 {end-lx -= LIFELINE-W / 2}
+    if start-info.ll-lvl != 0 { start-lx -= LIFELINE-W / 2 }
+    if end-info.ll-lvl != 0 { end-lx -= LIFELINE-W / 2 }
   } else {
-    if start-info.ll-lvl != 0 {start-lx = start-info.rx - LIFELINE-W}
-    if end-info.ll-lvl != 0 {end-lx = end-info.rx - LIFELINE-W}
+    if start-info.ll-lvl != 0 { start-lx = start-info.rx - LIFELINE-W }
+    if end-info.ll-lvl != 0 { end-lx = end-info.rx - LIFELINE-W }
   }
   start-info.insert("lx", start-lx)
   end-info.insert("lx", end-lx)
@@ -164,13 +175,13 @@
     mark: (
       start: get-arrow-marks(seq.start-tip, seq.color),
       end: get-arrow-marks(seq.end-tip, seq.color),
-      scale: 1.2
+      scale: 1.2,
     ),
     stroke: (
-      dash: if seq.dashed {(2pt,2pt)} else {"solid"},
+      dash: if seq.dashed { (2pt, 2pt) } else { "solid" },
       paint: seq.color,
-      thickness: .5pt
-    )
+      thickness: .5pt,
+    ),
   )
 
   let y0 = start-info.y
@@ -208,13 +219,13 @@
       (x1, start-info.y),
       (x-mid, start-info.y),
       (x-mid, end-info.y),
-      (x2, end-info.y)
+      (x2, end-info.y),
     )
 
     if comment != none {
       comment-anchor = (
-        start: if x-mid < x1 {"south-east"} else {"south-west"},
-        end: if x-mid < x1 {"south-west"} else {"south-east"},
+        start: if x-mid < x1 { "south-east" } else { "south-west" },
+        end: if x-mid < x1 { "south-west" } else { "south-east" },
         left: "south-west",
         right: "south-east",
         center: "south",
@@ -223,21 +234,20 @@
       comment-pt = (
         start: pts.first(),
         end: pts.at(1),
-        left: if x-mid < x1 {pts.at(1)} else {pts.first()},
-        right: if x-mid < x1 {pts.first()} else {pts.at(1)},
-        center: (pts.first(), 50%, pts.at(1))
+        left: if x-mid < x1 { pts.at(1) } else { pts.first() },
+        right: if x-mid < x1 { pts.first() } else { pts.at(1) },
+        center: (pts.first(), 50%, pts.at(1)),
       ).at(seq.comment-align)
     }
 
     expand-parent-group(
       calc.min(x1, x2, x-mid),
-      calc.max(x1, x2, x-mid)
+      calc.max(x1, x2, x-mid),
     )
-
   } else {
     pts = (
       (x1, start-info.y),
-      (x2, end-info.y)
+      (x2, end-info.y),
     )
 
     if comment != none {
@@ -253,14 +263,14 @@
       comment-pt = (
         start: start-pt,
         end: end-pt,
-        left: if x2 < x1 {end-pt} else {start-pt},
-        right: if x2 < x1 {start-pt} else {end-pt},
-        center: (start-pt, 50%, end-pt)
+        left: if x2 < x1 { end-pt } else { start-pt },
+        right: if x2 < x1 { start-pt } else { end-pt },
+        center: (start-pt, 50%, end-pt),
       ).at(seq.comment-align)
 
       comment-anchor = (
-        start: if x2 < x1 {"south-east"} else {"south-west"},
-        end: if x2 < x1 {"south-west"} else {"south-east"},
+        start: if x2 < x1 { "south-east" } else { "south-west" },
+        end: if x2 < x1 { "south-west" } else { "south-east" },
         left: "south-west",
         right: "south-east",
         center: "south",
@@ -275,7 +285,7 @@
 
     expand-parent-group(
       calc.min(x1, x2),
-      calc.max(x1, x2)
+      calc.max(x1, x2),
     )
   }
 
@@ -286,27 +296,27 @@
       radius: CIRCLE-TIP-RADIUS,
       stroke: none,
       fill: seq.color,
-      name: "_circle-start-tip"
+      name: "_circle-start-tip",
     )
     pts.at(0) = "_circle-start-tip"
 
-  // Start cross tip
+    // Start cross tip
   } else if is-cross-tip(seq.start-tip) {
     let size = CROSS-TIP-SIZE
     let cross-pt = (
       pts.first(),
       size * 2,
-      pts.at(1)
+      pts.at(1),
     )
     draw.line(
       (rel: (-size, -size), to: cross-pt),
       (rel: (size, size), to: cross-pt),
-      stroke: seq.color + 1.5pt
+      stroke: seq.color + 1.5pt,
     )
     draw.line(
       (rel: (-size, size), to: cross-pt),
       (rel: (size, -size), to: cross-pt),
-      stroke: seq.color + 1.5pt
+      stroke: seq.color + 1.5pt,
     )
     pts.at(0) = cross-pt
   }
@@ -318,27 +328,27 @@
       radius: 3,
       stroke: none,
       fill: seq.color,
-      name: "_circle-end-tip"
+      name: "_circle-end-tip",
     )
     pts.at(pts.len() - 1) = "_circle-end-tip"
 
-  // End cross tip
+    // End cross tip
   } else if is-cross-tip(seq.end-tip) {
     let size = CROSS-TIP-SIZE
     let cross-pt = (
       pts.last(),
       size * 2,
-      pts.at(pts.len() - 2)
+      pts.at(pts.len() - 2),
     )
     draw.line(
       (rel: (-size, -size), to: cross-pt),
       (rel: (size, size), to: cross-pt),
-      stroke: seq.color + 1.5pt
+      stroke: seq.color + 1.5pt,
     )
     draw.line(
       (rel: (-size, size), to: cross-pt),
       (rel: (size, -size), to: cross-pt),
-      stroke: seq.color + 1.5pt
+      stroke: seq.color + 1.5pt,
     )
     pts.at(pts.len() - 1) = cross-pt
   }
@@ -352,7 +362,7 @@
       anchor: comment-anchor,
       angle: comment-angle,
       padding: 3pt,
-      name: "comment"
+      name: "comment",
     )
 
     // TODO: Improve this
@@ -360,14 +370,13 @@
       let (_, left, right) = coordinate.resolve(
         c,
         "comment.west",
-        "comment.east"
+        "comment.east",
       )
       expand-parent-group(
         left.at(0),
-        right.at(0)
+        right.at(0),
       )
     })
-
   }
 
   if seq.create-dst {
@@ -384,10 +393,11 @@
   if seq.linked-notes.len() != 0 {
     end-info.y = calc.min(
       end-info.y,
-      y0 - calc.max(..seq.linked-notes.map(n => {
-        let m = note.get-size(n)
-        return m.height / 2
-      }))
+      y0
+        - calc.max(..seq.linked-notes.map(n => {
+          let m = note.get-size(n)
+          return m.height / 2
+        })),
     )
   }
 
@@ -397,7 +407,7 @@
     c.last-drawn = (
       type: "seq",
       start-info: start-info,
-      end-info: end-info
+      end-info: end-info,
     )
     return c
   })

src/core/setup.typ

@@ -57,7 +57,8 @@
     seq.p2, seq.p1,
     comment: ret.comment,
     disable-src: true,
-    dashed: true
+    dashed: true,
+    end-tip: ret.end-tip,
   ).first()
   return (elmts, activation-history)
 }

src/sequence.typ

@@ -5,9 +5,9 @@
   p2,
   comment: none,
   comment-align: "left",
-  dashed: false,
+  dashed: none,
   start-tip: "",
-  end-tip: ">",
+  end-tip: none,
   color: black,
   flip: false,
   enable-dst: false,
@@ -20,6 +20,20 @@
   slant: none,
   outer-lifeline-connect: false
 ) = {
+  dashed = if dashed == none {
+    create-dst
+  } else {
+    dashed
+  }
+  end-tip = if end-tip == none {
+    if create-dst {
+      ">>"
+    } else {
+      ">"
+    }
+  } else {
+    end-tip
+  }
   return ((
     type: "seq",
     draw: sequence.render,
@@ -45,9 +59,10 @@
   ),)
 }
 
-#let _ret(comment: none) = {
+#let _ret(comment: none, end-tip: ">") = {
   return ((
     type: "ret",
-    comment: comment
+    comment: comment,
+    end-tip: end-tip
   ),)
 }