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,16 +26,6 @@ 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-unstable";
+  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11";
   pkgs = import nixpkgs { config = {}; overlays = []; };
 in
 

src/conf.typ

@@ -11,75 +11,64 @@
 
 // default configuration
 #let default-config = (
-  // language settings used to make decisions about hyphenation and others
+    // language settings used to make decisions about hyphenation and others
-  lang: "en", // ISO 3166 language code of text: "de", "en"
+    lang: "en",       // ISO 3166 language code of text: "de", "en"
-  region: "en", // region code
+    region: "en",     // region code
-  // mark this thesis as draft
+    // mark this thesis as draft
-  // Adds preleminarry note page and watermark
+    // Adds preleminarry note page and watermark
-  draft: true,
+    draft: true,
-  // information about author(s)
+    // information about author(s)
-  university: (
+    university: (
-    program: "Informationtechnology",
+      program: "Informationtechnology",
-    faculty: "Technik",
+      faculty: "Technik",
-    name: "dualen Hochschule Baden-Württemberg",
+      name: "dualen Hochschule Baden-Württemberg",
-    campus: "Eppelheim",
+      campus: "Eppelheim"
-  ),
-  supervisor-signature: false,
-  authors: ((), ()),
-  // information about thesis
-  thesis: (
-    title: "Unofficial ABB/DHBW Typst template",
-    subtitle: "for reports and thesises", // subtitle may be none
-    submission-date: "23rd march 2020",
-    timeframe: "1st january 2020 - 20th march 2020",
-    kind: "T2000",
-    // translated version of abstract, only used in case language is not english
-    summary: none,
-    abstract: none,
-    preface: none,
-    keywords: ("IT", "other stuff"),
-    bibliography: none, /* bibliography("refs.bib") */
-    glossary: none,
-    appendices: none,
-  ),
-  style: (
-    header: (
-      content-padding: 1.5em,
-      underline-top-padding: 0pt,
-      logo-height: 5em,
-      logo-image: "res/ABB.svg",
     ),
-    footer: (
+    supervisor-signature: false,
-      content-padding: 1.5em,
+    authors: ((),()),
-    ),
+    // information about thesis
-    page: (
+    thesis: (
-      format: "a4",
+      title: "Unofficial ABB/DHBW Typst template",
-      margin: (
+      subtitle: "for reports and thesises",            // subtitle may be none
-        left: 3cm,
+      submission-date: "23rd march 2020",
-        right: 2.5cm,
+      timeframe: "1st january 2020 - 20th march 2020",
-        top: 2.5cm,
+      kind: "T2000",
-        bottom: 2.5cm,
+      // translated version of abstract, only used in case language is not english
-      ),
+      summary: none,
-    ),
+      abstract: none,
-    text: (
+      preface: none,
-      size: 12pt,
+      keywords: ( "IT", "other stuff" ),
-      font: "Fira Sans",
+      bibliography: none /* bibliography("refs.bib") */,
-    ),
+      glossary: none,
-    heading: (
+      appendices: none),
-      font: "Fira Sans",
+    style: (
-    ),
+      header: (
-    code: (
+        content-padding: 1.5em,
-      theme: "res/abb.tmTheme",
+        underline-top-padding: 0pt,
-      font: "FiraCode Nerd Font",
+        logo-height: 5em,
-      lines: false,
+        logo-image: "res/ABB.svg"),
-      size: 10pt,
+      footer: (
-      tab-size: 4,
+        content-padding: 1.5em),
-    ),
+      page: (
-    link: (
+        format: "a4",
-      color: ABB-GRAY-02,
+        margin: (
-    ),
+          left: 3cm,
-  ),
+          right: 2.5cm,
-)
+          top: 2.5cm,
+          bottom: 2.5cm)),
+      text: (
+        size: 12pt,
+        font: "Fira Sans"),
+      heading: (
+      font: "Fira Sans"),
+      code: (
+        theme: "res/abb.tmTheme",
+        font: "FiraCode Nerd Font",
+        lines: false,
+        size: 10pt,
+        tab-size: 4),
+      link: (
+        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,6 +8,7 @@
 // License: MIT
 
 #let glossary(entries, config) = {
+
   assert(
     type(entries) == dictionary,
     message: "The glossary is not a dictionary",

src/pages/abstract.typ

@@ -8,6 +8,7 @@
 
 #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,6 +8,7 @@
 
 #let new_confidentiality_statement_page(config) = (
   context {
+
     pagebreak(weak: true)
 
     let thesis = config.thesis

src/pages/declaration-of-authorship.typ

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

src/pages/outline.typ

@@ -12,6 +12,7 @@
 // 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,6 +8,7 @@
 
 #let new_prerelease_note(config) = (
   context {
+
     pagebreak(weak: true)
 
     let thesis = config.thesis

src/style.typ

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

typst.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dhbw-abb-typst-template"
-version = "0.6.3"
+version = "0.6.2"
 entrypoint = "src/template.typ"
 authors = ["Sven Vogel <sven.vogel1@de.abb.com>"]
 license = "MIT"