Compare commits
	
		
			17 Commits
		
	
	
		
			81871e2aca
			...
			v0.1.0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						6f563750fb
	
				 | 
					
					
						|||
| 
						
						
							
						
						5822d705f2
	
				 | 
					
					
						|||
| 
						
						
							
						
						226efa46b7
	
				 | 
					
					
						|||
| 
						
						
							
						
						3d9e045b56
	
				 | 
					
					
						|||
| 
						
						
							
						
						eb05c41810
	
				 | 
					
					
						|||
| 
						
						
							
						
						b9bbe6f93d
	
				 | 
					
					
						|||
| 
						
						
							
						
						b5c34c154f
	
				 | 
					
					
						|||
| 
						
						
							
						
						030fd3edba
	
				 | 
					
					
						|||
| 
						
						
							
						
						cbba14ed04
	
				 | 
					
					
						|||
| 
						
						
							
						
						77a65a3199
	
				 | 
					
					
						|||
| 
						
						
							
						
						ff6a7e52bc
	
				 | 
					
					
						|||
| 
						
						
							
						
						ebd4d8f1ca
	
				 | 
					
					
						|||
| 
						
						
							
						
						3b25d68f1e
	
				 | 
					
					
						|||
| 
						
						
							
						
						0968436c8a
	
				 | 
					
					
						|||
| 
						
						
							
						
						2c724598e9
	
				 | 
					
					
						|||
| 
						
						
							
						
						0cff9d6799
	
				 | 
					
					
						|||
| 
						
						
							
						
						f08f30b9e2
	
				 | 
					
					
						
							
								
								
									
										147
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										147
									
								
								README.md
									
									
									
									
									
								
							@@ -1,3 +1,150 @@
 | 
			
		||||
# chronos
 | 
			
		||||
 | 
			
		||||
A Typst package to draw sequence diagrams with CeTZ
 | 
			
		||||
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
This package lets you render sequence diagrams directly in Typst. The following boilerplate code creates an empty sequence diagram with two participants:
 | 
			
		||||
 | 
			
		||||
<table>
 | 
			
		||||
<tr>
 | 
			
		||||
<td><strong>Typst</strong></td>
 | 
			
		||||
<td><strong>Result</strong></td>
 | 
			
		||||
</tr>
 | 
			
		||||
<tr>
 | 
			
		||||
<td>
 | 
			
		||||
 | 
			
		||||
```typst
 | 
			
		||||
#import "@preview/chronos:0.1.0"
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
  _par("Alice")
 | 
			
		||||
  _par("Bob")
 | 
			
		||||
})
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
</td>
 | 
			
		||||
<td><img src="./gallery/readme/boilerplate.png"></td>
 | 
			
		||||
</tr>
 | 
			
		||||
</table>
 | 
			
		||||
 | 
			
		||||
> *Disclaimer*\
 | 
			
		||||
> The package cannot parse PlantUML syntax for the moment, and thus requires the use of element functions, as shown in the examples.
 | 
			
		||||
> A PlantUML parser is in the TODO list, just not the top priority
 | 
			
		||||
 | 
			
		||||
## Basic sequences
 | 
			
		||||
 | 
			
		||||
You can make basic sequences using the `_seq` function:
 | 
			
		||||
 | 
			
		||||
<table>
 | 
			
		||||
<tr>
 | 
			
		||||
<td><strong>Typst</strong></td>
 | 
			
		||||
<td><strong>Result</strong></td>
 | 
			
		||||
</tr>
 | 
			
		||||
<tr>
 | 
			
		||||
<td>
 | 
			
		||||
 | 
			
		||||
```typst
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
  _par("Alice")
 | 
			
		||||
  _par("Bob")
 | 
			
		||||
 | 
			
		||||
  _seq("Alice", "Bob", comment: "Hello")
 | 
			
		||||
  _seq("Bob", "Bob", comment: "Think")
 | 
			
		||||
  _seq("Bob", "Alice", comment: "Hi")
 | 
			
		||||
})
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
</td>
 | 
			
		||||
<td><img src="./gallery/readme/simple_sequence.png"></td>
 | 
			
		||||
</tr>
 | 
			
		||||
</table>
 | 
			
		||||
 | 
			
		||||
You can make lifelines using the following parameters of the `_seq` function:
 | 
			
		||||
 - `enable-dst`: enables the destination lifeline
 | 
			
		||||
 - `create-dst`: creates the destination lifeline and participant
 | 
			
		||||
 - `disable-dst`: disables the destination lifeline
 | 
			
		||||
 - `destroy-dst`: destroys the destination lifeline and participant
 | 
			
		||||
 - `disable-src`: disables the source lifeline
 | 
			
		||||
 - `destroy-src`: destroy the source lifeline and participant
 | 
			
		||||
 | 
			
		||||
<table>
 | 
			
		||||
<tr>
 | 
			
		||||
<td><strong>Typst</strong></td>
 | 
			
		||||
<td><strong>Result</strong></td>
 | 
			
		||||
</tr>
 | 
			
		||||
<tr>
 | 
			
		||||
<td>
 | 
			
		||||
 | 
			
		||||
```typst
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
  _par("A", display-name: "Alice")
 | 
			
		||||
  _par("B", display-name: "Bob")
 | 
			
		||||
  _par("C", display-name: "Charlie")
 | 
			
		||||
  _par("D", display-name: "Derek")
 | 
			
		||||
 | 
			
		||||
  _seq("A", "B", comment: "hello", enable-dst: true)
 | 
			
		||||
  _seq("B", "B", comment: "self call", enable-dst: true)
 | 
			
		||||
  _seq("C", "B", comment: "hello from thread 2", enable-dst: true, lifeline-style: (fill: rgb("#005500")))
 | 
			
		||||
  _seq("B", "D", comment: "create", create-dst: true)
 | 
			
		||||
  _seq("B", "C", comment: "done in thread 2", disable-src: true, dashed: true)
 | 
			
		||||
  _seq("B", "B", comment: "rc", disable-src: true, dashed: true)
 | 
			
		||||
  _seq("B", "D", comment: "delete", destroy-dst: true)
 | 
			
		||||
  _seq("B", "A", comment: "success", disable-src: true, dashed: true)
 | 
			
		||||
})
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
</td>
 | 
			
		||||
<td><img src="./gallery/readme/lifelines.png"></td>
 | 
			
		||||
</tr>
 | 
			
		||||
</table>
 | 
			
		||||
 | 
			
		||||
## Showcase
 | 
			
		||||
 | 
			
		||||
Several features have already been implemented in Chronos. Don't hesitate to checkout the examples in the [gallery](./gallery) folder to see what you can do. 
 | 
			
		||||
 | 
			
		||||
#### Quick example reference:
 | 
			
		||||
<table>
 | 
			
		||||
<tr>
 | 
			
		||||
<td><strong>Example</strong></td>
 | 
			
		||||
<td><strong>Features</strong></td>
 | 
			
		||||
</tr>
 | 
			
		||||
<tr>
 | 
			
		||||
<td>
 | 
			
		||||
 | 
			
		||||
`example1` <br>([PDF](./gallery/example1.pdf)|[Typst](./gallery/example1.typ))
 | 
			
		||||
 | 
			
		||||
</td>
 | 
			
		||||
<td>Simple cases, color sequences, groups, separators, gaps, self-sequences</td>
 | 
			
		||||
</tr>
 | 
			
		||||
<tr>
 | 
			
		||||
<td>
 | 
			
		||||
 | 
			
		||||
`example2` <br>([PDF](./gallery/example2.pdf)|[Typst](./gallery/example2.typ))
 | 
			
		||||
 | 
			
		||||
</td>
 | 
			
		||||
<td>Lifelines, found/lost messages, synchronized sequences, slanted sequences</td>
 | 
			
		||||
</tr>
 | 
			
		||||
<tr>
 | 
			
		||||
<td>
 | 
			
		||||
 | 
			
		||||
`example3` <br>([PDF](./gallery/example3.pdf)|[Typst](./gallery/example3.typ))
 | 
			
		||||
 | 
			
		||||
</td>
 | 
			
		||||
<td>Participant shapes, sequence tips, hidden partipicant ends</td>
 | 
			
		||||
</tr>
 | 
			
		||||
<tr>
 | 
			
		||||
<td>
 | 
			
		||||
 | 
			
		||||
`notes` <br>([PDF](./gallery/notes.pdf)|[Typst](./gallery/notes.typ))
 | 
			
		||||
 | 
			
		||||
</td>
 | 
			
		||||
<td>Notes (duh), deferred participant creation</td>
 | 
			
		||||
</tr>
 | 
			
		||||
</table>
 | 
			
		||||
 | 
			
		||||
> [!NOTE]
 | 
			
		||||
> 
 | 
			
		||||
> Many examples were taken/adapted from the PlantUML [documentation](https://plantuml.com/sequence-diagram) on sequence diagrams
 | 
			
		||||
							
								
								
									
										27
									
								
								TODO.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								TODO.md
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,27 @@
 | 
			
		||||
# TODO
 | 
			
		||||
 | 
			
		||||
- [x] Basic participants
 | 
			
		||||
- [x] Basic sequences
 | 
			
		||||
- [x] Separators
 | 
			
		||||
- [x] Gaps
 | 
			
		||||
- [x] Groups
 | 
			
		||||
- [x] Self arrows
 | 
			
		||||
- [x] Arrow from start / to end, small arrows
 | 
			
		||||
- [x] Lifelines
 | 
			
		||||
- [x] Different types of participants
 | 
			
		||||
- [x] Notes
 | 
			
		||||
- [x] Synchronized arrows
 | 
			
		||||
- [x] Slanted arrows
 | 
			
		||||
- [x] Different types of arrow tips
 | 
			
		||||
- [x] Sequence comment alignment
 | 
			
		||||
- [x] Fix group size with syncs
 | 
			
		||||
- [ ] Fix column spacing with notes over multiple columns
 | 
			
		||||
- [ ] Fix notes with arrows from start / to end / small arrows
 | 
			
		||||
- [ ] Fix group size with self arrows + notes
 | 
			
		||||
- [ ] Unify styling structure
 | 
			
		||||
- [ ] Add args verification to catch user errors + pretty error messages
 | 
			
		||||
- [ ] PlantUML parser
 | 
			
		||||
- [ ] (Message numbering)
 | 
			
		||||
- [ ] Different types of groups (alt/loop/etc.)
 | 
			
		||||
- [ ] Delays
 | 
			
		||||
- [ ] Auto-fit in parent
 | 
			
		||||
							
								
								
									
										27
									
								
								gallery.bash
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								gallery.bash
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,27 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
echo
 | 
			
		||||
echo "Generating gallery PDFs"
 | 
			
		||||
 | 
			
		||||
set -- ./gallery/*.typ
 | 
			
		||||
cnt="$#"
 | 
			
		||||
i=1
 | 
			
		||||
for f
 | 
			
		||||
do
 | 
			
		||||
    f2="${f/typ/pdf}"
 | 
			
		||||
    echo "($i/$cnt) $f -> $f2"
 | 
			
		||||
    typst c --root ./ "$f" "$f2"
 | 
			
		||||
    i=$((i+1))
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
set -- ./gallery/readme/*.typ
 | 
			
		||||
cnt="$#"
 | 
			
		||||
i=1
 | 
			
		||||
for f
 | 
			
		||||
do
 | 
			
		||||
    f2="${f/typ/png}"
 | 
			
		||||
    echo "($i/$cnt) $f -> $f2"
 | 
			
		||||
    typst c --root ./ "$f" "$f2"
 | 
			
		||||
    i=$((i+1))
 | 
			
		||||
done
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							@@ -49,3 +49,121 @@
 | 
			
		||||
  _seq("Alice", "?", comment: [->?\ *short* from actor1])
 | 
			
		||||
  _seq("Alice", "Bob", comment: [->\ from actor1 to actor2])
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
  _par("alice", display-name: "Alice")
 | 
			
		||||
  _par("bob", display-name: "Bob")
 | 
			
		||||
  _par("craig", display-name: "Craig")
 | 
			
		||||
 | 
			
		||||
  _seq("bob", "alice")
 | 
			
		||||
  _seq("bob", "craig")
 | 
			
		||||
  _gap()
 | 
			
		||||
  
 | 
			
		||||
  _sync({
 | 
			
		||||
    _seq("bob", "alice", comment: "Synched", comment-align: "start")
 | 
			
		||||
    _seq("bob", "craig", comment: "Synched", comment-align: "start")
 | 
			
		||||
  })
 | 
			
		||||
  _gap()
 | 
			
		||||
  
 | 
			
		||||
  _seq("alice", "bob")
 | 
			
		||||
  _seq("craig", "bob")
 | 
			
		||||
  _gap()
 | 
			
		||||
  
 | 
			
		||||
  _sync({
 | 
			
		||||
    _seq("alice", "bob")
 | 
			
		||||
    _seq("craig", "bob")
 | 
			
		||||
  })
 | 
			
		||||
  _gap()
 | 
			
		||||
  
 | 
			
		||||
  _sync({
 | 
			
		||||
    _seq("alice", "bob", enable-dst: true)
 | 
			
		||||
    _seq("craig", "bob")
 | 
			
		||||
  })
 | 
			
		||||
  _gap()
 | 
			
		||||
 | 
			
		||||
  _evt("bob", "disable")
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
  _par("alice", display-name: "Alice")
 | 
			
		||||
  _par("bob", display-name: "Bob")
 | 
			
		||||
  _par("craig", display-name: "Craig")
 | 
			
		||||
 | 
			
		||||
  _seq("alice", "bob")
 | 
			
		||||
  _seq("bob", "craig", slant: auto)
 | 
			
		||||
  _seq("alice", "craig", slant: 20)
 | 
			
		||||
 | 
			
		||||
  _sync({
 | 
			
		||||
    _seq("alice", "bob", slant: 10)
 | 
			
		||||
    _seq("craig", "bob", slant: 20)
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  _sync({
 | 
			
		||||
    _seq("alice", "bob", slant: auto)
 | 
			
		||||
    _seq("bob", "alice", slant: auto)
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  _gap()
 | 
			
		||||
  _evt("bob", "disable")
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
#grid(columns: 2, column-gutter: 2em,
 | 
			
		||||
  chronos.diagram({
 | 
			
		||||
    import chronos: *
 | 
			
		||||
 | 
			
		||||
    _par("alice", display-name: "Alice")
 | 
			
		||||
    _par("bob", display-name: "Bob")
 | 
			
		||||
    _seq("alice", "bob", comment: "This is a very long comment")
 | 
			
		||||
 | 
			
		||||
    // Left to right
 | 
			
		||||
    _seq("alice", "bob", comment: "Start aligned", comment-align: "start")
 | 
			
		||||
    _seq("alice", "bob", comment: "End aligned", comment-align: "end")
 | 
			
		||||
    _seq("alice", "bob", comment: "Left aligned", comment-align: "left")
 | 
			
		||||
    _seq("alice", "bob", comment: "Right aligned", comment-align: "right")
 | 
			
		||||
    _seq("alice", "bob", comment: "Centered", comment-align: "center")
 | 
			
		||||
    _gap()
 | 
			
		||||
 | 
			
		||||
    // Right to left
 | 
			
		||||
    _seq("bob", "alice", comment: "Start aligned", comment-align: "start")
 | 
			
		||||
    _seq("bob", "alice", comment: "End aligned", comment-align: "end")
 | 
			
		||||
    _seq("bob", "alice", comment: "Left aligned", comment-align: "left")
 | 
			
		||||
    _seq("bob", "alice", comment: "Right aligned", comment-align: "right")
 | 
			
		||||
    _seq("bob", "alice", comment: "Centered", comment-align: "center")
 | 
			
		||||
    _gap()
 | 
			
		||||
 | 
			
		||||
    // Slant left to right
 | 
			
		||||
    _seq("alice", "bob", comment: "Start aligned", comment-align: "start", slant: 10)
 | 
			
		||||
    _seq("alice", "bob", comment: "End aligned", comment-align: "end", slant: 10)
 | 
			
		||||
    _seq("alice", "bob", comment: "Left aligned", comment-align: "left", slant: 10)
 | 
			
		||||
    _seq("alice", "bob", comment: "Right aligned", comment-align: "right", slant: 10)
 | 
			
		||||
    _seq("alice", "bob", comment: "Centered", comment-align: "center", slant: 10)
 | 
			
		||||
    _gap()
 | 
			
		||||
 | 
			
		||||
    // Slant right to left
 | 
			
		||||
    _seq("bob", "alice", comment: "Start aligned", comment-align: "start", slant: 10)
 | 
			
		||||
    _seq("bob", "alice", comment: "End aligned", comment-align: "end", slant: 10)
 | 
			
		||||
    _seq("bob", "alice", comment: "Left aligned", comment-align: "left", slant: 10)
 | 
			
		||||
    _seq("bob", "alice", comment: "Right aligned", comment-align: "right", slant: 10)
 | 
			
		||||
    _seq("bob", "alice", comment: "Centered", comment-align: "center", slant: 10)
 | 
			
		||||
  }),
 | 
			
		||||
 | 
			
		||||
  chronos.diagram({
 | 
			
		||||
    import chronos: *
 | 
			
		||||
 | 
			
		||||
    _par("alice", display-name: "Alice")
 | 
			
		||||
 | 
			
		||||
    _seq("alice", "alice", comment: "Start aligned", comment-align: "start")
 | 
			
		||||
    _seq("alice", "alice", comment: "End aligned", comment-align: "end")
 | 
			
		||||
    _seq("alice", "alice", comment: "Left aligned", comment-align: "left")
 | 
			
		||||
    _seq("alice", "alice", comment: "Right aligned", comment-align: "right")
 | 
			
		||||
    _seq("alice", "alice", comment: "Centered", comment-align: "center")
 | 
			
		||||
 | 
			
		||||
    _seq("alice", "alice", comment: "Start aligned", comment-align: "start", flip: true)
 | 
			
		||||
    _seq("alice", "alice", comment: "End aligned", comment-align: "end", flip: true)
 | 
			
		||||
    _seq("alice", "alice", comment: "Left aligned", comment-align: "left", flip: true)
 | 
			
		||||
    _seq("alice", "alice", comment: "Right aligned", comment-align: "right", flip: true)
 | 
			
		||||
    _seq("alice", "alice", comment: "Centered", comment-align: "center", flip: true)
 | 
			
		||||
  })
 | 
			
		||||
)
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							@@ -65,11 +65,11 @@ chronos.diagram({
 | 
			
		||||
  _seq("a", "b", end-tip: "x", comment: `->x`)
 | 
			
		||||
  _seq("a", "b", start-tip: "x", comment: `x->`)
 | 
			
		||||
  _seq("a", "b", start-tip: "o", comment: `o->`)
 | 
			
		||||
  _seq("a", "b", end-tip: "o", comment: `->o`)
 | 
			
		||||
  _seq("a", "b", start-tip: "o", end-tip: "o", comment: `o->o`)
 | 
			
		||||
  _seq("a", "b", end-tip: ("o", ">"), comment: `->o`)
 | 
			
		||||
  _seq("a", "b", start-tip: "o", end-tip: ("o", ">"), comment: `o->o`)
 | 
			
		||||
  _seq("a", "b", start-tip: ">", end-tip: ">", comment: `<->`)
 | 
			
		||||
  _seq("a", "b", start-tip: ("o", ">"), end-tip: ("o", ">"), comment: `o<->o`)
 | 
			
		||||
  _seq("a", "b", start-tip: ("x", ">"), end-tip: ("x", ">"), comment: `x<->x`)
 | 
			
		||||
  _seq("a", "b", start-tip: "x", end-tip: "x", comment: `x<->x`)
 | 
			
		||||
  _seq("a", "b", end-tip: ("o", ">>"), comment: `->>o`)
 | 
			
		||||
  _seq("a", "b", end-tip: ("o", "\\"), comment: `-\o`)
 | 
			
		||||
  _seq("a", "b", end-tip: ("o", "\\\\"), comment: `-\\o`)
 | 
			
		||||
@@ -78,6 +78,34 @@ chronos.diagram({
 | 
			
		||||
  _seq("a", "b", start-tip: "x", end-tip: ("o", ">"), comment: `x->o`)
 | 
			
		||||
}),
 | 
			
		||||
 | 
			
		||||
chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
 | 
			
		||||
  _par("a", display-name: "Alice")
 | 
			
		||||
  _par("b", display-name: "Bob")
 | 
			
		||||
 | 
			
		||||
  _seq("b", "a", end-tip: ">", comment: `->`)
 | 
			
		||||
  _seq("b", "a", end-tip: ">>", comment: `->>`)
 | 
			
		||||
  _seq("b", "a", end-tip: "\\", comment: `-\`)
 | 
			
		||||
  _seq("b", "a", end-tip: "\\\\", comment: `-\\`)
 | 
			
		||||
  _seq("b", "a", end-tip: "/", comment: `-/`)
 | 
			
		||||
  _seq("b", "a", end-tip: "//", comment: `-//`)
 | 
			
		||||
  _seq("b", "a", end-tip: "x", comment: `->x`)
 | 
			
		||||
  _seq("b", "a", start-tip: "x", comment: `x->`)
 | 
			
		||||
  _seq("b", "a", start-tip: "o", comment: `o->`)
 | 
			
		||||
  _seq("b", "a", end-tip: ("o", ">"), comment: `->o`)
 | 
			
		||||
  _seq("b", "a", start-tip: "o", end-tip: ("o", ">"), comment: `o->o`)
 | 
			
		||||
  _seq("b", "a", start-tip: ">", end-tip: ">", comment: `<->`)
 | 
			
		||||
  _seq("b", "a", start-tip: ("o", ">"), end-tip: ("o", ">"), comment: `o<->o`)
 | 
			
		||||
  _seq("b", "a", start-tip: "x", end-tip: "x", comment: `x<->x`)
 | 
			
		||||
  _seq("b", "a", end-tip: ("o", ">>"), comment: `->>o`)
 | 
			
		||||
  _seq("b", "a", end-tip: ("o", "\\"), comment: `-\o`)
 | 
			
		||||
  _seq("b", "a", end-tip: ("o", "\\\\"), comment: `-\\o`)
 | 
			
		||||
  _seq("b", "a", end-tip: ("o", "/"), comment: `-/o`)
 | 
			
		||||
  _seq("b", "a", end-tip: ("o", "//"), comment: `-//o`)
 | 
			
		||||
  _seq("b", "a", start-tip: "x", end-tip: ("o", ">"), comment: `x->o`)
 | 
			
		||||
}),
 | 
			
		||||
 | 
			
		||||
chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
 | 
			
		||||
@@ -93,11 +121,11 @@ chronos.diagram({
 | 
			
		||||
  _seq("a", "a", end-tip: "x", comment: `->x`)
 | 
			
		||||
  _seq("a", "a", start-tip: "x", comment: `x->`)
 | 
			
		||||
  _seq("a", "a", start-tip: "o", comment: `o->`)
 | 
			
		||||
  _seq("a", "a", end-tip: "o", comment: `->o`)
 | 
			
		||||
  _seq("a", "a", start-tip: "o", end-tip: "o", comment: `o->o`)
 | 
			
		||||
  _seq("a", "a", end-tip: ("o", ">"), comment: `->o`)
 | 
			
		||||
  _seq("a", "a", start-tip: "o", end-tip: ("o", ">"), comment: `o->o`)
 | 
			
		||||
  _seq("a", "a", start-tip: ">", end-tip: ">", comment: `<->`)
 | 
			
		||||
  _seq("a", "a", start-tip: ("o", ">"), end-tip: ("o", ">"), comment: `o<->o`)
 | 
			
		||||
  _seq("a", "a", start-tip: ("x", ">"), end-tip: ("x", ">"), comment: `x<->x`)
 | 
			
		||||
  _seq("a", "a", start-tip: "x", end-tip: "x", comment: `x<->x`)
 | 
			
		||||
  _seq("a", "a", end-tip: ("o", ">>"), comment: `->>o`)
 | 
			
		||||
  _seq("a", "a", end-tip: ("o", "\\"), comment: `-\o`)
 | 
			
		||||
  _seq("a", "a", end-tip: ("o", "\\\\"), comment: `-\\o`)
 | 
			
		||||
@@ -106,3 +134,14 @@ chronos.diagram({
 | 
			
		||||
  _seq("a", "a", start-tip: "x", end-tip: ("o", ">"), comment: `x->o`)
 | 
			
		||||
})
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
 | 
			
		||||
  _par("a", display-name: "Alice")
 | 
			
		||||
  _par("b", display-name: "Bob", show-bottom: false)
 | 
			
		||||
  _par("c", display-name: "Caleb", show-top: false)
 | 
			
		||||
  _par("d", display-name: "Danny", show-bottom: false, show-top: false)
 | 
			
		||||
 | 
			
		||||
  _gap()
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								gallery/gitea.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gallery/gitea.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 17 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								gallery/notes.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gallery/notes.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										145
									
								
								gallery/notes.typ
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										145
									
								
								gallery/notes.typ
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,145 @@
 | 
			
		||||
#import "/src/lib.typ" as chronos: *
 | 
			
		||||
 | 
			
		||||
#set page(width: auto, height: auto)
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  _par("a", display-name: "Alice")
 | 
			
		||||
  _par("b", display-name: "Bob")
 | 
			
		||||
 | 
			
		||||
  _seq("a", "b", comment: [hello])
 | 
			
		||||
  _note("left", [this is a first note])
 | 
			
		||||
 | 
			
		||||
  _seq("b", "a", comment: [ok])
 | 
			
		||||
  _note("right", [this is another note])
 | 
			
		||||
 | 
			
		||||
  _seq("b", "b", comment: [I am thinking])
 | 
			
		||||
  _note("left", [a note\ can also be defined\ on several lines])
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
#pagebreak()
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  _par("a", display-name: "Alice")
 | 
			
		||||
  _par("b", display-name: "Bob")
 | 
			
		||||
 | 
			
		||||
  _note("left", [This is displayed\ left of Alice.], pos: "a", color: rgb("#00FFFF"))
 | 
			
		||||
  _note("right", [This is displayed right of Alice.], pos: "a")
 | 
			
		||||
  _note("over", [This is displayed over Alice.], pos: "a")
 | 
			
		||||
  _note("over", [This is displayed\ over Bob and Alice.], pos: ("a", "b"), color: rgb("#FFAAAA"))
 | 
			
		||||
  _note("over", [This is yet another\ example of\ a long note.], pos: ("a", "b"))
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
#pagebreak()
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  _par("caller")
 | 
			
		||||
  _par("server")
 | 
			
		||||
 | 
			
		||||
  _seq("caller", "server", comment: [conReq])
 | 
			
		||||
  _note("over", [idle], pos: "caller", shape: "hex")
 | 
			
		||||
  _seq("server", "caller", comment: [conConf])
 | 
			
		||||
  _note("over", ["r" as rectangle\ "h" as hexagon], pos: "server", shape: "rect")
 | 
			
		||||
  _note("over", [this is\ on several\ lines], pos: "server", shape: "rect")
 | 
			
		||||
  _note("over", [this is\ on several\ lines], pos: "caller", shape: "hex")
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
#pagebreak()
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  _par("a", display-name: "Alice")
 | 
			
		||||
  _par("b", display-name: "Bob")
 | 
			
		||||
  _par("c", display-name: "Charlie")
 | 
			
		||||
 | 
			
		||||
  _seq("a", "b", comment: [m1])
 | 
			
		||||
  _seq("b", "c", comment: [m2])
 | 
			
		||||
 | 
			
		||||
  _note("over", [Old method for note over all part. with:\ `note over FirstPart, LastPart`.], pos: ("a", "c"))
 | 
			
		||||
  _note("across", [New method with:\ `note across`.])
 | 
			
		||||
 | 
			
		||||
  _seq("b", "a")
 | 
			
		||||
 | 
			
		||||
  _note("across", [Note across all part.], shape: "hex")
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
#pagebreak()
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  _par("a", display-name: "Alice")
 | 
			
		||||
  _par("b", display-name: "Bob")
 | 
			
		||||
 | 
			
		||||
  _note("over", [initial state of Alice], pos: "a")
 | 
			
		||||
  _note("over", [initial state of Bob], pos: "b")
 | 
			
		||||
  _seq("b", "a", comment: [hello])
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  _par("a", display-name: "Alice")
 | 
			
		||||
  _par("b", display-name: "Bob")
 | 
			
		||||
  _par("c", display-name: "Charlie")
 | 
			
		||||
  _par("d", display-name: "Donald")
 | 
			
		||||
  _par("e", display-name: "Eddie")
 | 
			
		||||
 | 
			
		||||
  _note("over", [initial state of Alice], pos: "a")
 | 
			
		||||
  _note("over", [initial state of Bob the builder], pos: "b", aligned: true)
 | 
			
		||||
 | 
			
		||||
  _note("over", [Note 1], pos: "a")
 | 
			
		||||
  _note("over", [Note 2], pos: "b", aligned: true)
 | 
			
		||||
  _note("over", [Note 3], pos: "c", aligned: true)
 | 
			
		||||
 | 
			
		||||
  _seq("a", "d")
 | 
			
		||||
  _note("over", [this is an extremely long note], pos: ("d", "e"))
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
#pagebreak()
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  _par("a", display-name: [Alice])
 | 
			
		||||
  _par("b", display-name: [The *Famous* Bob])
 | 
			
		||||
 | 
			
		||||
  _seq("a", "b", comment: [hello #strike([there])])
 | 
			
		||||
 | 
			
		||||
  _gap()
 | 
			
		||||
  _seq("b", "a", comment: [ok])
 | 
			
		||||
  _note("left", [
 | 
			
		||||
    This is *bold*\
 | 
			
		||||
    This is _italics_\
 | 
			
		||||
    This is `monospaced`\
 | 
			
		||||
    This is #strike([stroked])\
 | 
			
		||||
    This is #underline([underlined])\
 | 
			
		||||
    This is #underline([waved])\
 | 
			
		||||
  ])
 | 
			
		||||
 | 
			
		||||
  _seq("a", "b", comment: [A _well formatted_ message])
 | 
			
		||||
  _note("right", [
 | 
			
		||||
    This is #box(text([displayed], size: 18pt), fill: rgb("#5F9EA0"))\
 | 
			
		||||
    #underline([left of]) Alice.
 | 
			
		||||
  ], pos: "a")
 | 
			
		||||
  _note("left", [
 | 
			
		||||
    #underline([This], stroke: red) is #text([displayed], fill: rgb("#118888"))\
 | 
			
		||||
    *#text([left of], fill: rgb("#800080")) #strike([Alice], stroke: red) Bob.*
 | 
			
		||||
  ], pos: "b")
 | 
			
		||||
  _note("over", [
 | 
			
		||||
    #underline([This is hosted], stroke: rgb("#FF33FF")) by #box(baseline: 50%, image("gitea.png", width: 1cm, height: 1cm, fit: "contain"))
 | 
			
		||||
  ], pos: ("a", "b"))
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
// TODO
 | 
			
		||||
/*
 | 
			
		||||
#pagebreak()
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  _par("a", display-name: [Alice])
 | 
			
		||||
  _par("b", display-name: [Bob])
 | 
			
		||||
 | 
			
		||||
  _seq("a", "b", comment: [Hello])
 | 
			
		||||
  _note("left", [This is a note])
 | 
			
		||||
 | 
			
		||||
  _seq("[", "a", comment: [Test])
 | 
			
		||||
  _note("left", [This is also a note])
 | 
			
		||||
})*/
 | 
			
		||||
 | 
			
		||||
#pagebreak()
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  _seq("Bob", "Alice", comment: [Hello])
 | 
			
		||||
  _evt("Other", "create")
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								gallery/readme/boilerplate.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gallery/readme/boilerplate.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								gallery/readme/boilerplate.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gallery/readme/boilerplate.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 13 KiB  | 
							
								
								
									
										13
									
								
								gallery/readme/boilerplate.typ
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								gallery/readme/boilerplate.typ
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,13 @@
 | 
			
		||||
#import "/src/lib.typ" as chronos
 | 
			
		||||
 | 
			
		||||
#set page(
 | 
			
		||||
  width: auto,
 | 
			
		||||
  height: auto,
 | 
			
		||||
  margin: 0.5cm
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
  _par("Alice")
 | 
			
		||||
  _par("Bob")
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								gallery/readme/lifelines.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gallery/readme/lifelines.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								gallery/readme/lifelines.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gallery/readme/lifelines.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 96 KiB  | 
							
								
								
									
										24
									
								
								gallery/readme/lifelines.typ
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								gallery/readme/lifelines.typ
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,24 @@
 | 
			
		||||
#import "/src/lib.typ" as chronos
 | 
			
		||||
 | 
			
		||||
#set page(
 | 
			
		||||
  width: auto,
 | 
			
		||||
  height: auto,
 | 
			
		||||
  margin: 0.5cm
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
  _par("A", display-name: "Alice")
 | 
			
		||||
  _par("B", display-name: "Bob")
 | 
			
		||||
  _par("C", display-name: "Charlie")
 | 
			
		||||
  _par("D", display-name: "Derek")
 | 
			
		||||
 | 
			
		||||
  _seq("A", "B", comment: "hello", enable-dst: true)
 | 
			
		||||
  _seq("B", "B", comment: "self call", enable-dst: true)
 | 
			
		||||
  _seq("C", "B", comment: "hello from thread 2", enable-dst: true, lifeline-style: (fill: rgb("#005500")))
 | 
			
		||||
  _seq("B", "D", comment: "create", create-dst: true)
 | 
			
		||||
  _seq("B", "C", comment: "done in thread 2", disable-src: true, dashed: true)
 | 
			
		||||
  _seq("B", "B", comment: "rc", disable-src: true, dashed: true)
 | 
			
		||||
  _seq("B", "D", comment: "delete", destroy-dst: true)
 | 
			
		||||
  _seq("B", "A", comment: "success", disable-src: true, dashed: true)
 | 
			
		||||
})
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								gallery/readme/simple_sequence.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gallery/readme/simple_sequence.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								gallery/readme/simple_sequence.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gallery/readme/simple_sequence.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 24 KiB  | 
							
								
								
									
										17
									
								
								gallery/readme/simple_sequence.typ
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								gallery/readme/simple_sequence.typ
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,17 @@
 | 
			
		||||
#import "/src/lib.typ" as chronos
 | 
			
		||||
 | 
			
		||||
#set page(
 | 
			
		||||
  width: auto,
 | 
			
		||||
  height: auto,
 | 
			
		||||
  margin: 0.5cm
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
#chronos.diagram({
 | 
			
		||||
  import chronos: *
 | 
			
		||||
  _par("Alice")
 | 
			
		||||
  _par("Bob")
 | 
			
		||||
 | 
			
		||||
  _seq("Alice", "Bob", comment: "Hello")
 | 
			
		||||
  _seq("Bob", "Bob", comment: "Think")
 | 
			
		||||
  _seq("Bob", "Alice", comment: "Hi")
 | 
			
		||||
})
 | 
			
		||||
@@ -2,6 +2,10 @@
 | 
			
		||||
#let PAR-SPACE = 10
 | 
			
		||||
#let COMMENT-PAD = 8
 | 
			
		||||
#let LIFELINE-W = 10
 | 
			
		||||
#let CREATE-OFFSET = 15
 | 
			
		||||
#let DEFAULT-SLANT = 10
 | 
			
		||||
#let CROSS-TIP-SIZE = 4
 | 
			
		||||
#let CIRCLE-TIP-RADIUS = 3
 | 
			
		||||
 | 
			
		||||
#let SYM-GAP = 5
 | 
			
		||||
#let PAR-PAD = (5pt, 3pt)
 | 
			
		||||
@@ -15,6 +19,12 @@
 | 
			
		||||
#let COLLECTIONS-DY = 3
 | 
			
		||||
#let QUEUE-PAD = (5pt, 3pt)
 | 
			
		||||
 | 
			
		||||
#let NOTE-PAD = (6, 3)
 | 
			
		||||
#let NOTE-CORNER-SIZE = 6
 | 
			
		||||
#let NOTE-GAP = 3
 | 
			
		||||
#let NOTE-HEX-PAD = (6, 8)
 | 
			
		||||
 | 
			
		||||
#let COL-DESTRUCTION = rgb("#A80238")
 | 
			
		||||
#let COL-GRP-NAME = rgb("#EEEEEE")
 | 
			
		||||
#let COL-SEP-NAME = rgb("#EEEEEE")
 | 
			
		||||
#let COL-NOTE = rgb("#FEFFDD")
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
#import "utils.typ": get-group-span
 | 
			
		||||
#import "utils.typ": get-group-span, fit-canvas
 | 
			
		||||
#import "renderer.typ": render
 | 
			
		||||
#import "participant.typ" as participant: _par, PAR-SPECIALS
 | 
			
		||||
 | 
			
		||||
@@ -18,7 +18,7 @@
 | 
			
		||||
  ),)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let diagram(elements) = {
 | 
			
		||||
#let diagram(elements, width: auto) = {
 | 
			
		||||
  if elements == none {
 | 
			
		||||
    return
 | 
			
		||||
  }
 | 
			
		||||
@@ -57,7 +57,9 @@
 | 
			
		||||
 | 
			
		||||
  // List participants
 | 
			
		||||
  let linked = ()
 | 
			
		||||
  for elmt in elmts {
 | 
			
		||||
  let last-seq = none
 | 
			
		||||
  let last-note = none
 | 
			
		||||
  for (i, elmt) in elmts.enumerate() {
 | 
			
		||||
    if elmt.type == "par" {
 | 
			
		||||
      participants.push(elmt)
 | 
			
		||||
    } else if elmt.type == "seq" {
 | 
			
		||||
@@ -73,15 +75,63 @@
 | 
			
		||||
        participants.at(i).from-start = false
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      let p1 = elmt.p1
 | 
			
		||||
      let p2 = elmt.p2
 | 
			
		||||
      if elmt.p1 == "?" {
 | 
			
		||||
        linked.push("?" + elmt.p2)
 | 
			
		||||
      } else {
 | 
			
		||||
        linked.push(elmt.p1)
 | 
			
		||||
        p1 = "?" + elmt.p2
 | 
			
		||||
      }
 | 
			
		||||
      if elmt.p2 == "?" {
 | 
			
		||||
        linked.push(elmt.p1 + "?")
 | 
			
		||||
      } else {
 | 
			
		||||
        linked.push(elmt.p2)
 | 
			
		||||
        p2 = elmt.p1 + "?"
 | 
			
		||||
      }
 | 
			
		||||
      linked.push(p1)
 | 
			
		||||
      linked.push(p2)
 | 
			
		||||
      last-seq = (
 | 
			
		||||
        elmt: elmt,
 | 
			
		||||
        i: i,
 | 
			
		||||
        p1: p1,
 | 
			
		||||
        p2: p2
 | 
			
		||||
      )
 | 
			
		||||
    } else if elmt.type == "note" {
 | 
			
		||||
      elmt.insert("linked", elmt.pos == none and elmt.side != "across")
 | 
			
		||||
      if elmt.pos == none and elmt.side != "across" {
 | 
			
		||||
        let names = participants.map(p => p.name)
 | 
			
		||||
        let i1 = names.position(n => n == last-seq.p1)
 | 
			
		||||
        let i2 = names.position(n => n == last-seq.p2)
 | 
			
		||||
        let pars = ((i1, last-seq.p1), (i2, last-seq.p2)).sorted(key: p => p.first())
 | 
			
		||||
        if elmt.side == "left" {
 | 
			
		||||
          elmt.pos = pars.first().last()
 | 
			
		||||
        } else if elmt.side == "right" {
 | 
			
		||||
          elmt.pos = pars.last().last()
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        let seq = last-seq.elmt
 | 
			
		||||
        seq.insert("linked-note", elmt)
 | 
			
		||||
        elmts.at(last-seq.i) = seq
 | 
			
		||||
      }
 | 
			
		||||
      if elmt.aligned {
 | 
			
		||||
        let n = last-note.elmt
 | 
			
		||||
        n.aligned-with = elmt
 | 
			
		||||
        elmts.at(last-note.i) = n
 | 
			
		||||
      }
 | 
			
		||||
      elmts.at(i) = elmt
 | 
			
		||||
      if elmt.side == "left" {
 | 
			
		||||
        linked.push("[")
 | 
			
		||||
      } else if elmt.side == "right" {
 | 
			
		||||
        linked.push("]")
 | 
			
		||||
      }
 | 
			
		||||
      last-note = (
 | 
			
		||||
        elmt: elmt,
 | 
			
		||||
        i: i
 | 
			
		||||
      )
 | 
			
		||||
    } else if elmt.type == "evt" {
 | 
			
		||||
      let par = elmt.participant
 | 
			
		||||
      if not participant._exists(participants, par) {
 | 
			
		||||
        let p = _par(par, from-start: elmt.event != "create").first()
 | 
			
		||||
        participants.push(p)
 | 
			
		||||
      
 | 
			
		||||
      } else if elmt.event == "create" {
 | 
			
		||||
        let i = participants.position(p => p.name == par)
 | 
			
		||||
        participants.at(i).from-start = false
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
@@ -137,7 +187,9 @@
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  render(participants, elmts)
 | 
			
		||||
  set text(font: "Source Sans 3")
 | 
			
		||||
  let canvas = render(participants, elmts)
 | 
			
		||||
  fit-canvas(canvas, width: width)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let from-plantuml(code) = {
 | 
			
		||||
 
 | 
			
		||||
@@ -44,7 +44,7 @@
 | 
			
		||||
  if group.desc != none {
 | 
			
		||||
    shapes += draw.content(
 | 
			
		||||
      (x0 + w, y0),
 | 
			
		||||
      text([\[#group.desc\]], weight: "bold"),
 | 
			
		||||
      text([\[#group.desc\]], weight: "bold", size: .8em),
 | 
			
		||||
      anchor: "north-west",
 | 
			
		||||
      padding: 3pt
 | 
			
		||||
    )
 | 
			
		||||
 
 | 
			
		||||
@@ -4,3 +4,5 @@
 | 
			
		||||
#import "group.typ": _grp
 | 
			
		||||
#import "participant.typ": _par
 | 
			
		||||
#import "separator.typ": _sep
 | 
			
		||||
#import "note.typ": _note
 | 
			
		||||
#import "sync.typ": _sync
 | 
			
		||||
							
								
								
									
										182
									
								
								src/note.typ
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										182
									
								
								src/note.typ
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,182 @@
 | 
			
		||||
#import "@preview/cetz:0.2.2": draw
 | 
			
		||||
#import "consts.typ": *
 | 
			
		||||
 | 
			
		||||
#let SIDES = (
 | 
			
		||||
  "left",
 | 
			
		||||
  "right",
 | 
			
		||||
  "over",
 | 
			
		||||
  "across"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
#let SHAPES = (
 | 
			
		||||
  "default",
 | 
			
		||||
  "rect",
 | 
			
		||||
  "hex"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
#let _note(side, content, pos: none, color: COL-NOTE, shape: "default", aligned: false) = {
 | 
			
		||||
  if side == "over" {
 | 
			
		||||
    if pos == none {
 | 
			
		||||
      panic("Pos cannot be none with side 'over'")
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  if aligned {
 | 
			
		||||
    if side != "over" {
 | 
			
		||||
      panic("Aligned notes can only be over a participant (got side '" + side + "')")
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  return ((
 | 
			
		||||
    type: "note",
 | 
			
		||||
    side: side,
 | 
			
		||||
    content: content,
 | 
			
		||||
    pos: pos,
 | 
			
		||||
    color: color,
 | 
			
		||||
    shape: shape,
 | 
			
		||||
    aligned: aligned,
 | 
			
		||||
    aligned-with: none
 | 
			
		||||
  ),)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let get-note-box(note) = {
 | 
			
		||||
  let PAD = if note.shape == "hex" {NOTE-HEX-PAD} else {NOTE-PAD}
 | 
			
		||||
  let inset = (
 | 
			
		||||
    left: PAD.last() * 1pt,
 | 
			
		||||
    right: PAD.last() * 1pt,
 | 
			
		||||
    top: PAD.first() * 1pt,
 | 
			
		||||
    bottom: PAD.first() * 1pt,
 | 
			
		||||
  )
 | 
			
		||||
  if note.shape == "default" {
 | 
			
		||||
    inset.right += NOTE-CORNER-SIZE * 1pt
 | 
			
		||||
  }
 | 
			
		||||
  if note.side == "left" {
 | 
			
		||||
    inset.right += NOTE-GAP * 1pt
 | 
			
		||||
  } else if note.side == "right" {
 | 
			
		||||
    inset.left += NOTE-GAP * 1pt
 | 
			
		||||
  }
 | 
			
		||||
  return box(note.content, inset: inset)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let get-size(note) = {
 | 
			
		||||
  let PAD = if note.shape == "hex" {NOTE-HEX-PAD} else {NOTE-PAD}
 | 
			
		||||
  let m = measure(box(note.content))
 | 
			
		||||
  let w = m.width / 1pt + PAD.last() * 2
 | 
			
		||||
  let h = m.height / 1pt + PAD.first() * 2
 | 
			
		||||
  if note.shape == "default" {
 | 
			
		||||
    w += NOTE-CORNER-SIZE
 | 
			
		||||
  }
 | 
			
		||||
  return (
 | 
			
		||||
    width: w,
 | 
			
		||||
    height: h
 | 
			
		||||
  )
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let _get-base-x(pars-i, x-pos, note) = {
 | 
			
		||||
  if note.side == "across" {
 | 
			
		||||
    return (x-pos.first() + x-pos.last()) / 2
 | 
			
		||||
  }
 | 
			
		||||
  if note.side == "over" {
 | 
			
		||||
    if type(note.pos) == array {
 | 
			
		||||
      let xs = note.pos.map(par => x-pos.at(pars-i.at(par)))
 | 
			
		||||
      return (calc.min(..xs) + calc.max(..xs)) / 2
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  return x-pos.at(pars-i.at(note.pos))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let render(pars-i, x-pos, note, y, lifelines) = {
 | 
			
		||||
  let shapes = ()
 | 
			
		||||
  let PAD = if note.shape == "hex" {NOTE-HEX-PAD} else {NOTE-PAD}
 | 
			
		||||
  let m = measure(box(note.content))
 | 
			
		||||
  let w = m.width / 1pt + PAD.last() * 2
 | 
			
		||||
  let h = m.height / 1pt + PAD.first() * 2
 | 
			
		||||
  let total-w = w
 | 
			
		||||
  if note.shape == "default" {
 | 
			
		||||
    total-w += NOTE-CORNER-SIZE
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let base-x = _get-base-x(pars-i, x-pos, note)
 | 
			
		||||
 | 
			
		||||
  let i = none
 | 
			
		||||
  if note.pos != none and type(note.pos) == str {
 | 
			
		||||
    i = pars-i.at(note.pos)
 | 
			
		||||
  }
 | 
			
		||||
  let x0 = base-x
 | 
			
		||||
  if note.side == "left" {
 | 
			
		||||
    x0 -= NOTE-GAP
 | 
			
		||||
    x0 -= total-w
 | 
			
		||||
    if lifelines.at(i).level != 0 {
 | 
			
		||||
      x0 -= LIFELINE-W / 2
 | 
			
		||||
    }
 | 
			
		||||
  } else if note.side == "right" {
 | 
			
		||||
    x0 += NOTE-GAP
 | 
			
		||||
    x0 += lifelines.at(i).level * LIFELINE-W / 2
 | 
			
		||||
  } else if note.side == "over" or note.side == "across" {
 | 
			
		||||
    x0 -= total-w / 2
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let x1 = x0 + w
 | 
			
		||||
  let x2 = x0 + total-w
 | 
			
		||||
  let y0 = y
 | 
			
		||||
 | 
			
		||||
  if note.linked {
 | 
			
		||||
    y0 += h / 2
 | 
			
		||||
  }
 | 
			
		||||
  let y1 = y0 - h
 | 
			
		||||
 | 
			
		||||
  if note.shape == "default" {
 | 
			
		||||
    shapes += draw.merge-path(
 | 
			
		||||
      stroke: black + .5pt,
 | 
			
		||||
      fill: note.color,
 | 
			
		||||
      close: true,
 | 
			
		||||
      {
 | 
			
		||||
        draw.line(
 | 
			
		||||
          (x0, y0),
 | 
			
		||||
          (x1, y0),
 | 
			
		||||
          (x2, y0 - NOTE-CORNER-SIZE),
 | 
			
		||||
          (x2, y1),
 | 
			
		||||
          (x0, y1)
 | 
			
		||||
        )
 | 
			
		||||
      }
 | 
			
		||||
    )
 | 
			
		||||
    shapes += draw.line((x1, y0), (x1, y0 - NOTE-CORNER-SIZE), (x2, y0 - NOTE-CORNER-SIZE), stroke: black + .5pt)
 | 
			
		||||
  } else if note.shape == "rect" {
 | 
			
		||||
    shapes += draw.rect(
 | 
			
		||||
      (x0, y0),
 | 
			
		||||
      (x2, y1),
 | 
			
		||||
      stroke: black + .5pt,
 | 
			
		||||
      fill: note.color
 | 
			
		||||
    )
 | 
			
		||||
  } else if note.shape == "hex" {
 | 
			
		||||
    let lx = x0 + PAD.last()
 | 
			
		||||
    let rx = x2 - PAD.last()
 | 
			
		||||
    let my = (y0 + y1) / 2
 | 
			
		||||
    shapes += draw.merge-path(
 | 
			
		||||
      stroke: black + .5pt,
 | 
			
		||||
      fill: note.color,
 | 
			
		||||
      close: true,
 | 
			
		||||
      {
 | 
			
		||||
        draw.line(
 | 
			
		||||
          (lx, y0),
 | 
			
		||||
          (rx, y0),
 | 
			
		||||
          (x2, my),
 | 
			
		||||
          (rx, y1),
 | 
			
		||||
          (lx, y1),
 | 
			
		||||
          (x0, my),
 | 
			
		||||
        )
 | 
			
		||||
      }
 | 
			
		||||
    )
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  shapes += draw.content(
 | 
			
		||||
    ((x0 + x1)/2, (y0 + y1)/2),
 | 
			
		||||
    note.content,
 | 
			
		||||
    anchor: "center"
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  if note.aligned-with == none and (note.pos != none or note.side == "across") {
 | 
			
		||||
    y -= h
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let r = (y, shapes)
 | 
			
		||||
  return r
 | 
			
		||||
}
 | 
			
		||||
@@ -21,7 +21,9 @@
 | 
			
		||||
  invisible: false,
 | 
			
		||||
  shape: "participant",
 | 
			
		||||
  color: rgb("#E2E2F0"),
 | 
			
		||||
  custom-image: none
 | 
			
		||||
  custom-image: none,
 | 
			
		||||
  show-bottom: true,
 | 
			
		||||
  show-top: true,
 | 
			
		||||
) = {
 | 
			
		||||
  return ((
 | 
			
		||||
    type: "par",
 | 
			
		||||
@@ -31,7 +33,9 @@
 | 
			
		||||
    invisible: invisible,
 | 
			
		||||
    shape: shape,
 | 
			
		||||
    color: color,
 | 
			
		||||
    custom-image: custom-image
 | 
			
		||||
    custom-image: custom-image,
 | 
			
		||||
    show-bottom: show-bottom,
 | 
			
		||||
    show-top: show-top
 | 
			
		||||
  ),)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										108
									
								
								src/renderer.typ
									
									
									
									
									
								
							
							
						
						
									
										108
									
								
								src/renderer.typ
									
									
									
									
									
								
							@@ -5,7 +5,9 @@
 | 
			
		||||
#import participant: PAR-SPECIALS
 | 
			
		||||
#import "sequence.typ"
 | 
			
		||||
#import "separator.typ"
 | 
			
		||||
#import "sync.typ"
 | 
			
		||||
#import "consts.typ": *
 | 
			
		||||
#import "note.typ" as note: get-note-box
 | 
			
		||||
 | 
			
		||||
#let DEBUG-INVISIBLE = false
 | 
			
		||||
 | 
			
		||||
@@ -18,6 +20,16 @@
 | 
			
		||||
  let pars-i = get-participants-i(participants)
 | 
			
		||||
  let cells = ()
 | 
			
		||||
 | 
			
		||||
  // Unwrap syncs
 | 
			
		||||
  let i = 0
 | 
			
		||||
  while i < elements.len() {
 | 
			
		||||
    let elmt = elements.at(i)
 | 
			
		||||
    if elmt.type == "sync" {
 | 
			
		||||
      elements = elements.slice(0, i + 1) + elmt.elmts + elements.slice(i + 1)
 | 
			
		||||
    }
 | 
			
		||||
    i += 1
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // Compute max lifeline levels
 | 
			
		||||
  for elmt in elements {
 | 
			
		||||
    if elmt.type == "seq" {
 | 
			
		||||
@@ -61,6 +73,42 @@
 | 
			
		||||
        par.max-lifelines = calc.max(par.max-lifelines, par.lifeline-lvl)
 | 
			
		||||
      }
 | 
			
		||||
      participants.at(i) = par
 | 
			
		||||
    
 | 
			
		||||
    } else if elmt.type == "note" {
 | 
			
		||||
      let (p1, p2) = (none, none)
 | 
			
		||||
      let cell = none
 | 
			
		||||
      if elmt.side == "left" {
 | 
			
		||||
        p1 = "["
 | 
			
		||||
        p2 = elmt.pos
 | 
			
		||||
        cell = get-note-box(elmt)
 | 
			
		||||
      } else if elmt.side == "right" {
 | 
			
		||||
        p1 = elmt.pos
 | 
			
		||||
        p2 = "]"
 | 
			
		||||
        cell = get-note-box(elmt)
 | 
			
		||||
      } else if elmt.side == "over" {
 | 
			
		||||
        if elmt.aligned-with != none {
 | 
			
		||||
          let box1 = get-note-box(elmt)
 | 
			
		||||
          let box2 = get-note-box(elmt.aligned-with)
 | 
			
		||||
          let m1 = measure(box1)
 | 
			
		||||
          let m2 = measure(box2)
 | 
			
		||||
          cell = box(width: (m1.width + m2.width) / 2, height: calc.max(m1.height, m2.height))
 | 
			
		||||
          p1 = elmt.pos
 | 
			
		||||
          p2 = elmt.aligned-with.pos
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      if p1 != none and p2 != none and cell != none {
 | 
			
		||||
        let i1 = pars-i.at(p1)
 | 
			
		||||
        let i2 = pars-i.at(p2)
 | 
			
		||||
        cells.push(
 | 
			
		||||
          (
 | 
			
		||||
            elmt: elmt,
 | 
			
		||||
            i1: calc.min(i1, i2),
 | 
			
		||||
            i2: calc.max(i1, i2),
 | 
			
		||||
            cell: cell
 | 
			
		||||
          )
 | 
			
		||||
        )
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -77,6 +125,28 @@
 | 
			
		||||
    widths.push(w1 / 2pt + w2 / 2pt + PAR-SPACE)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // Compute minimum width for over notes
 | 
			
		||||
  for n in elements.filter(e => (e.type == "note" and
 | 
			
		||||
                                 e.side == "over" and 
 | 
			
		||||
                                 type(e.pos) == str)) {
 | 
			
		||||
    
 | 
			
		||||
    let m = note.get-size(n)
 | 
			
		||||
    let i = pars-i.at(n.pos)
 | 
			
		||||
 | 
			
		||||
    if i < widths.len() {
 | 
			
		||||
      widths.at(i) = calc.max(
 | 
			
		||||
        widths.at(i),
 | 
			
		||||
        m.width / 2 + NOTE-GAP
 | 
			
		||||
      )
 | 
			
		||||
    }
 | 
			
		||||
    if i > 0 {
 | 
			
		||||
      widths.at(i - 1) = calc.max(
 | 
			
		||||
        widths.at(i - 1),
 | 
			
		||||
        m.width / 2 + NOTE-GAP
 | 
			
		||||
      )
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // Compute minimum width for simple sequences (spanning 1 column)
 | 
			
		||||
  for cell in cells.filter(c => c.i2 - c.i1 == 1) {
 | 
			
		||||
    let m = measure(cell.cell)
 | 
			
		||||
@@ -87,7 +157,7 @@
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // Compute minimum width for self sequences
 | 
			
		||||
  for cell in cells.filter(c => c.i1 == c.i2) {
 | 
			
		||||
  for cell in cells.filter(c => c.elmt.type == "seq" and c.i1 == c.i2) {
 | 
			
		||||
    let m = measure(cell.cell)
 | 
			
		||||
    let i = cell.i1
 | 
			
		||||
    if cell.elmt.flip {
 | 
			
		||||
@@ -143,10 +213,12 @@
 | 
			
		||||
  let draw-group = group.render.with()
 | 
			
		||||
  let draw-sep = separator.render.with(x-pos)
 | 
			
		||||
  let draw-par = participant.render.with(x-pos)
 | 
			
		||||
  let draw-note = note.render.with(pars-i, x-pos)
 | 
			
		||||
  let draw-sync = sync.render.with(pars-i, x-pos, participants)
 | 
			
		||||
  
 | 
			
		||||
  // Draw participants (start)
 | 
			
		||||
  for p in participants {
 | 
			
		||||
    if p.from-start and not p.invisible {
 | 
			
		||||
    if p.from-start and not p.invisible and p.show-top {
 | 
			
		||||
      shapes += draw-par(p)
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
@@ -219,10 +291,28 @@
 | 
			
		||||
        line.lines.push(("enable", y, elmt.lifeline-style))
 | 
			
		||||
      
 | 
			
		||||
      } else if elmt.event == "create" {
 | 
			
		||||
        y -= CREATE-OFFSET
 | 
			
		||||
        shapes += participant.render(x-pos, par, y: y)
 | 
			
		||||
        line.lines.push(("create", y))
 | 
			
		||||
      }
 | 
			
		||||
      lifelines.at(i) = line
 | 
			
		||||
    
 | 
			
		||||
    // Note
 | 
			
		||||
    } else if elmt.type == "note" {
 | 
			
		||||
      if not elmt.linked {
 | 
			
		||||
        if not elmt.aligned {
 | 
			
		||||
          y -= Y-SPACE
 | 
			
		||||
        }
 | 
			
		||||
        let shps
 | 
			
		||||
        (y, shps) = draw-note(elmt, y, lifelines)
 | 
			
		||||
        shapes += shps
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
    // Synched sequences
 | 
			
		||||
    } else if elmt.type == "sync" {
 | 
			
		||||
      let shps
 | 
			
		||||
      (y, lifelines, shps) = draw-sync(elmt, y, lifelines)
 | 
			
		||||
      shapes += shps
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -269,7 +359,11 @@
 | 
			
		||||
            draw.line(
 | 
			
		||||
              (x, last-y),
 | 
			
		||||
              (x, line.at(1)),
 | 
			
		||||
              stroke: (dash: "dashed", paint: gray.darken(40%))
 | 
			
		||||
              stroke: (
 | 
			
		||||
                dash: "dashed",
 | 
			
		||||
                paint: gray.darken(40%),
 | 
			
		||||
                thickness: .5pt
 | 
			
		||||
              )
 | 
			
		||||
            )
 | 
			
		||||
          }
 | 
			
		||||
          lines.push(line)
 | 
			
		||||
@@ -297,7 +391,11 @@
 | 
			
		||||
      draw.line(
 | 
			
		||||
        (x, last-y),
 | 
			
		||||
        (x, y),
 | 
			
		||||
        stroke: (dash: "dashed", paint: gray.darken(40%))
 | 
			
		||||
        stroke: (
 | 
			
		||||
          dash: "dashed",
 | 
			
		||||
          paint: gray.darken(40%),
 | 
			
		||||
          thickness: .5pt
 | 
			
		||||
        )
 | 
			
		||||
      )
 | 
			
		||||
 | 
			
		||||
      // Draw lifeline rectangles (reverse for bottom to top)
 | 
			
		||||
@@ -319,8 +417,10 @@
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      // Draw participants (end)
 | 
			
		||||
      if p.show-bottom {
 | 
			
		||||
        draw-par(p, y: y, bottom: true)
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  shapes
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										237
									
								
								src/sequence.typ
									
									
									
									
									
								
							
							
						
						
									
										237
									
								
								src/sequence.typ
									
									
									
									
									
								
							@@ -1,6 +1,7 @@
 | 
			
		||||
#import "@preview/cetz:0.2.2": draw
 | 
			
		||||
#import "@preview/cetz:0.2.2": draw, vector
 | 
			
		||||
#import "consts.typ": *
 | 
			
		||||
#import "participant.typ"
 | 
			
		||||
#import "note.typ"
 | 
			
		||||
 | 
			
		||||
#let get-arrow-marks(sym, color) = {
 | 
			
		||||
  if type(sym) == array {
 | 
			
		||||
@@ -15,14 +16,39 @@
 | 
			
		||||
    "/": (symbol: ">", fill: color, harpoon: true),
 | 
			
		||||
    "//": (symbol: "straight", harpoon: true),
 | 
			
		||||
    "x": none,
 | 
			
		||||
    "o": (symbol: "o"),
 | 
			
		||||
    "o": none,
 | 
			
		||||
  ).at(sym)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let reverse-arrow-mark(mark) = {
 | 
			
		||||
  if type(mark) == array {
 | 
			
		||||
    return mark.map(m => reverse-arrow-mark(m))
 | 
			
		||||
  }
 | 
			
		||||
  let mark2 = mark
 | 
			
		||||
  if type(mark) == dictionary and mark.at("harpoon", default: false) {
 | 
			
		||||
    let flipped = mark.at("flip", default: false)
 | 
			
		||||
    mark2.insert("flip", not flipped)
 | 
			
		||||
  }
 | 
			
		||||
  return mark2
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let is-tip-of-type(type_, tip) = {
 | 
			
		||||
  if type(tip) == str and tip == type_ {
 | 
			
		||||
    return true
 | 
			
		||||
  }
 | 
			
		||||
  if type(tip) == array and tip.contains(type_) {
 | 
			
		||||
    return true
 | 
			
		||||
  }
 | 
			
		||||
  return false
 | 
			
		||||
}
 | 
			
		||||
#let is-circle-tip = is-tip-of-type.with("o")
 | 
			
		||||
#let is-cross-tip = is-tip-of-type.with("x")
 | 
			
		||||
 | 
			
		||||
#let _seq(
 | 
			
		||||
  p1,
 | 
			
		||||
  p2,
 | 
			
		||||
  comment: none,
 | 
			
		||||
  comment-align: "left",
 | 
			
		||||
  dashed: false,
 | 
			
		||||
  start-tip: "",
 | 
			
		||||
  end-tip: ">",
 | 
			
		||||
@@ -34,13 +60,15 @@
 | 
			
		||||
  destroy-dst: false,
 | 
			
		||||
  disable-src: false,
 | 
			
		||||
  destroy-src: false,
 | 
			
		||||
  lifeline-style: auto
 | 
			
		||||
  lifeline-style: auto,
 | 
			
		||||
  slant: none
 | 
			
		||||
) = {
 | 
			
		||||
  return ((
 | 
			
		||||
    type: "seq",
 | 
			
		||||
    p1: p1,
 | 
			
		||||
    p2: p2,
 | 
			
		||||
    comment: comment,
 | 
			
		||||
    comment-align: comment-align,
 | 
			
		||||
    dashed: dashed,
 | 
			
		||||
    start-tip: start-tip,
 | 
			
		||||
    end-tip: end-tip,
 | 
			
		||||
@@ -53,6 +81,7 @@
 | 
			
		||||
    disable-src: disable-src,
 | 
			
		||||
    destroy-src: destroy-src,
 | 
			
		||||
    lifeline-style: lifeline-style,
 | 
			
		||||
    slant: slant
 | 
			
		||||
  ),)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -61,10 +90,15 @@
 | 
			
		||||
 | 
			
		||||
  y -= Y-SPACE
 | 
			
		||||
 | 
			
		||||
  let h = 0
 | 
			
		||||
  // Reserve space for comment
 | 
			
		||||
  if elmt.comment != none {
 | 
			
		||||
    y -= measure(box(elmt.comment)).height / 1pt + 6
 | 
			
		||||
    h = calc.max(h, measure(box(elmt.comment)).height / 1pt + 6)
 | 
			
		||||
  }
 | 
			
		||||
  if "linked-note" in elmt {
 | 
			
		||||
    h = calc.max(h, note.get-size(elmt.linked-note).height / 2)
 | 
			
		||||
  }
 | 
			
		||||
  y -= h
 | 
			
		||||
 | 
			
		||||
  let i1 = pars-i.at(elmt.p1)
 | 
			
		||||
  let i2 = pars-i.at(elmt.p2)
 | 
			
		||||
@@ -81,27 +115,38 @@
 | 
			
		||||
    y: y,
 | 
			
		||||
    ll-lvl: lifelines.at(i2).level * LIFELINE-W / 2
 | 
			
		||||
  )
 | 
			
		||||
  let slant = if elmt.slant == auto {
 | 
			
		||||
    DEFAULT-SLANT
 | 
			
		||||
  } else if elmt.slant != none {
 | 
			
		||||
    elmt.slant
 | 
			
		||||
  } else {
 | 
			
		||||
    0
 | 
			
		||||
  }
 | 
			
		||||
  end-info.y -= slant
 | 
			
		||||
  if elmt.p1 == elmt.p2 {
 | 
			
		||||
    end-info.y -= 10
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  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", start-info.y))
 | 
			
		||||
    lifelines.at(i1) = src-line
 | 
			
		||||
  }
 | 
			
		||||
  if elmt.destroy-src {
 | 
			
		||||
    let src-line = lifelines.at(i1)
 | 
			
		||||
    src-line.lines.push(("destroy", y))
 | 
			
		||||
    src-line.lines.push(("destroy", start-info.y))
 | 
			
		||||
    lifelines.at(i1) = src-line
 | 
			
		||||
  }
 | 
			
		||||
  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", end-info.y))
 | 
			
		||||
    lifelines.at(i2) = dst-line
 | 
			
		||||
  }
 | 
			
		||||
  if elmt.destroy-dst {
 | 
			
		||||
    let dst-line = lifelines.at(i2)
 | 
			
		||||
    dst-line.lines.push(("destroy", y))
 | 
			
		||||
    dst-line.lines.push(("destroy", end-info.y))
 | 
			
		||||
    lifelines.at(i2) = dst-line
 | 
			
		||||
  }
 | 
			
		||||
  if elmt.enable-dst {
 | 
			
		||||
@@ -114,7 +159,7 @@
 | 
			
		||||
    let m = measure(box(par.display-name))
 | 
			
		||||
    let f = if i1 > i2 {-1} else {1}
 | 
			
		||||
    end-info.x -= (m.width + PAR-PAD.last() * 2) / 2pt * f
 | 
			
		||||
    shapes += participant.render(x-pos, par, y: y)
 | 
			
		||||
    shapes += participant.render(x-pos, par, y: end-info.y - CREATE-OFFSET)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  end-info.ll-lvl = lifelines.at(i2).level * LIFELINE-W / 2
 | 
			
		||||
@@ -140,14 +185,35 @@
 | 
			
		||||
  let style = (
 | 
			
		||||
    mark: (
 | 
			
		||||
      start: get-arrow-marks(elmt.start-tip, elmt.color),
 | 
			
		||||
      end: get-arrow-marks(elmt.end-tip, elmt.color)
 | 
			
		||||
      end: get-arrow-marks(elmt.end-tip, elmt.color),
 | 
			
		||||
      scale: 1.2
 | 
			
		||||
    ),
 | 
			
		||||
    stroke: (
 | 
			
		||||
      dash: if elmt.dashed {"dashed"} else {"solid"},
 | 
			
		||||
      paint: elmt.color
 | 
			
		||||
      dash: if elmt.dashed {(2pt,2pt)} else {"solid"},
 | 
			
		||||
      paint: elmt.color,
 | 
			
		||||
      thickness: .5pt
 | 
			
		||||
    )
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  let y0 = start-info.y
 | 
			
		||||
  if "linked-note" in elmt {
 | 
			
		||||
    let shps = note.render(pars-i, x-pos, elmt.linked-note, start-info.y, lifelines).last()
 | 
			
		||||
    shapes += shps
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let flip-mark = end-info.i <= start-info.i
 | 
			
		||||
  if elmt.flip {
 | 
			
		||||
    flip-mark = not flip-mark
 | 
			
		||||
  }
 | 
			
		||||
  if flip-mark {
 | 
			
		||||
    style.mark.end = reverse-arrow-mark(style.mark.end)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let pts
 | 
			
		||||
  let comment-pt
 | 
			
		||||
  let comment-anchor
 | 
			
		||||
  let comment-angle = 0deg
 | 
			
		||||
 | 
			
		||||
  if elmt.p1 == elmt.p2 {
 | 
			
		||||
    if elmt.flip {
 | 
			
		||||
      x1 = start-info.lx
 | 
			
		||||
@@ -161,55 +227,144 @@
 | 
			
		||||
      calc.max(x1, x2) + 20
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if elmt.comment != none {
 | 
			
		||||
      shapes += draw.content(
 | 
			
		||||
        (x1, y),
 | 
			
		||||
        elmt.comment,
 | 
			
		||||
        anchor: if elmt.flip {"south-east"} else {"south-west"},
 | 
			
		||||
        padding: 3pt
 | 
			
		||||
    pts = (
 | 
			
		||||
      (x1, start-info.y),
 | 
			
		||||
      (x-mid, start-info.y),
 | 
			
		||||
      (x-mid, end-info.y),
 | 
			
		||||
      (x2, end-info.y)
 | 
			
		||||
    )
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    shapes += draw.line(
 | 
			
		||||
      (x1, y),
 | 
			
		||||
      (x-mid, y),
 | 
			
		||||
      (x-mid, y - 10),
 | 
			
		||||
      (x2, y - 10),
 | 
			
		||||
      ..style
 | 
			
		||||
    )
 | 
			
		||||
    y -= 10
 | 
			
		||||
    if elmt.comment != none {
 | 
			
		||||
      comment-anchor = (
 | 
			
		||||
        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",
 | 
			
		||||
      ).at(elmt.comment-align)
 | 
			
		||||
 | 
			
		||||
      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))
 | 
			
		||||
      ).at(elmt.comment-align)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
  } else {
 | 
			
		||||
    pts = (
 | 
			
		||||
      (x1, start-info.y),
 | 
			
		||||
      (x2, end-info.y)
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
    if elmt.comment != none {
 | 
			
		||||
      let x = calc.min(x1, x2)
 | 
			
		||||
      if x2 < x1 {
 | 
			
		||||
        x += COMMENT-PAD
 | 
			
		||||
      let start-pt = pts.first()
 | 
			
		||||
      let end-pt = pts.last()
 | 
			
		||||
      if elmt.start-tip != "" {
 | 
			
		||||
        start-pt = (pts.first(), COMMENT-PAD, pts.last())
 | 
			
		||||
      }
 | 
			
		||||
      if elmt.end-tip != "" {
 | 
			
		||||
        end-pt = (pts.last(), COMMENT-PAD, pts.first())
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      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)
 | 
			
		||||
      ).at(elmt.comment-align)
 | 
			
		||||
 | 
			
		||||
      comment-anchor = (
 | 
			
		||||
        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",
 | 
			
		||||
      ).at(elmt.comment-align)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    let (p1, p2) = pts
 | 
			
		||||
    if x2 < x1 {
 | 
			
		||||
      (p1, p2) = (p2, p1)
 | 
			
		||||
    }
 | 
			
		||||
    comment-angle = vector.angle2(p1, p2)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // Start circle tip
 | 
			
		||||
  if is-circle-tip(elmt.start-tip) {
 | 
			
		||||
    shapes += draw.circle(pts.first(), radius: CIRCLE-TIP-RADIUS, stroke: elmt.color, fill: none, name: "_circle-start-tip")
 | 
			
		||||
    pts.at(0) = "_circle-start-tip"
 | 
			
		||||
  
 | 
			
		||||
  // Start cross tip
 | 
			
		||||
  } else if is-cross-tip(elmt.start-tip) {
 | 
			
		||||
    let size = CROSS-TIP-SIZE
 | 
			
		||||
    let cross-pt = (pts.first(), size * 2, pts.at(1))
 | 
			
		||||
    shapes += draw.line(
 | 
			
		||||
      (rel: (-size, -size), to: cross-pt),
 | 
			
		||||
      (rel: (size, size), to: cross-pt),
 | 
			
		||||
      stroke: elmt.color + 1.5pt
 | 
			
		||||
    )
 | 
			
		||||
    shapes += draw.line(
 | 
			
		||||
      (rel: (-size, size), to: cross-pt),
 | 
			
		||||
      (rel: (size, -size), to: cross-pt),
 | 
			
		||||
      stroke: elmt.color + 1.5pt
 | 
			
		||||
    )
 | 
			
		||||
    pts.at(0) = cross-pt
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // End circle tip
 | 
			
		||||
  if is-circle-tip(elmt.end-tip) {
 | 
			
		||||
    shapes += draw.circle(pts.last(), radius: 3, stroke: elmt.color, fill: none, name: "_circle-end-tip")
 | 
			
		||||
    pts.at(pts.len() - 1) = "_circle-end-tip"
 | 
			
		||||
  
 | 
			
		||||
  // End cross tip
 | 
			
		||||
  } else if is-cross-tip(elmt.end-tip) {
 | 
			
		||||
    let size = CROSS-TIP-SIZE
 | 
			
		||||
    let cross-pt = (pts.last(), size * 2, pts.at(pts.len() - 2))
 | 
			
		||||
    shapes += draw.line(
 | 
			
		||||
      (rel: (-size, -size), to: cross-pt),
 | 
			
		||||
      (rel: (size, size), to: cross-pt),
 | 
			
		||||
      stroke: elmt.color + 1.5pt
 | 
			
		||||
    )
 | 
			
		||||
    shapes += draw.line(
 | 
			
		||||
      (rel: (-size, size), to: cross-pt),
 | 
			
		||||
      (rel: (size, -size), to: cross-pt),
 | 
			
		||||
      stroke: elmt.color + 1.5pt
 | 
			
		||||
    )
 | 
			
		||||
    pts.at(pts.len() - 1) = cross-pt
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  shapes += draw.line(..pts, ..style)
 | 
			
		||||
 | 
			
		||||
  if elmt.comment != none {
 | 
			
		||||
    shapes += draw.content(
 | 
			
		||||
        (x, y),
 | 
			
		||||
      comment-pt,
 | 
			
		||||
      elmt.comment,
 | 
			
		||||
        anchor: "south-west",
 | 
			
		||||
      anchor: comment-anchor,
 | 
			
		||||
      angle: comment-angle,
 | 
			
		||||
      padding: 3pt
 | 
			
		||||
    )
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
    shapes += draw.line(
 | 
			
		||||
      (x1, y),
 | 
			
		||||
      (x2, y),
 | 
			
		||||
      ..style
 | 
			
		||||
    )
 | 
			
		||||
  }
 | 
			
		||||
  if elmt.enable-dst {
 | 
			
		||||
    let dst-line = lifelines.at(i2)
 | 
			
		||||
    dst-line.lines.push(("enable", y, elmt.lifeline-style))
 | 
			
		||||
    dst-line.lines.push(("enable", end-info.y, elmt.lifeline-style))
 | 
			
		||||
    lifelines.at(i2) = dst-line
 | 
			
		||||
  }
 | 
			
		||||
  if elmt.create-dst {
 | 
			
		||||
    end-info.y -= CREATE-OFFSET
 | 
			
		||||
    let dst-line = lifelines.at(i2)
 | 
			
		||||
    dst-line.lines.push(("create", y))
 | 
			
		||||
    dst-line.lines.push(("create", end-info.y))
 | 
			
		||||
    lifelines.at(i2) = dst-line
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let r = (y, lifelines, shapes)
 | 
			
		||||
  if "linked-note" in elmt {
 | 
			
		||||
    let m = note.get-size(elmt.linked-note)
 | 
			
		||||
    end-info.y = calc.min(end-info.y, y0 - m.height / 2)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let r = (end-info.y, lifelines, shapes)
 | 
			
		||||
  return r
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										27
									
								
								src/sync.typ
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								src/sync.typ
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,27 @@
 | 
			
		||||
#import "sequence.typ"
 | 
			
		||||
 | 
			
		||||
#let _sync(elmts) = {
 | 
			
		||||
  return ((
 | 
			
		||||
    type: "sync",
 | 
			
		||||
    elmts: elmts
 | 
			
		||||
  ),)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let render(pars-i, x-pos, participants, elmt, y, lifelines) = {
 | 
			
		||||
  let draw-seq = sequence.render.with(pars-i, x-pos, participants)
 | 
			
		||||
 | 
			
		||||
  let shapes = ()
 | 
			
		||||
 | 
			
		||||
  let end-y = y
 | 
			
		||||
 | 
			
		||||
  for e in elmt.elmts {
 | 
			
		||||
    let yi
 | 
			
		||||
    let shps
 | 
			
		||||
    (yi, lifelines, shps) = draw-seq(e, y, lifelines)
 | 
			
		||||
    shapes += shps
 | 
			
		||||
    end-y = calc.min(end-y, yi)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let r = (end-y, lifelines, shapes)
 | 
			
		||||
  return r
 | 
			
		||||
}
 | 
			
		||||
@@ -21,6 +21,10 @@
 | 
			
		||||
      let (i0, i1) = get-group-span(participants, elmt)
 | 
			
		||||
      min-i = calc.min(min-i, i0)
 | 
			
		||||
      max-i = calc.max(max-i, i1)
 | 
			
		||||
    } else if elmt.type == "sync" {
 | 
			
		||||
      let (i0, i1) = get-group-span(participants, elmt)
 | 
			
		||||
      min-i = calc.min(min-i, i0)
 | 
			
		||||
      max-i = calc.max(max-i, i1)
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  return (min-i, max-i)
 | 
			
		||||
@@ -41,3 +45,26 @@
 | 
			
		||||
 | 
			
		||||
  panic("Invalid type for parameter mods, expected auto or dictionary, got " + str(type(mods)))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#let fit-canvas(canvas, width: auto) = layout(size => {
 | 
			
		||||
  let m = measure(canvas)
 | 
			
		||||
  let w = m.width
 | 
			
		||||
  let h = m.height
 | 
			
		||||
  let r = if w == 0pt {0} else {
 | 
			
		||||
    if width == auto {1}
 | 
			
		||||
    else if type(width) == length {
 | 
			
		||||
      width / w
 | 
			
		||||
    } else {
 | 
			
		||||
      size.width * width / w
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  let new-w = w * r
 | 
			
		||||
  let new-h = h * r
 | 
			
		||||
  r *= 100%
 | 
			
		||||
  
 | 
			
		||||
  box(
 | 
			
		||||
    width: new-w,
 | 
			
		||||
    height: new-h,
 | 
			
		||||
    scale(x: r, y: r, reflow: true, canvas)
 | 
			
		||||
  )
 | 
			
		||||
})
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
[package]
 | 
			
		||||
name = "chronos"
 | 
			
		||||
version = "0.0.1"
 | 
			
		||||
version = "0.1.0"
 | 
			
		||||
compiler = "0.11.0"
 | 
			
		||||
repository = "https://git.kb28.ch/HEL/chronos"
 | 
			
		||||
entrypoint = "src/lib.typ"
 | 
			
		||||
@@ -11,4 +11,4 @@ categories = ["visualization"]
 | 
			
		||||
license = "Apache-2.0"
 | 
			
		||||
description = "A package to draw sequence diagrams with CeTZ"
 | 
			
		||||
keywords = ["sequence", "diagram", "plantuml"]
 | 
			
		||||
exclude = [ "/gallery/*" ]
 | 
			
		||||
exclude = [ "gallery", "gallery.bash" ]
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user