Skip to content

Commit 48970d2

Browse files
Fripe070Fripe070
authored
Queryable templates (#3)
* Use templates, provide blank starting files and reorganise stuff * update import paths to be relative to the project root * Tempaltes for SM reports * Sign the blank protocol
1 parent deff18b commit 48970d2

10 files changed

Lines changed: 129 additions & 165 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ Namely, it contains:
99
- Reports
1010

1111
Everything is, and will always be written, in Typst. All praise be upon our mighty Typst overlords.
12+
13+
New protocols should be created by copying the relevant template from `meta/blanks/` and filling in the required information.

‎meta/blanks/protocol.typ‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#import "/meta/templates/protocol.typ": protocol, signature
2+
3+
#show: protocol.with(
4+
"PR#<NN>",
5+
datetime(year: 2000, month: 9, day: 12),
6+
"<LOCATION>"
7+
)
8+
9+
= Formalia
10+
11+
== Pull Requestens högtidliga öppnande
12+
13+
== Val av mötesordförande
14+
15+
== Val av mötessekreterare
16+
17+
== Val av två justeringsmän, tillika rösträknare
18+
19+
== Adjungeringar
20+
21+
== Pull Requestens behöriga utlysande
22+
23+
== Anmälan av övriga frågor
24+
25+
== Godkännande av dagordning
26+
27+
== Föregående mötesprotokoll
28+
29+
= Rapporter
30+
31+
== Bootloader
32+
33+
== Kernel
34+
35+
== Övriga
36+
37+
= Bordlagda ärenden
38+
39+
= Besluts- och diskussionspunkter
40+
41+
= Övriga frågor
42+
43+
= Slutformalia
44+
45+
== Nästa Pull Request
46+
47+
== Pull Requestens avslutande
48+
49+
50+
#grid(
51+
columns: (1fr, 1fr),
52+
gutter: 1cm,
53+
signature("Ture Teknolog", "Ordförande"),
54+
signature("Ture Teknolog", "Sekreterare"),
55+
signature("Ture Teknolog", "Justerare / Rösträknare"),
56+
signature("Ture Teknolog", "Justerare / Rösträknare")
57+
)

templates/sm.typ renamed to meta/blanks/sm.typ

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
#align(left, [
2-
#figure(
3-
image("/assets/init.svg", width: 14%),
4-
)
5-
])
6-
7-
#align(center, [
8-
*Rapport \SM\#\<number\>*
9-
])
1+
#import "/meta/templates/sm.typ": sm
2+
3+
#show: sm.with(
4+
999,
5+
datetime(year: 2000, month: 9, day: 12),
6+
)
107

118
= Swedish
129

‎meta/templates/protocol.typ‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#let signature(signee, label) = stack(
2+
spacing: 0.1cm,
3+
signee,
4+
box(line(length: 100%, stroke: 0.8pt)),
5+
label
6+
)
7+
8+
#let protocol(title, date, location, body) = [
9+
#set text(font: "IBM Plex Mono", size: 9pt, region: "se", lang: "sv")
10+
#set heading(numbering: "1.")
11+
12+
#metadata(title) <title>
13+
#metadata(date.display("[year]-[month]-[day]")) <date>
14+
#metadata(location) <location>
15+
16+
#align(center)[
17+
#figure(image("/assets/init.svg", width: 14%))
18+
*#title* \
19+
*#date.display()* \
20+
*#location*
21+
]
22+
23+
#body
24+
]

‎meta/templates/sm.typ‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#let sm(sm-nr, date, body) = [
2+
#set text(font: "IBM Plex Mono", size: 9pt, region: "se", lang: "sv")
3+
4+
#let title = "Rapport SM#" + str(sm-nr)
5+
6+
#metadata(title) <title>
7+
#metadata(date.display("[year]-[month]-[day]")) <date>
8+
9+
#align(center)[
10+
#figure(image("/assets/init.svg", width: 14%))
11+
*#title* \
12+
*#date.display()*
13+
]
14+
15+
#body
16+
]

‎protocols/meeting-00/protocol.typ‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,10 @@
1-
#let today = datetime(year: 2025, month: 11, day: 28)
2-
#set heading(numbering: "1.")
3-
#set text(font: "IBM Plex Mono", size: 9pt)
1+
#import "/meta/templates/protocol.typ": protocol, signature
42

5-
#let signature = (signee) => {
6-
box(line(length: 100%, stroke: 0.8pt))
7-
signee
8-
}
9-
10-
#align(left, [
11-
#figure(
12-
image("/assets/init.svg", width: 14%),
13-
)
14-
])
15-
16-
#align(center, [
17-
*PR\#0*
18-
19-
*#today.display()*
20-
21-
*Kistan 2.0*
22-
])
3+
#show: protocol.with(
4+
"PR#00",
5+
datetime(year: 2025, month: 11, day: 28),
6+
"Kistan 2.0"
7+
)
238

249
= Formalia
2510

‎protocols/meeting-01/protocol.typ‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,10 @@
1-
#let today = datetime(year: 2026, month: 2, day: 17)
2-
#set heading(numbering: "1.")
3-
#set text(font: "IBM Plex Mono", size: 9pt)
4-
5-
#let signature(signee, label) = stack(
6-
spacing: 0.1cm,
7-
signee,
8-
box(line(length: 100%, stroke: 0.8pt)),
9-
label
10-
)
11-
12-
13-
#align(left, [
14-
#figure(
15-
image("/assets/init.svg", width: 14%),
16-
)
17-
])
18-
19-
#align(center, [
20-
*PR\#01*
1+
#import "/meta/templates/protocol.typ": protocol, signature
212

22-
*#today.display()*
23-
24-
*Kistan 2.0*
25-
])
3+
#show: protocol.with(
4+
"PR#01",
5+
datetime(year: 2026, month: 2, day: 17),
6+
"Kistan 2.0"
7+
)
268

279
= Formalia
2810

@@ -151,9 +133,6 @@ Saffaraj with SMN. Projector would be good. We have a lot of time, but we should
151133
== Pull Requestens avslutande
152134
Mötes avslutades 19:00
153135

154-
/* Hacky solution, should probably use pad() or something instead. */
155-
#linebreak()
156-
157136
#grid(
158137
columns: (1fr, 1fr),
159138
gutter: 1cm,

‎protocols/meeting-02/protocol.typ‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,11 @@
1-
#let today = datetime(year: 2026, month: 4, day: 28)
2-
#set heading(numbering: "1.")
3-
#set text(font: "IBM Plex Mono", size: 9pt)
4-
5-
#let signature(signee, label) = stack(
6-
spacing: 0.1cm,
7-
signee,
8-
box(line(length: 100%, stroke: 0.8pt)),
9-
label
10-
)
11-
12-
#align(left, [
13-
#figure(
14-
image("/assets/init.svg", width: 14%),
15-
)
16-
])
17-
18-
#align(center, [
19-
*ePRstein\#02*
1+
#import "/meta/templates/protocol.typ": protocol, signature
202

21-
*#today.display()*
22-
23-
*V01*
24-
])
3+
#show: protocol.with(
4+
"ePRstein#02",
5+
datetime(year: 2026, month: 4, day: 28),
6+
"V01"
7+
)
258

26-
#set text(region: "se", lang: "en")
279
= Formalia
2810
== Pull Requestens högtidliga öppnande
2911
Pull Requesten öppnades 18:09
@@ -207,7 +189,6 @@ We have talked about setting up Proxmox. It's a big project bet it would be wort
207189

208190
Merged 19:59
209191

210-
#linebreak()
211192
#grid(
212193
columns: (1fr, 1fr),
213194
gutter: 1cm,

‎reports/sm-2026-2/sm.typ‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
#align(left, [
2-
#figure(
3-
image("/assets/init.svg", width: 14%),
4-
)
5-
])
6-
7-
#align(center, [
8-
*Rapport \SM\#2*
9-
])
1+
#import "/meta/templates/sm.typ": sm
2+
3+
#show: sm.with(
4+
2,
5+
datetime(year: 2026, month: 3, day: 24),
6+
)
107

118
= Swedish
129

‎templates/protocol.typ‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)