Author SHA1 Message Date
HEL a013e74936 chore: disable fail fast when running tests 2026-09-22 12:27:30 +02:00
9 changed files with 67 additions and 93 deletions

No files matched your search

+1 -1
View File
@@ -17,7 +17,7 @@ jobs:
run: cargo binstall tytanic@0.3.3 run: cargo binstall tytanic@0.3.3
- name: Run test suite - name: Run test suite
run: tt run run: tt run -F
- name: Archive artifacts - name: Archive artifacts
uses: https://gitea.com/actions/gitea-upload-artifact@v4 uses: https://gitea.com/actions/gitea-upload-artifact@v4
+1 -1
View File
@@ -19,7 +19,7 @@ gallery:
for f in "{{gallery_dir}}"/readme/*.typ; do typst c --root . "$f" "${f%typ}png"; done for f in "{{gallery_dir}}"/readme/*.typ; do typst c --root . "$f" "${f%typ}png"; done
test *filter: test *filter:
tt run {{filter}} tt run {{filter}} -F
update-test *filter: update-test *filter:
tt update {{filter}} tt update {{filter}}
+60 -70
View File
@@ -1,8 +1,8 @@
#import "/src/cetz.typ": coordinate, draw, vector #import "/src/cetz.typ": draw, vector, coordinate
#import "note.typ" #import "note.typ"
#import "/src/consts.typ": * #import "/src/consts.typ": *
#import "/src/core/utils.typ": expand-parent-group, get-ctx, set-ctx #import "/src/core/utils.typ": get-ctx, set-ctx, expand-parent-group
#let get-arrow-marks(sym, color) = { #let get-arrow-marks(sym, color) = {
if sym == none { if sym == none {
@@ -13,23 +13,12 @@
} }
( (
"": none, "": none,
">": (symbol: ">", fill: color, stroke: (dash: "solid")), ">": (symbol: ">", fill: color),
">>": (symbol: "straight", stroke: (dash: "solid")), ">>": (symbol: "straight"),
"\\": (symbol: ">", fill: color, harpoon: true, stroke: (dash: "solid")), "\\": (symbol: ">", fill: color, harpoon: true),
"\\\\": (symbol: "straight", harpoon: true, stroke: (dash: "solid")), "\\\\": (symbol: "straight", harpoon: true),
"/": ( "/": (symbol: ">", fill: color, harpoon: true, flip: true),
symbol: ">", "//": (symbol: "straight", harpoon: true, flip: true),
fill: color,
harpoon: true,
flip: true,
stroke: (dash: "solid"),
),
"//": (
symbol: "straight",
harpoon: true,
flip: true,
stroke: (dash: "solid"),
),
"x": none, "x": none,
"o": none, "o": none,
).at(sym) ).at(sym)
@@ -67,11 +56,11 @@
let width = calc.abs(ctx.x-pos.at(i1) - ctx.x-pos.at(i2)) let width = calc.abs(ctx.x-pos.at(i1) - ctx.x-pos.at(i2))
let h = 0 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) let w = calc.min(width * 1pt, measure(seq.comment).width)
box( box(
width: if i1 == i2 { auto } else { w }, width: if i1 == i2 {auto} else {w},
seq.comment, seq.comment
) )
} }
// Reserve space for comment // Reserve space for comment
@@ -82,7 +71,7 @@
h, h,
..seq.linked-notes.map(n => { ..seq.linked-notes.map(n => {
note.get-size(n).height / 2 note.get-size(n).height / 2
}), })
) )
ctx.y -= h ctx.y -= h
@@ -90,13 +79,13 @@
i: i1, i: i1,
x: ctx.x-pos.at(i1), x: ctx.x-pos.at(i1),
y: ctx.y, 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 = ( let end-info = (
i: i2, i: i2,
x: ctx.x-pos.at(i2), x: ctx.x-pos.at(i2),
y: ctx.y, 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 { let slant = if seq.slant == auto {
DEFAULT-SLANT DEFAULT-SLANT
@@ -140,9 +129,9 @@
if seq.create-dst { if seq.create-dst {
let par = ctx.participants.at(i2) let par = ctx.participants.at(i2)
let m = measure(box(par.display-name)) 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 end-info.x -= (m.width + PAR-PAD.last() * 2) / 2pt * f
(par.draw)(par, y: end-info.y - m.height / 1pt) (par.draw)(par, y: end-info.y)
} }
end-info.ll-lvl = ctx.lifelines.at(i2).level * LIFELINE-W / 2 end-info.ll-lvl = ctx.lifelines.at(i2).level * LIFELINE-W / 2
@@ -153,11 +142,11 @@
let start-lx = start-info.x let start-lx = start-info.x
let end-lx = end-info.x let end-lx = end-info.x
if seq.outer-lifeline-connect { if seq.outer-lifeline-connect {
if start-info.ll-lvl != 0 { start-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 } if end-info.ll-lvl != 0 {end-lx -= LIFELINE-W / 2}
} else { } else {
if start-info.ll-lvl != 0 { start-lx = start-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 } if end-info.ll-lvl != 0 {end-lx = end-info.rx - LIFELINE-W}
} }
start-info.insert("lx", start-lx) start-info.insert("lx", start-lx)
end-info.insert("lx", end-lx) end-info.insert("lx", end-lx)
@@ -175,13 +164,13 @@
mark: ( mark: (
start: get-arrow-marks(seq.start-tip, seq.color), start: get-arrow-marks(seq.start-tip, seq.color),
end: get-arrow-marks(seq.end-tip, seq.color), end: get-arrow-marks(seq.end-tip, seq.color),
scale: 1.2, scale: 1.2
), ),
stroke: ( stroke: (
dash: if seq.dashed { (2pt, 2pt) } else { "solid" }, dash: if seq.dashed {(2pt,2pt)} else {"solid"},
paint: seq.color, paint: seq.color,
thickness: .5pt, thickness: .5pt
), )
) )
let y0 = start-info.y let y0 = start-info.y
@@ -219,13 +208,13 @@
(x1, start-info.y), (x1, start-info.y),
(x-mid, start-info.y), (x-mid, start-info.y),
(x-mid, end-info.y), (x-mid, end-info.y),
(x2, end-info.y), (x2, end-info.y)
) )
if comment != none { if comment != none {
comment-anchor = ( comment-anchor = (
start: if x-mid < x1 { "south-east" } else { "south-west" }, start: if x-mid < x1 {"south-east"} else {"south-west"},
end: if x-mid < x1 { "south-west" } else { "south-east" }, end: if x-mid < x1 {"south-west"} else {"south-east"},
left: "south-west", left: "south-west",
right: "south-east", right: "south-east",
center: "south", center: "south",
@@ -234,20 +223,21 @@
comment-pt = ( comment-pt = (
start: pts.first(), start: pts.first(),
end: pts.at(1), end: pts.at(1),
left: if x-mid < x1 { pts.at(1) } else { pts.first() }, left: if x-mid < x1 {pts.at(1)} else {pts.first()},
right: if x-mid < x1 { pts.first() } else { pts.at(1) }, right: if x-mid < x1 {pts.first()} else {pts.at(1)},
center: (pts.first(), 50%, pts.at(1)), center: (pts.first(), 50%, pts.at(1))
).at(seq.comment-align) ).at(seq.comment-align)
} }
expand-parent-group( expand-parent-group(
calc.min(x1, x2, x-mid), calc.min(x1, x2, x-mid),
calc.max(x1, x2, x-mid), calc.max(x1, x2, x-mid)
) )
} else { } else {
pts = ( pts = (
(x1, start-info.y), (x1, start-info.y),
(x2, end-info.y), (x2, end-info.y)
) )
if comment != none { if comment != none {
@@ -263,14 +253,14 @@
comment-pt = ( comment-pt = (
start: start-pt, start: start-pt,
end: end-pt, end: end-pt,
left: if x2 < x1 { end-pt } else { start-pt }, left: if x2 < x1 {end-pt} else {start-pt},
right: if x2 < x1 { start-pt } else { end-pt }, right: if x2 < x1 {start-pt} else {end-pt},
center: (start-pt, 50%, end-pt), center: (start-pt, 50%, end-pt)
).at(seq.comment-align) ).at(seq.comment-align)
comment-anchor = ( comment-anchor = (
start: if x2 < x1 { "south-east" } else { "south-west" }, start: if x2 < x1 {"south-east"} else {"south-west"},
end: if x2 < x1 { "south-west" } else { "south-east" }, end: if x2 < x1 {"south-west"} else {"south-east"},
left: "south-west", left: "south-west",
right: "south-east", right: "south-east",
center: "south", center: "south",
@@ -285,7 +275,7 @@
expand-parent-group( expand-parent-group(
calc.min(x1, x2), calc.min(x1, x2),
calc.max(x1, x2), calc.max(x1, x2)
) )
} }
@@ -296,27 +286,27 @@
radius: CIRCLE-TIP-RADIUS, radius: CIRCLE-TIP-RADIUS,
stroke: none, stroke: none,
fill: seq.color, fill: seq.color,
name: "_circle-start-tip", name: "_circle-start-tip"
) )
pts.at(0) = "_circle-start-tip" pts.at(0) = "_circle-start-tip"
// Start cross tip // Start cross tip
} else if is-cross-tip(seq.start-tip) { } else if is-cross-tip(seq.start-tip) {
let size = CROSS-TIP-SIZE let size = CROSS-TIP-SIZE
let cross-pt = ( let cross-pt = (
pts.first(), pts.first(),
size * 2, size * 2,
pts.at(1), pts.at(1)
) )
draw.line( draw.line(
(rel: (-size, -size), to: cross-pt), (rel: (-size, -size), to: cross-pt),
(rel: (size, size), to: cross-pt), (rel: (size, size), to: cross-pt),
stroke: seq.color + 1.5pt, stroke: seq.color + 1.5pt
) )
draw.line( draw.line(
(rel: (-size, size), to: cross-pt), (rel: (-size, size), to: cross-pt),
(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 pts.at(0) = cross-pt
} }
@@ -328,27 +318,27 @@
radius: 3, radius: 3,
stroke: none, stroke: none,
fill: seq.color, fill: seq.color,
name: "_circle-end-tip", name: "_circle-end-tip"
) )
pts.at(pts.len() - 1) = "_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) { } else if is-cross-tip(seq.end-tip) {
let size = CROSS-TIP-SIZE let size = CROSS-TIP-SIZE
let cross-pt = ( let cross-pt = (
pts.last(), pts.last(),
size * 2, size * 2,
pts.at(pts.len() - 2), pts.at(pts.len() - 2)
) )
draw.line( draw.line(
(rel: (-size, -size), to: cross-pt), (rel: (-size, -size), to: cross-pt),
(rel: (size, size), to: cross-pt), (rel: (size, size), to: cross-pt),
stroke: seq.color + 1.5pt, stroke: seq.color + 1.5pt
) )
draw.line( draw.line(
(rel: (-size, size), to: cross-pt), (rel: (-size, size), to: cross-pt),
(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 pts.at(pts.len() - 1) = cross-pt
} }
@@ -362,7 +352,7 @@
anchor: comment-anchor, anchor: comment-anchor,
angle: comment-angle, angle: comment-angle,
padding: 3pt, padding: 3pt,
name: "comment", name: "comment"
) )
// TODO: Improve this // TODO: Improve this
@@ -370,13 +360,14 @@
let (_, left, right) = coordinate.resolve( let (_, left, right) = coordinate.resolve(
c, c,
"comment.west", "comment.west",
"comment.east", "comment.east"
) )
expand-parent-group( expand-parent-group(
left.at(0), left.at(0),
right.at(0), right.at(0)
) )
}) })
} }
if seq.create-dst { if seq.create-dst {
@@ -393,11 +384,10 @@
if seq.linked-notes.len() != 0 { if seq.linked-notes.len() != 0 {
end-info.y = calc.min( end-info.y = calc.min(
end-info.y, end-info.y,
y0 y0 - calc.max(..seq.linked-notes.map(n => {
- calc.max(..seq.linked-notes.map(n => { let m = note.get-size(n)
let m = note.get-size(n) return m.height / 2
return m.height / 2 }))
})),
) )
} }
@@ -407,7 +397,7 @@
c.last-drawn = ( c.last-drawn = (
type: "seq", type: "seq",
start-info: start-info, start-info: start-info,
end-info: end-info, end-info: end-info
) )
return c return c
}) })
+1 -2
View File
@@ -57,8 +57,7 @@
seq.p2, seq.p1, seq.p2, seq.p1,
comment: ret.comment, comment: ret.comment,
disable-src: true, disable-src: true,
dashed: true, dashed: true
end-tip: ret.end-tip,
).first() ).first()
return (elmts, activation-history) return (elmts, activation-history)
} }
+4 -19
View File
@@ -5,9 +5,9 @@
p2, p2,
comment: none, comment: none,
comment-align: "left", comment-align: "left",
dashed: none, dashed: false,
start-tip: "", start-tip: "",
end-tip: none, end-tip: ">",
color: black, color: black,
flip: false, flip: false,
enable-dst: false, enable-dst: false,
@@ -20,20 +20,6 @@
slant: none, slant: none,
outer-lifeline-connect: false 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 (( return ((
type: "seq", type: "seq",
draw: sequence.render, draw: sequence.render,
@@ -59,10 +45,9 @@
),) ),)
} }
#let _ret(comment: none, end-tip: ">") = { #let _ret(comment: none) = {
return (( return ((
type: "ret", type: "ret",
comment: comment, comment: comment
end-tip: end-tip
),) ),)
} }
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB