style: run typstyle

run-fmt.sh

@@ -17,7 +17,7 @@ function format() {
         exit 1
     fi
 
-    local imports=$(rg "#import \"([a-z0-9/\-]+\.typ)\"" -Nor '$1' "$1")
+    local imports=$(rg "#import \"([a-z0-9/\-.]+\.typ)\"" -Nor '$1' "$1")
 
     # format all included files
     while IFS= read -r line; do
@@ -26,6 +26,16 @@ function format() {
         fi
         format "$wd/$line" "$2"
     done <<< "$imports"
+
+    local includes=$(rg "#import \"([a-z0-9/\-.]+\.typ)\"" -Nor '$1' "$1")
+
+    # format all included files
+    while IFS= read -r line; do
+        if [ -z "$line" ]; then
+            continue
+        fi
+        format "$wd/$line" "$2"
+    done <<< "$includes"
 }
 
 case $1 in

shell.nix

@@ -1,5 +1,5 @@
 let
-  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11";
+  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-unstable";
   pkgs = import nixpkgs { config = {}; overlays = []; };
 in
 

src/conf.typ

@@ -22,10 +22,10 @@
     program: "Informationtechnology",
     faculty: "Technik",
     name: "dualen Hochschule Baden-Württemberg",
-      campus: "Eppelheim"
+    campus: "Eppelheim",
   ),
   supervisor-signature: false,
-    authors: ((),()),
+  authors: ((), ()),
   // information about thesis
   thesis: (
     title: "Unofficial ABB/DHBW Typst template",
@@ -37,38 +37,49 @@
     summary: none,
     abstract: none,
     preface: none,
-      keywords: ( "IT", "other stuff" ),
-      bibliography: none /* bibliography("refs.bib") */,
+    keywords: ("IT", "other stuff"),
+    bibliography: none, /* bibliography("refs.bib") */
     glossary: none,
-      appendices: none),
+    appendices: none,
+  ),
   style: (
     header: (
       content-padding: 1.5em,
       underline-top-padding: 0pt,
       logo-height: 5em,
-        logo-image: "res/ABB.svg"),
+      logo-image: "res/ABB.svg",
+    ),
     footer: (
-        content-padding: 1.5em),
+      content-padding: 1.5em,
+    ),
     page: (
       format: "a4",
       margin: (
         left: 3cm,
         right: 2.5cm,
         top: 2.5cm,
-          bottom: 2.5cm)),
+        bottom: 2.5cm,
+      ),
+    ),
     text: (
       size: 12pt,
-        font: "Fira Sans"),
+      font: "Fira Sans",
+    ),
     heading: (
-      font: "Fira Sans"),
+      font: "Fira Sans",
+    ),
     code: (
       theme: "res/abb.tmTheme",
       font: "FiraCode Nerd Font",
       lines: false,
       size: 10pt,
-        tab-size: 4),
+      tab-size: 4,
+    ),
     link: (
-        color: ABB-GRAY-02)))
+      color: ABB-GRAY-02,
+    ),
+  ),
+)
 
 // Insert a dictionary `update` into `base` but only the entries of update that also exist in base
 // Runs recursively on all sub dictionaries

src/glossary.typ

@@ -8,7 +8,6 @@
 // License: MIT
 
 #let glossary(entries, config) = {
-
   assert(
     type(entries) == dictionary,
     message: "The glossary is not a dictionary",

src/pages/abstract.typ

@@ -8,7 +8,6 @@
 
 #let new_abstract(config) = (
   context {
-
     set align(center + horizon)
 
     // only include summary when a language other than english is used

src/pages/confidentiality-statement.typ

@@ -8,7 +8,6 @@
 
 #let new_confidentiality_statement_page(config) = (
   context {
-
     pagebreak(weak: true)
 
     let thesis = config.thesis

src/pages/declaration-of-authorship.typ

@@ -8,7 +8,6 @@
 
 #let new_declaration_of_authorship(config) = (
   context {
-
     pagebreak(weak: true)
 
     let thesis = config.thesis

src/pages/outline.typ

@@ -12,7 +12,6 @@
 // NOTE: will not render in case the listing is empty
 #let render_filtered_outline(title: str, kind: selector) = (
   context {
-
     let elems = query(figure.where(kind: kind))
     let count = elems.len()
 

src/pages/prerelease-note.typ

@@ -8,7 +8,6 @@
 
 #let new_prerelease_note(config) = (
   context {
-
     pagebreak(weak: true)
 
     let thesis = config.thesis

src/style.typ

@@ -296,7 +296,6 @@
 
       if current-page == 1 {
         // logo moved to content
-
       } else if query(<end-of-content>)
         .first()
         .location()