.gitea/workflows/ci.yml

@@ -1,33 +1,19 @@
-name: Build'n check
+name: Gitea Action for checking typst compilation
 run-name: Performing Typst compilation
-on:
-  push:
-  pull_request:
-    branches:
-      - main
+on: [push]
+
 jobs:
   run-ci-linux:
     runs-on: ubuntu-latest
-    # run action mutally exclusive on PRs or
-    # push with commit containing "Run-Checks"
-    if: >
-      (contains(github.event.head_commit.message, 'Run-Checks') &&
-      github.event_name == 'push') ||
-      github.event_name == 'pull_request'
+    env:
+      TYPST_INSTALL: /usr/local
+      TYPST_VERSION: 0.11.1
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
-      - name: Install dependencies for Nix setup action
-        run: |
-          apt update -y
-          apt install sudo -y
-      - name: Setup Nix
-        uses: cachix/install-nix-action@v27
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Stylecheck
-        run: nix-shell --run "./run-fmt.sh --check src/lib.typ"
-      - id: build
-        name: Build
-        run: |
-          nix-shell --run ./run-ci.sh
+      - name: Install Typst CLI
+        run: curl -fsSL https://typst.community/typst-install/install.sh | sh -s "$TYPST_VERSION"
+      - name: Set up Python 3
+        run: apt update -y && apt install python3-pip -y
+      - name: Run CI
+        run: bash -c ./run-ci.sh

.gitea/workflows/release.yml

@@ -0,0 +1,31 @@
+name: release
+
+on: 
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Install Typst CLI
+        run: curl -fsSL https://typst.community/typst-install/install.sh | sh -s "$TYPST_VERSION"
+      - name: Set up Python 3
+        run: apt update -y && apt install python3-pip -y
+      - name: Run CI
+        run: bash -c ./run-ci.sh
+      - name: Setup go
+        uses: https://github.com/actions/setup-go@v4
+        with:
+          go-version: '>=1.20.1'
+      - name: Create release  
+        id: create-release
+        uses: https://gitea.com/actions/release-action@main
+        with:
+          files: |-
+            example.pdf
+          api_key: '${{secrets.RELEASE_TOKEN}}'

.github/workflows/ci.yml

@@ -0,0 +1,20 @@
+name: GitHub Action for checking typst compilation
+run-name: Performing Typst compilation
+on: [push]
+
+jobs:
+  run-ci-linux:
+    runs-on: ubuntu-latest
+    env:
+      TYPST_INSTALL: $HOME/.typst
+      TYPST_VERSION: 0.11.1
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Install Typst CLI
+        run: curl -fsSL https://typst.community/typst-install/install.sh | sh -s "$TYPST_VERSION"
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11' 
+      - name: Run CI
+        run: export PATH="$TYPST_INSTALL/bin:$PATH" && bash -c ./run-ci.sh

.github/workflows/release.yml

@@ -1,64 +1,32 @@
-name: Build'n check
-
 on:
   push:
-    branches:
-      - main
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+name: Create Release
 
 jobs:
   build:
-    name: Check Template and Build example
+    name: Create Release
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
-      - name: Setup Nix
-        uses: cachix/install-nix-action@v27
+      - name: Install Typst CLI
+        run: curl -fsSL https://typst.community/typst-install/install.sh | sh -s "$TYPST_VERSION"
+      - uses: actions/setup-python@v5
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Stylecheck
-        run: nix-shell --run "./run-fmt.sh --check src/lib.typ"
-      - id: build
-        name: Build
-        run: |
-          nix-shell --run ./run-ci.sh
-      - name: Upload artifact
-        id: artifact-upload
-        uses: actions/upload-artifact@v3
+          python-version: '3.11' 
+      - name: Run CI
+        run: export PATH="$TYPST_INSTALL/bin:$PATH" && bash -c ./run-ci.sh
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
         with:
-          name: example-document
-          path: ${{ github.workspace }}/example.pdf
-          if-no-files-found: error
-          retention-days: 1
-      - name: Output artifact ID
-        run:  echo 'Artifact ID is ${{ steps.artifact-upload.outputs.artifact-id }}'
-  release:
-    runs-on: ubuntu-latest
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/')
-    permissions:
-      contents: write
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - name: Setup go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '>=1.20.1'
-      - name: Download Artifcat
-        id: download
-        uses: actions/download-artifact@v3
-        with:
-          name: example-document
-          path: ${{ github.workspace }}/Example.pdf
-      - name: 'Artifact Download Path'
-        run: echo ${{ steps.download.outputs.download-path }}
-      - name: Prepare Release
-        run: echo ${{ github.sha }} > Release.txt
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: |
-            Example.pdf
-            Release.txt
-            LICENSE
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false

LICENSE

@@ -2,20 +2,8 @@ MIT License
 
 Copyright (c) 2024 Sven Vogel
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -75,78 +75,31 @@ The default configuration can be found in `src/conf.typ`.
 #import "src/lib.typ": *
 
 #show: dhbw-template.with((
-  // language settings used to make decisions about hyphenation and others
-  lang: "en",       // ISO 3166 language code of text: "de", "en"
-  region: "en",     // region code
-  // mark this thesis as draft
-  // Adds preleminarry note page and watermark
-  draft: true,
-  // information about author(s)
-  university: (
-    program: "Informationtechnology",
-    faculty: "Technik",
-    name: "dualen Hochschule Baden-Württemberg",
-    campus: "Eppelheim"
-  ),
-  authors: (
-    (
+  lang: "en",
+  region: "en",
+  author: (
     name: "Sven Vogel",
+    semester: 4,
+    program: "Informationtechnology",
     course: "TINF19IT1",
+    faculty: "Technik",
+    university: "DHBW Mannheim",
     company: "ABB AG",
     supervisor: "Benny Goodman",
-      matriculation-number: 123456789
-    ),
-    (
-      name: "Kurt Jammer",
-      course: "TINF24AI2",
-      company: "Siemens",
-      supervisor: "Henry Badman",
-      matriculation-number: 478568763
-    ),
-  ),
-  // information about thesis
+    matriculation-number: 123456789),
   thesis: (
     title: "Unofficial ABB/DHBW Typst template",
-    subtitle: "for reports and thesises",            // subtitle may be none
+    subtitle: "for reports and thesises",
     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,
+    summary: summary,
+    abstract: abstract,
+    preface: include "preface.typ",
     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: (
-      content-padding: 1.5em),
-    page: (
-      format: "a4",
-      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)))
+    bibliography: bibliography("refs.bib"),
+    glossary: yaml("glossary.yml"),
+    appendices: include "appendix.typ")))
 
 // Your document code goes here!
 
@@ -178,10 +131,9 @@ Complies with ABB branding guidelines such as:
 
 ## Fonts
 
-Both fonts used in the document are licensed under the [Open Font License](https://openfontlicense.org/) and can be used for non-commercial as well as commercial purposes:
-- [Fira Sans](https://github.com/bBoxType/FiraSans)
-- [Fira Math](https://github.com/firamath/firamath)
-- [Fira Code NF](https://www.nerdfonts.com/font-downloads)
+Both fonts used in the document are licensed under the [Open Font License](https://openfontlicense.org/) and can be used for non-commercial as well as commercial purposes. They can be downloaded from google fonts:
+- [Montserrat](https://fonts.google.com/specimen/Montserrat)
+- [Open Sans](https://fonts.google.com/specimen/Open+Sans)
 
 Consider giving the creators of the font credit for their amazing work!
 

base16/abb.yml

@@ -0,0 +1,20 @@
+# Base16 ABB branded color scheme
+scheme-author: "Sven Vogel"
+scheme-slug: "abb-base16"
+scheme-name: "ABB Base16"
+base00: "ffffff" # Default Background
+base01: "fafafa" # Lighter Background
+base02: "f0f0f0" # Selection Background
+base03: "6e6e6e" # Comments, Invisibles, Line Highlighting
+base04: "000000" # Dark Foreground
+base05: "000000" # Default Foreground, Caret, Delimiters, Operators
+base06: "fafafa" # Light Foreground (Not often used)
+base07: "fafafa" # Light Background (Not often used)
+base08: "262626" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+base09: "004c97" # Integers, Boolean, Constants, XML Attributes, Markup Link Url
+base0A: "ff000f" # Classes, Markup Bold, Search Text Background
+base0B: "004c97" # Strings, Inherited Class, Markup Code, Diff Inserted
+base0C: "262626" # Support, Regular Expressions, Escape Characters, Markup Quotes
+base0D: "007a33" # Functions, Methods, Attribute IDs, Headings
+base0E: "ff000f" # Keywords, Storage, Selector, Markup Italic, Diff Changed
+base0F: "6e6e6e" # Deprecated, Opening/Closing Embedded Language Tags

base16/generator.py

@@ -0,0 +1,30 @@
+import yaml
+import logging
+import sys
+import re
+
+global data
+
+def replace_tag(match):
+    return data[match.group(1)]
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
+    logger = logging.getLogger()
+
+    with open(sys.argv[1], 'r') as file:
+        data = yaml.safe_load(file)
+
+        content = ""
+
+        with open(sys.argv[2], "r") as file:
+            logger.info(f"opened file: {sys.argv[2]}")
+            content = file.read()
+            logger.info(f"read file: {sys.argv[2]}")
+        
+            logger.info(f"converting...")
+            content = re.sub("\\{\\{([a-z0-9-]+)\\}\\}", replace_tag, content, 0, re.IGNORECASE)
+
+            with open(sys.argv[3], "w") as file:
+                logger.info(f"writing changes...")
+                file.write(content)

base16/requirements.txt

@@ -0,0 +1 @@
+pyyaml

base16/template.tmTheme

@@ -0,0 +1,561 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>author</key>
+	<string>Template: Chris Kempson, Scheme: {{scheme-author}}</string>
+	<key>name</key>
+	<string>Base16 {{scheme-name}}</string>
+	<key>semanticClass</key>
+	<string>theme.base16.{{scheme-slug}}</string>
+	<key>colorSpaceName</key>
+	<string>sRGB</string>
+	<key>gutterSettings</key>
+	<dict>
+		<key>background</key>
+		<string>#{{base01}}</string>
+		<key>divider</key>
+		<string>#{{base01}}</string>
+		<key>foreground</key>
+		<string>#{{base03}}</string>
+		<key>selectionBackground</key>
+		<string>#{{base02}}</string>
+		<key>selectionForeground</key>
+		<string>#{{base04}}</string>
+	</dict>
+	<key>settings</key>
+	<array>
+		<dict>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#{{base00}}</string>
+				<key>caret</key>
+				<string>#{{base05}}</string>
+				<key>foreground</key>
+				<string>#{{base05}}</string>
+				<key>invisibles</key>
+				<string>#{{base03}}</string>
+				<key>lineHighlight</key>
+				<string>#{{base03}}55</string>
+				<key>selection</key>
+				<string>#{{base02}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Text</string>
+			<key>scope</key>
+			<string>variable.parameter.function</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base05}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Comments</string>
+			<key>scope</key>
+			<string>comment, punctuation.definition.comment</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base03}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Punctuation</string>
+			<key>scope</key>
+			<string>punctuation.definition.string, punctuation.definition.variable, punctuation.definition.string, punctuation.definition.parameters, punctuation.definition.string, punctuation.definition.array</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base05}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Delimiters</string>
+			<key>scope</key>
+			<string>none</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base05}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Operators</string>
+			<key>scope</key>
+			<string>keyword.operator</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base05}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Keywords</string>
+			<key>scope</key>
+			<string>keyword</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0E}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Variables</string>
+			<key>scope</key>
+			<string>variable</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base08}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Functions</string>
+			<key>scope</key>
+			<string>entity.name.function, meta.require, support.function.any-method, variable.function, variable.annotation, support.macro</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0D}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Labels</string>
+			<key>scope</key>
+			<string>entity.name.label</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0F}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Classes</string>
+			<key>scope</key>
+			<string>support.class, entity.name.class, entity.name.type.class</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0A}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Classes</string>
+			<key>scope</key>
+			<string>meta.class</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base07}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Methods</string>
+			<key>scope</key>
+			<string>keyword.other.special-method</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0D}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Storage</string>
+			<key>scope</key>
+			<string>storage</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0E}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Support</string>
+			<key>scope</key>
+			<string>support.function</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0C}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Strings, Inherited Class</string>
+			<key>scope</key>
+			<string>string, constant.other.symbol, entity.other.inherited-class</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0B}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Integers</string>
+			<key>scope</key>
+			<string>constant.numeric</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base09}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Floats</string>
+			<key>scope</key>
+			<string>none</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base09}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Boolean</string>
+			<key>scope</key>
+			<string>none</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base09}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Constants</string>
+			<key>scope</key>
+			<string>constant</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base09}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Tags</string>
+			<key>scope</key>
+			<string>entity.name.tag</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base08}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Attributes</string>
+			<key>scope</key>
+			<string>entity.other.attribute-name</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base09}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Attribute IDs</string>
+			<key>scope</key>
+			<string>entity.other.attribute-name.id, punctuation.definition.entity</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0D}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Selector</string>
+			<key>scope</key>
+			<string>meta.selector</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0E}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Values</string>
+			<key>scope</key>
+			<string>none</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base09}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Headings</string>
+			<key>scope</key>
+			<string>markup.heading punctuation.definition.heading, entity.name.section</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string></string>
+				<key>foreground</key>
+				<string>#{{base0D}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Units</string>
+			<key>scope</key>
+			<string>keyword.other.unit</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base09}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Bold</string>
+			<key>scope</key>
+			<string>markup.bold, punctuation.definition.bold</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>bold</string>
+				<key>foreground</key>
+				<string>#{{base0A}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Italic</string>
+			<key>scope</key>
+			<string>markup.italic, punctuation.definition.italic</string>
+			<key>settings</key>
+			<dict>
+				<key>fontStyle</key>
+				<string>italic</string>
+				<key>foreground</key>
+				<string>#{{base0E}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Code</string>
+			<key>scope</key>
+			<string>markup.raw.inline</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0B}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Link Text</string>
+			<key>scope</key>
+      <string>string.other.link, punctuation.definition.string.end.markdown, punctuation.definition.string.begin.markdown</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base08}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Link Url</string>
+			<key>scope</key>
+			<string>meta.link</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base09}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Lists</string>
+			<key>scope</key>
+			<string>markup.list</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base08}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Quotes</string>
+			<key>scope</key>
+			<string>markup.quote</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base09}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Separator</string>
+			<key>scope</key>
+			<string>meta.separator</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#{{base02}}</string>
+				<key>foreground</key>
+				<string>#{{base05}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Inserted</string>
+			<key>scope</key>
+			<string>markup.inserted</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0B}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Deleted</string>
+			<key>scope</key>
+			<string>markup.deleted</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base08}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Changed</string>
+			<key>scope</key>
+			<string>markup.changed</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0E}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Colors</string>
+			<key>scope</key>
+			<string>constant.other.color</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0C}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Regular Expressions</string>
+			<key>scope</key>
+			<string>string.regexp</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0C}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Escape Characters</string>
+			<key>scope</key>
+			<string>constant.character.escape</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0C}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Embedded</string>
+			<key>scope</key>
+			<string>punctuation.section.embedded, variable.interpolation</string>
+			<key>settings</key>
+			<dict>
+				<key>foreground</key>
+				<string>#{{base0E}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Illegal</string>
+			<key>scope</key>
+			<string>invalid.illegal</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#{{base08}}</string>
+				<key>foreground</key>
+				<string>#{{base07}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Broken</string>
+			<key>scope</key>
+			<string>invalid.broken</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#{{base09}}</string>
+				<key>foreground</key>
+				<string>#{{base00}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Deprecated</string>
+			<key>scope</key>
+			<string>invalid.deprecated</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#{{base0F}}</string>
+				<key>foreground</key>
+				<string>#{{base07}}</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>name</key>
+			<string>Unimplemented</string>
+			<key>scope</key>
+			<string>invalid.unimplemented</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#{{base03}}</string>
+				<key>foreground</key>
+				<string>#{{base07}}</string>
+			</dict>
+		</dict>
+	</array>
+	<key>uuid</key>
+	<string>uuid</string>
+</dict>
+</plist>
+

fonts/Fira Code/LICENSE

@@ -1,93 +0,0 @@
-Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

fonts/Fira Code/README.md

@@ -1,48 +0,0 @@
-# Nerd Fonts
-
-This is an archived font from the Nerd Fonts release v3.2.1.
-
-For more information see:
-* https://github.com/ryanoasis/nerd-fonts/
-* https://github.com/ryanoasis/nerd-fonts/releases/latest/
-
-# Fira Code
-
-**Fira Code** is a free monospaced font with programming ligatures.
-
-For more information have a look at the upstream website: https://github.com/tonsky/FiraCode
-
-Version: 6.2
-
-## Which font?
-
-### TL;DR
-
-* Pick your font family:
-  * If you are limited to monospaced fonts (because of your terminal, etc) then pick a font with `Nerd Font Mono` (or `NFM`).
-  * If you want to have bigger icons (usually around 1.5 normal letters wide) pick a font without `Mono` i.e. `Nerd Font` (or `NF`). Most terminals support this, but ymmv.
-  * If you work in a proportional context (GUI elements or edit a presentation etc) pick a font with `Nerd Font Propo` (or `NFP`).
-
-### Ligatures
-
-Ligatures are generally preserved in the patched fonts.
-Nerd Fonts `v2.0.0` had no ligatures in the `Nerd Font Mono` fonts, this has been dropped with `v2.1.0`.
-If you have a ligature-aware terminal and don't want ligatures you can (usually) disable them in the terminal settings.
-
-### Explanation
-
-Once you narrow down your font choice of family (`Droid Sans`, `Inconsolata`, etc) and style (`bold`, `italic`, etc) you have 2 main choices:
-
-#### `Option 1: Download already patched font`
-
- * For a stable version download a font package from the [release page](https://github.com/ryanoasis/nerd-fonts/releases)
- * Or download the development version from the folders here
-
-#### `Option 2: Patch your own font`
-
- * Patch your own variations with the various options provided by the font patcher (i.e. not include all symbols for smaller font size)
-
-For more information see: [The FAQ](https://github.com/ryanoasis/nerd-fonts/wiki/FAQ-and-Troubleshooting#which-font)
-
-[SIL-RFN]:http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web_fonts_and_RFNs#14cbfd4a
-

fonts/Fira Math/LICENSE

@@ -1,92 +0,0 @@
-Copyright (C) 2018--2023 by Xiangdong Zeng <xdzeng96@gmail.com>
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION AND CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

generate-theme.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+pip install -r base16/requirements.txt
+python base16/generator.py base16/abb.yml base16/template.tmTheme src/res/abb.tmTheme

run-ci.sh

@@ -1,3 +1,43 @@
 #!/bin/bash
 
-typst compile template/main.typ --root . --font-path fonts example.pdf
+function log() {
+  local timestamp=$(date +"%Y-%m-%d %H:%M:%S")
+  echo "$1 at $timestamp: $2"
+}
+
+function abort() {
+  log "ERROR" "test case $1 has failed"
+  exit 1
+}
+
+function print-box() {
+  printf "\\n"
+  echo ".----------------------------------------------------------------."
+  printf "| %-62s |\\n" "$1"
+  echo "'----------------------------------------------------------------'"
+}
+
+function enter-section() {
+  print-box "$1"
+
+  log "INFO" "running task in section $1: $2"
+  log "INFO" "section output following..."
+  printf "\\n"
+
+  eval "$2"
+  if [ $? -neq $3 ]; then
+    abort "command: $2 failed in section: $1"
+  fi
+
+  printf "\\n"
+  log "INFO" "section $1 completed successfully"
+}
+
+enter-section "BUILD: ABB code theme" "./generate-theme.sh" 0
+enter-section "Compiling template..." "typst compile template/main.typ --root . example.pdf" 0
+enter-section "TEST: local template import" "typst compile tests/local-import/main.typ --root ." 0
+enter-section "TEST: invalid config case 1" "typst compile tests/invalid-config/test-case-1.typ --root ." 1
+enter-section "TEST: invalid config case 2" "compile tests/invalid-config/test-case-2.typ" 0
+enter-section "TEST: invalid config case 3" "typst compile tests/invalid-config/test-case-3.typ --root ." 1
+
+log "INFO" "CI completed successfully"

run-fmt.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-function format() {
-    # format file
-    # typstyle --format $1
-
-    if [ -z "$1" ]; then
-        return
-    fi
-
-    local wd=$(dirname $(realpath "$1"))
-
-    echo "processing file $1..."
-    typstyle "$2" "$1" > /dev/null
-    if [ $? -eq 1 ]; then
-        echo "failed format validation: $1"
-        exit 1
-    fi
-
-    local imports=$(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 <<< "$imports"
-}
-
-case $1 in
-  "--format")
-    format "$2" "--inplace"
-    ;;
-  "--check")
-    format "$2" "--check"
-    ;;
-  *)
-    echo "unknown option: $1"
-    exit 1
-    ;;
-esac

shell.nix

@@ -1,13 +0,0 @@
-let
-  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11";
-  pkgs = import nixpkgs { config = {}; overlays = []; };
-in
-
-pkgs.mkShellNoCC {
-  packages = with pkgs; [
-    python312
-    python312Packages.pyyaml
-    typst
-    typstyle
-  ];
-}

src/conf.typ

@@ -18,28 +18,16 @@
     // Adds preleminarry note page and watermark
     draft: true,
     // information about author(s)
-    university: (
-      program: "Informationtechnology",
-      faculty: "Technik",
-      name: "dualen Hochschule Baden-Württemberg",
-      campus: "Eppelheim"
-    ),
-    authors: (
-      (
+    author: (
       name: "Sven Vogel",
+      semester: 4,
+      program: "Informationtechnology",
       course: "TINF19IT1",
+      faculty: "Technik",
+      university: "DHBW Mannheim",
       company: "ABB AG",
       supervisor: "Benny Goodman",
-        matriculation-number: 123456789
-      ),
-      (
-        name: "Kurt Jammer",
-        course: "TINF24AI2",
-        company: "Siemens",
-        supervisor: "Henry Badman",
-        matriculation-number: 478568763
-      ),
-    ),
+      matriculation-number: 123456789),
     // information about thesis
     thesis: (
       title: "Unofficial ABB/DHBW Typst template",
@@ -59,8 +47,7 @@
       header: (
         content-padding: 1.5em,
         underline-top-padding: 0pt,
-        logo-height: 5em,
-        logo-image: "res/ABB.svg"),
+        logo-height: 3em),
       footer: (
         content-padding: 1.5em),
       page: (
@@ -72,9 +59,9 @@
           bottom: 2.5cm)),
       text: (
         size: 12pt,
-        font: "Fira Sans"),
+        font: "Open Sans"),
       heading: (
-      font: "Fira Sans"),
+        font: "Montserrat"),
       code: (
         theme: "res/abb.tmTheme",
         font: "FiraCode Nerd Font",
@@ -99,9 +86,7 @@
       if key in update {
         let update_val = update.at(key)
 
-      if type(val) == array {
-        // ignore checking arraay
-      } else if type(val) == dictionary and type(update_val) == dictionary {
+        if type(val) == dictionary and type(update_val) == dictionary {
           base.insert(key, deep-insert-checked(val, update_val))
         } else if val == none or type(val) == type(update_val) {
           base.insert(key, update_val)

src/glossarium.typ

@@ -30,25 +30,23 @@ SOFTWARE.*/
 #let __query_labels_with_key(loc, key, before: false) = {
   if before {
     query(
-      selector(label(__glossary_label_prefix + key)).before(
+      selector(label(__glossary_label_prefix + key)).before(loc, inclusive: false),
       loc,
-        inclusive: false,
-      ),
     )
   } else {
-    query(selector(label(__glossary_label_prefix + key)))
+    query(selector(label(__glossary_label_prefix + key)), loc)
   }
 }
 
 // key not found error
 #let __not-found-panic-error-msg(key) = {
-  __glossarium_error_prefix + "key '" + key + "' not found"
+ __glossarium_error_prefix+"key '"+key+"' not found"
 }
 
 // Reference a term
 #let gls(key, suffix: none, long: none, display: none) = {
   context {
-    let __glossary_entries = __glossary_entries.final()
+    let __glossary_entries = __glossary_entries.final(here())
     if key in __glossary_entries {
       let entry = __glossary_entries.at(key)
        
@@ -58,18 +56,13 @@ SOFTWARE.*/
       let entlong = entry.at("long", default: "")
       let textLink = if display != none {
         [#display]
-      } else if (
-        is_first or long == true
-      ) and entlong != [] and entlong != "" and long != false {
+      } else if (is_first or long == true) and entlong != [] and entlong != "" and long != false {
         [#entlong (#entry.short#suffix)]
       } else {
         [#entry.short#suffix]
       }
        
-      [#link(
-          label(entry.key),
-          textLink,
-        )#label(__glossary_label_prefix + entry.key)]
+      [#link(label(entry.key), textLink)#label(__glossary_label_prefix + entry.key)]
     } else {
       panic(__not-found-panic-error-msg(key))
     }
@@ -87,10 +80,10 @@ SOFTWARE.*/
       let gloss = __query_labels_with_key(here(), key, before: true)
        
       let is_first = gloss == ()
-      let entlongplural = entry.at("longplural", default: "")
+      let entlongplural = entry.at("longplural", default: "");
       let entlong = if entlongplural == [] or entlongplural == "" {
         // if the entry long plural is not provided, then fallback to adding 's' suffix
-        let entlong = entry.at("long", default: "")
+        let entlong = entry.at("long", default: "");
         if entlong != [] and entlong != "" {
           [#entlong#suffix]
         } else {
@@ -100,25 +93,20 @@ SOFTWARE.*/
         [#entlongplural]
       }
        
-      let entplural = entry.at("plural", default: "")
+      let entplural = entry.at("plural", default: "");
       let short = if entplural == [] or entplural == "" {
         [#entry.short#suffix]
       } else {
         [#entplural]
       }
        
-      let textLink = if (
-        is_first or long == true
-      ) and entlong != [] and entlong != "" and long != false {
+      let textLink = if (is_first or long == true) and entlong != [] and entlong != "" and long != false {
         [#entlong (#short)]
       } else {
         [#short]
       }
        
-      [#link(
-          label(entry.key),
-          textLink,
-        )#label(__glossary_label_prefix + entry.key)]
+      [#link(label(entry.key), textLink)#label(__glossary_label_prefix + entry.key)]
     } else {
       panic(__not-found-panic-error-msg(key))
     }
@@ -128,9 +116,7 @@ SOFTWARE.*/
 // show rule to make the references for glossarium
 #let make-glossary(body) = {
   show ref: r => {
-    if r.element != none and r.element.func() == figure and r
-      .element
-      .kind == __glossarium_figure {
+    if r.element != none and r.element.func() == figure and r.element.kind == __glossarium_figure {
       // call to the general citing function
       gls(str(r.target), suffix: r.citation.supplement)
     } else {
@@ -184,72 +170,51 @@ SOFTWARE.*/
               numbering: none,
               caption: {
                 context {
-                let key = if entry.key.ends-with("__glossary_entry") {
-                  entry.key.replace("__glossary_entry", "")
-                } else {
-                  entry.key
+                  let term_references = __query_labels_with_key(here(), entry.key)
+                  if term_references.len() != 0 or show-all {
+                    let desc = entry.at("desc", default: "")
+                    let long = entry.at("long", default: "")
+                    let hasLong = long != "" and long != []
+                    let hasDesc = desc != "" and desc != []
+                    grid(
+                      columns: 2,
+                      column-gutter: 1em,
+                      text(weight: "bold", entry.short),
+                      {
+                        if hasLong {
+                          text(weight: "bold", entry.long)
                         }
-
-                let term_references = __query_labels_with_key(here(), key)
-                if term_references.len() != 0 or show-all [
-                  #let desc = entry.at("desc", default: "")
-                  #let long = entry.at("long", default: "")
-                  #let hasLong = long != "" and long != []
-                  #let hasDesc = desc != "" and desc != []
-
-                  #block(
-                    below: 1.5em,
-                    width: 100%,
-                    par(hanging-indent: 1em, align(left)[
-                      #text(weight: "bold", entry.short)
-                      #if hasLong and hasDesc [
-                        (#text(entry.long))
-                      ] else if hasLong {
-                        text(entry.long)
-                      }
-                      #if hasDesc [ #sym.dash.en ]
-                      #if hasDesc [ #desc ]
-                      #if disable-back-references != true {
-                        term_references
-                          .map(x => x.location())
-                          .sorted(key: x => x.page())
-                          .fold(
+                        if hasLong and hasDesc [:]
+                        if hasDesc [ #desc ] else [. ]
+                        if disable-back-references != true {
+                          term_references.map(x => x.location()).sorted(key: x => x.page()).fold(
                             (values: (), pages: ()),
-                            ((values, pages), x) => if pages.contains(
-                              x.page(),
-                            ) {
+                            ((values, pages), x) => if pages.contains(x.page()) {
                               (values: values, pages: pages)
                             } else {
                               values.push(x)
                               pages.push(x.page())
                               (values: values, pages: pages)
                             },
-                          )
-                          .values
-                          .map(x => {
-                              let page-numbering = x.page-numbering()
+                          ).values.map(x => {
+                            let page-numbering = x.page-numbering();
                               if page-numbering == none {
                                 page-numbering = "1"
                               }
-                              link(x)[#numbering(
-                                  page-numbering,
-                                  ..counter(page).at(x),
-                                )]
+                              link(x)[#numbering(page-numbering, ..counter(page).at(x))]
+                            }
+                          ).join(", ")
+                        }
                       }
                     )
-                          .join(", ")
                   }
-                    ]),
-                  )
-                ]
                 }
               },
             )[] #label(entry.key)
+          #parbreak()
         ]
       }
     }
-    if enable-group-pagebreak {
-      pagebreak(weak: true)
-    }
+    if enable-group-pagebreak { pagebreak(weak: true) }
   }
 };

src/glossary.typ

@@ -7,94 +7,68 @@
 // Edited: 08.07.2024
 // License: MIT
 
-#let glossary(entries, config) = {
+#let glossary(entries) = {
 
     assert(
       type(entries) == dictionary,
       message: "The glossary is not a dictionary",
     )
 
-  let processed_glossary = (:)
-
     for (k, v) in entries.pairs() {
       assert(
         type(v) == dictionary,
-      message: "The glossary entry `" + k + "` is not a dictionary",
-    )
+        message: "The glossary entry `" + k + "` is not a dictionary")
 
       for key in v.keys() {
         assert(
           key in ("short", "long", "desc", "group"),
-        message: "Found unexpected key `" + key + "` in glossary entry `" + k,
-      )
+          message: "Found unexpected key `" + key + "` in glossary entry `" + k)
       }
 
       assert(
         type(v.short) == str,
-      message: "The short form of glossary entry `" + k + "` is not a string",
-    )
+        message: "The short form of glossary entry `" + k + "` is not a string")
 
       if "long" in v {
         assert(
           type(v.long) == str,
-        message: "The long form of glossary entry `" + k + "` is not a string",
-      )
+          message: "The long form of glossary entry `" + k + "` is not a string")
       }
 
       if "desc" in v {
         assert(
           type(v.desc) == str,
-        message: "The description of glossary entry `" + k + "` is not a string",
-      )
+          message: "The description of glossary entry `" + k + "` is not a string")
       }
       
       if "group" in v {
         assert(
           type(v.group) == str,
-        message: "The optional group of glossary entry `" + k + "` is not a string",
-      )
+          message: "The optional group of glossary entry `" + k + "` is not a string")
       } else {
-      let acronym_group = if config.lang == "de" {
-        "Abkürzungsverzeichnis"
+          let group = if "long" in v {
+            if (context text.lang) == "de" {
+              "Akronyme"
             } else {
-        "List of Acronyms"
+              "Acronyms"
             }
-
-      let glossary_group = if config.lang == "de" {
+          } else {
+            if (context text.lang) == "de" {
               "Begriffe"
             } else {
-        "Glossary"
-      }
-
-      let group = if "long" in v {
-        acronym_group
-      } else {
-        glossary_group
-      }
-
-      // create dedicated entries for
-      // acronym and glossary
-      if "long" in v and "desc" in v {
-        processed_glossary.insert(
-          k,
-          (short: v.short, long: v.long, group: acronym_group),
-        )
-        processed_glossary.insert(
-          k + "__glossary_entry",
-          (short: v.short, desc: v.desc, long: v.long, group: glossary_group),
-        )
-      } else {
-        processed_glossary.insert(k, v)
-        processed_glossary.at(k).group = group
-      }
+              "Terms"
             }
           }
 
-  return processed_glossary.pairs().map(((key, entry)) => (
+          entries.at(k).group = group
+      }
+    }
+
+  return entries.pairs().map(((key, entry)) => (
       key: key,
-    short: entry.short,
+      short: eval(entry.short, mode: "markup"),
       long: eval(entry.at("long", default: ""), mode: "markup"),
       desc: eval(entry.at("desc", default: ""), mode: "markup"),
-    group: entry.at("group", default: ""),
+      group: entry.at("group", default: "")
     ))
 }

src/lib.typ

@@ -7,60 +7,23 @@
 // Edited: 27.06.2024
 // License: MIT
 
-#import "conf.typ": validate-config, default-config
-#import "branding.typ": *
-#import "style.typ": global_styled_doc, content_styled, end_styled
-#import "glossary.typ": glossary
-#import "pages/titlepage.typ": new_title_page
-#import "pages/declaration-of-authorship.typ": new_declaration_of_authorship
-#import "pages/confidentiality-statement.typ": (
-  new_confidentiality_statement_page,
-)
-#import "pages/prerelease-note.typ": new_prerelease_note
-#import "pages/outline.typ": new_outline
-#import "pages/abstract.typ": new_abstract
-#import "pages/preface.typ": new-preface
-#import "pages/appendix.typ": show-appendix
+  #import "conf.typ": validate-config
+  #import "branding.typ": *
+  #import "style.typ": global_styled_doc, content_styled, end_styled
+  #import "glossary.typ": glossary
+  #import "pages/titlepage.typ": new_title_page
+  #import "pages/declaration-of-authorship.typ": new_declaration_of_authorship
+  #import "pages/confidentiality-statement.typ": new_confidentiality_statement_page
+  #import "pages/prerelease-note.typ": new_prerelease_note
+  #import "pages/outline.typ": new_outline
+  #import "pages/abstract.typ": new_abstract
+  #import "pages/preface.typ": new-preface
+  #import "pages/appendix.typ": show-appendix
 
-#let group-break() = {
+#let group-break()= {
   [#pagebreak()]
 }
 
-#let inline-color(color, content) = {
-  box(
-    stroke: 1pt + ABB-GRAY-05,
-    radius: 2pt,
-    inset: (left: 2pt, right: 2pt),
-    outset: (top: 4pt, bottom: 4pt),
-    fill: ABB-GRAY-06,
-    [#box(
-        fill: rgb(color),
-        radius: 2pt,
-        inset: 0pt,
-        width: 0.75em,
-        height: 0.75em,
-      ) #text(
-        font: default-config.style.code.font,
-        size: default-config.style.code.size,
-        content,
-      )],
-  )
-}
-
-#let url(label, content) = {
-  link(label)[#underline(
-      offset: 2pt,
-      stroke: 0.5pt + blue,
-      text(fill: blue)[
-        #content
-        #let domain = label.find(regex("\w+\.\w+(?:\.\w+)*"))
-        #if domain.len() > 0 [
-          (#domain)
-        ]
-      ],
-    )]
-}
-
 // start of template pages and styles
 #let dhbw-template(config, body) = [
   #let config = validate-config(config)
@@ -71,16 +34,14 @@
 
     // set document properties
     #set document(
-      // author: config.author.name,
+      author: config.author.name,
       keywords: config.thesis.keywords,
-      title: config.thesis.title,
-    )
+      title: config.thesis.title)
 
     // configure text locale
     #set text(
       lang: config.lang,
-      region: config.region,
-    )
+      region: config.region)
 
     // preppend title page
     #new_title_page(config)
@@ -105,11 +66,9 @@
 
     #if "glossary" in config.thesis and config.thesis.glossary != none {
       print-glossary(
-        show-all: false,
         disable-back-references: true,
         enable-group-pagebreak: true,
-        glossary(config.thesis.glossary, config),
-      )
+        glossary(config.thesis.glossary))
 
       pagebreak(weak: true)
     } 

src/pages/abstract.typ

@@ -6,8 +6,7 @@
 // Edited: 28.06.2024
 // License: MIT
 
-#let new_abstract(config) = (
-  context {
+#let new_abstract(config) = context {
   
   set align(center + horizon)
 
@@ -25,5 +24,4 @@
 
   heading("Abstract")
   config.thesis.abstract
-  }
-)
+}

src/pages/appendix.typ

@@ -6,8 +6,7 @@
 // Edited: 28.06.2024
 // License: MIT
 
-#let show-appendix(config: dictionary) = (
-  context {
+#let show-appendix(config: dictionary) = context {
   counter(heading).update(0)
 
   let title = if text.lang == "en" {
@@ -42,5 +41,4 @@
 
     config.thesis.appendices
   }
-  }
-)
+}

src/pages/confidentiality-statement.typ

@@ -6,21 +6,21 @@
 // Edited: 28.06.2024
 // License: MIT
 
-#let new_confidentiality_statement_page(config) = (
-  context {
+#let new_confidentiality_statement_page(config) = context {
 
   pagebreak(weak: true)
 
   let thesis = config.thesis
+  let author = config.author
 
   if text.lang == "de" [
-      #heading(level: 1, "Sperrvermerk")
+    #heading(level: 1, "Sperrvermerk", supplement: [special])
   ] else if text.lang == "en" [
-      #heading(level: 1, "Confidentiality Statement")
+    #heading(level: 1, "Confidentiality Statement", supplement: [special])
   ]
 
   if text.lang == "de" [
-      Der Inhalt dieser Arbeit mit dem Thema
+    Der Inhalt der dieser Arbeit mit dem Thema
   ] else if text.lang == "en" [
     The content of this work with the topic
   ]
@@ -43,7 +43,7 @@
   set par(justify: true)
 
   if text.lang == "de" [
-      darf weder als Ganzes noch in Auszügen Personen außerhalb des Prüfungsprozesses und des Evaluationsverfahrens zugänglich gemacht werden, sofern keine anderslautende Genehmigung der Ausbildungsstätte vorliegt.
+    darf weder als Ganzes noch in Auszügen Personen außerhalb des Prüfungsprozesses und des Evalua-tionsverfahrens zugänglich gemacht werden, sofern keine anderslautende Genehmigung der Ausbildungsstätte vorliegt.
   ] else if text.lang == "en" [
     may not be made accessible to persons outside the examination process and the evaluation procedure, either as a whole or in excerpts, unless otherwise authorized by the training institution.
   ]
@@ -59,5 +59,4 @@
     align(left, {line(length: 6cm)}),
     align(left, if text.lang == "de" [ Ort, Datum ] else if text.lang == "en" [ Place, Date ] else { panic("no translation for language: ", text.lang) }),
     align(left, if text.lang == "de" [ Unterschrift ] else if text.lang == "en" [ Signature ] else { panic("no translation for language: ", text.lang) }))
-  }
-)
+}

src/pages/declaration-of-authorship.typ

@@ -6,12 +6,12 @@
 // Edited: 28.06.2024
 // License: MIT
 
-#let new_declaration_of_authorship(config) = (
-  context {
+#let new_declaration_of_authorship(config) = context {
 
   pagebreak(weak: true)
 
   let thesis = config.thesis
+  let author = config.author
 
   if text.lang == "de" [
     #heading("Selbständigkeitserklärung")
@@ -61,5 +61,4 @@
     align(left, {line(length: 6cm)}),
     align(left, if text.lang == "de" [ Ort, Datum ] else if text.lang == "en" [ Place, Date ] else { panic("no translation for language: ", text.lang) }),
     align(left, if text.lang == "de" [ Unterschrift ] else if text.lang == "en" [ Signature ] else { panic("no translation for language: ", text.lang) }))
-  }
-)
+}

src/pages/outline.typ

@@ -10,34 +10,21 @@
 // with a specific title and filter by a specifc kind of figure
 // can optionally insert a pagebreak after the outline
 // NOTE: will not render in case the listing is empty 
-#let render_filtered_outline(title: str, kind: selector) = (
-  context {
+#let render_filtered_outline(title: str, kind: selector) = context {
 
-    let elems = query(figure.where(kind: kind))
+  let elems = query(figure.where(kind: kind), here())
   let count = elems.len()
   
-    show outline.entry: it => {
-      link(it.element.location())[
-        #v(12pt, weak: true)
-        #text(weight: "regular", it.body)
-        #box(width: 1fr, it.fill)
-        #[ #it.page]
-      ]
-    }
-
   // only show outline if there is something to list
   if count > 0 {
     pagebreak(weak: true)
     outline(
       title: title,
-        target: figure.where(kind: kind),
-      )
+      target: figure.where(kind: kind))
   }
-  }
-)
+}
 
-#let render_figures_outline() = (
-  context {
+#let render_figures_outline() = context {
   let title = if (text.lang == "de") {
       "Abbildungsverzeichnis"
     } else if text.lang == "en" {
@@ -45,11 +32,9 @@
     }
 
   render_filtered_outline(title: title, kind: image)
-  }
-)
+}
 
-#let render_table_outline() = (
-  context {
+#let render_table_outline() = context {
   let title = if (text.lang == "de") {
       "Tabellenverzeichnis"
     } else if text.lang == "en" {
@@ -57,11 +42,9 @@
     }
 
   render_filtered_outline(title: title, kind: table)
-  }
-)
+}
 
-#let render_raw_outline() = (
-  context {
+#let render_raw_outline() = context {
   let title = if (text.lang == "de") {
       "Quelltextverzeichnis"
     } else if text.lang == "en" {
@@ -69,34 +52,23 @@
     }
 
   render_filtered_outline(title: title, kind: raw)
-  }
-)
+}
 
-#let render_heading_outline() = (
-  context {
+#let render_heading_outline() = context {
   let title = if (text.lang == "de") {
       "Inhaltsverzeichnis"
     } else if text.lang == "en" {
       "Table of Contents"
     }
   
-    let header-supplement = if (text.lang == "de") {
-      "Kapitel"
-    } else {
-      "chapter"
-    }
-
   pagebreak(weak: true)
   outline(
-      target: heading.where(supplement: [#header-supplement]),
+      target: heading.where(supplement: [chapter]),
       title: title,
-      indent: auto,
-    )
-  }
-)
+      indent: auto)
+}
 
-#let render_appendix_outline() = (
-  context {
+#let render_appendix_outline() = context {
   let supplement = if text.lang == "en" {
     [Appendix]
   } else {
@@ -114,16 +86,16 @@
     outline(
         target: heading.where(supplement: supplement),
         title: title,
-        indent: auto,
-      )
+        indent: auto)
   }
-  }
-)
+}
 
 #let new_outline() = {
   pagebreak(weak: true)
 
-  show outline.entry.where(level: 1): it => {
+  show outline.entry.where(
+    level: 1,
+  ): it => {
     v(1.5em, weak: true)
     strong(it)
   }

src/pages/prerelease-note.typ

@@ -6,8 +6,7 @@
 // Edited: 28.06.2024
 // License: MIT
 
-#let new_prerelease_note(config) = (
-  context {
+#let new_prerelease_note(config) = context {
 
   pagebreak(weak: true)
 
@@ -54,5 +53,4 @@
   v(1em)
   h(1em)
   [#author.name, #datetime.today().display()]
-  }
-)
+}

src/pages/titlepage.typ

@@ -6,59 +6,41 @@
 // Edited: 28.06.2024
 // License: MIT
 
-#let new_title_page(config) = (
-  context [
+#let new_title_page(config) = context [
 
   #let thesis = config.thesis
-
-    // logo of ABB and DHBW
-    #v(-config.style.header.content-padding)
-    #grid(
-      // set width of columns
-      // we need two, so make both half the page width
-      columns: (50%, 50%),
-      // left align logo of ABB
-      if config.style.header.logo-image == none {
-        // error
-      } else if config.style.header.logo-image.len() > 0 {
-        align(left, image(config.style.header.logo-image, height: config.style.header.logo-height))
-      } else {
-        align(left, image("../res/DHBW.svg", height: config.style.header.logo-height))
-      },
-      // right align logo of DHBW
-      if config.style.header.logo-image.len() > 0 {
-        align(right, image("../res/DHBW.svg", height: config.style.header.logo-height))
-      })
+  #let author = config.author
 
   #set align(center)
 
   // title
   #v(2cm)
-    #par(justify: false, leading: 1.5em)[
-      #text(size: 2em, weight: "bold", hyphenate: false, thesis.title)
-      #linebreak()
-      // subtitle
-      #text(size: 2em, weight: "light", thesis.subtitle)
-    ]
+  #text(size: 2em, weight: "semibold", thesis.title)
 
-    #set align(center + horizon)
+  // subtitle
+  #text(size: 1.5em, thesis.subtitle)
 
   // type of paper
-    #text(size: 1.5em, weight: "medium", thesis.kind)
+  #v(1cm)
+  #text(size: 1.5em, weight: "bold", thesis.kind)
 
   // faculty
-    #pad()[
+  #pad(top: 0.5cm)[
     #if text.lang == "de" [
-        aus dem Studiengang #config.university.program | #config.university.faculty
+      Praxisphase des #author.semester Studienjahrs an der Fakultät für #author.faculty
+      #linebreak()
+      im Studiengang #author.program
     ] else if text.lang == "en" [
-        from the course of studies #config.university.program | #config.university.faculty
+      Practical phase of the #author.semester academic year at the Faculty of #author.faculty
+      #linebreak()
+      in the degree program #author.program
     ] else [
       #context panic("no translation for language: ", text.lang)
     ]
   ]
 
   // university
-    #pad()[
+  #pad(top: 0.5cm)[
     #if text.lang == "de" [
       an der
     ] else if text.lang == "en" [
@@ -66,89 +48,67 @@
     ] else [
       #context panic("no translation for language: ", text.lang)
     ]
-      #config.university.name
     #linebreak()
-      #config.university.campus
+    #author.university
   ]
 
-    #pad(top: 1em)[
-      #let names = ()
-      #for author in config.authors {
-        names.push(author.name)
-      }
-      #if text.lang == "de" [
-        von
-      ] else if text.lang == "en" [
-        by
-      ] else [
-        #context panic("no translation for language: ", text.lang)
-      ]
-      #set text(size: 16pt)
-      #grid(columns: 1, row-gutter: 1em, ..names)
-    ]
-
-    #pad(top: 1em)[
-      #thesis.timeframe
-    ]
-
-    #set align(bottom + left)
+  #set align(horizon + left)
 
   #if text.lang == "de" [
-      #grid(
+    #table(
       columns: 2,
       column-gutter: 1cm,
-        row-gutter: 0.5cm,
-        align: top + left,
+      align: left,
       stroke: none,
-        [Matrikelnummer, Kurs:],
-        par(
-          leading: 0.5em,
-          for author in config.authors {
-            str(author.matriculation-number) + ", " + author.course
-            linebreak()
-          },
-        ),
       
-        [Betrieb, Betreuer:],
-        par(
-          leading: 0.5em,
-          for author in config.authors {
-            author.company + ", " + author.supervisor
-            linebreak()
-          },
-        ),
+      [*Verfasser:*],
+      author.name,
+
+      [*Bearbeitungszeitraum:*],
+      thesis.timeframe,
+
+      [*Matrikelnummer, Kurs:*],
+      str(author.matriculation-number) + ", " + author.course,
+
+      [*Ausbildungsbetrieb:*],
+      author.company,
+
+      [*Betrieblicher Betreuer:*],
+      author.supervisor,
+
+      [*Abgabedatum:*],
+      thesis.submission-date
     )
   ] else if text.lang == "en" [
-      #grid(
+    #table(
       columns: 2,
       column-gutter: 1cm,
-        row-gutter: 0.5cm,
-        align: top + left,
+      align: left,
       stroke: none,
-        [Student ID, Course:],
-        par(
-          leading: 0.5em,
-          for author in config.authors {
-            str(author.matriculation-number) + ", " + author.course
-            linebreak()
-          },
-        ),
       
-        [Company, Supervisor:],
-        par(
-          leading: 0.5em,
-          for author in config.authors {
-            author.company + ", " + author.supervisor
-            linebreak()
-          },
-        ),
+      [*Author:*],
+      author.name,
+
+      [*Editing period:*],
+      thesis.timeframe,
+
+      [*Matriculation number, course:*],
+      str(author.matriculation-number) + ", " + author.course,
+
+      [*Training company:*],
+      author.company,
+
+      [*Company supervisor:*],
+      author.supervisor,
+
+      [*Submission date:*],
+      thesis.submission-date
     )
   ] else [
     #context panic("no translation for language: ", text.lang)
   ]
 
-    #align(
-      bottom,
+  #align(bottom,
     grid(
       // set width of columns
       // we need two, so make both half the page width
@@ -161,9 +121,7 @@
           #context panic("no translation for language: ", text.lang)
         ]
       ),
-      align(right, {line(length: 6cm)})),
-    )
+      align(right, {line(length: 6cm)})))
 
   #counter(page).update(0)
-  ]
-)
+]

src/style.typ

@@ -12,13 +12,7 @@
 #let watermark-color = luma(50%).transparentize(70%) 
 
 #let watermark-pattern = pattern(size: (5pt, 5pt))[
-  #place(
-    line(
-      start: (50%, 0%),
-      end: (50%, 100%),
-      stroke: (paint: watermark-color, thickness: 3pt),
-    ),
-  )
+  #place(line(start: (50%, 0%), end: (50%, 100%), stroke: (paint: watermark-color, thickness: 3pt)))
 ]
 
 #let watermark(config) = if config.draft {
@@ -26,8 +20,7 @@
     #rect(
     radius: 1em,
     inset: 1em,
-      stroke: watermark-color,
-    )[
+    stroke: watermark-color)[
       #text(size: 4em, weight: "bold", fill: watermark-pattern, "DRAFT")
       #linebreak()
       #text(size: 1.25em, weight: "bold", fill: watermark-color)[
@@ -35,17 +28,13 @@
         #linebreak()
         document version.
         #linebreak()
-        #text(
-          size: 0.75em,
-          "Further usage without the authors consent is not permitted.",
-        )]]]
+        #text(size: 0.75em, "Further usage without the authors consent is not permitted.")]]]}
+
+#let numberingH(c)={
+  return numbering(c.numbering,..counter(heading).at(c.location()))
 }
 
-#let numberingH(c) = {
-  return numbering(c.numbering, ..counter(heading).at(c.location()))
-}
-
-#let currentH(level: 1) = {
+#let currentH(level: 1)={
   let elems = query(selector(heading.where(level: level)).after(here()))
 
   if elems.len() != 0 and elems.first().location().page() == here().page() {
@@ -70,24 +59,15 @@
     hyphenate: true,
     dir: ltr,
     font: style.text.font,
-    fill: ABB-BLACK,
-  )
+    fill: ABB-BLACK)
 
   show heading: set text(
     font: style.heading.font,
-    weight: "bold",
-  )
+    weight: "semibold")
 
-  let header-supplement = if config.lang == "de" {
-    "Kapitel"
-  } else {
-    "chapter"
-  }
-
-  set heading(supplement: [#header-supplement])
+  set heading(supplement: [chapter])
 
   set math.equation(numbering: "(1)")
-  show math.equation: set text(font: "Fira Math", size: 12pt)
 
   // Set header spacing
   show heading.where(level: 1): it => v(2em) + it + v(1em)
@@ -95,59 +75,38 @@
   show heading.where(level: 3): it => v(0.5em) + it + v(0.25em)
 
   // set theme for code blocks
-  set raw(tab-size: style.code.tab-size)
-  show raw.where(block: false): it => box(
-    stroke: 1pt + ABB-GRAY-05,
-    radius: 2pt,
-    inset: (left: 2pt, right: 2pt),
-    outset: (top: 4pt, bottom: 4pt),
-    fill: ABB-GRAY-06,
-    text(font: style.code.font, size: style.code.size, it.text),
-  )
+  set raw(
+    tab-size: style.code.tab-size,
+    theme: style.code.theme)
+  show raw: set text(font: style.code.font, size: style.code.size)
   show figure.where(kind: raw): it => align(left)[
     #let content = it.body
-    #let lang = if content.has("lang") {
-      it.body.lang
-    } else {
-      none
-    }
     #block(
         width: 100%,
         fill: ABB-GRAY-06,
-      stroke: 1pt + ABB-GRAY-05,
+        stroke: none,
         radius: 0.5em,
         inset: 0.75em,
         clip: false,
         {
           let (columns, align, make_row) = {
-          if style.code.lines {
-            (
+            if style.code.lines {(
               (auto, 1fr),
               (right + top, left),
               e => {
                 let (i, l) = e
                 let n = i + 1
-                let n_str = if (calc.rem(n, 1) == 0) or (true and i == 0) {
-                  text(
-                    font: style.code.font,
-                    size: style.code.size,
-                    fill: ABB-BLACK,
-                    str(n),
-                  )
-                } else {
-                  none
+                let n_str = if (calc.rem(n, 1) == 0) or (true and i == 0) { text(font: style.code.font, size: style.code.size, fill: ABB-BLACK, str(n)) } else { none }
+                (n_str + h(0.5em), raw(lang: content.lang, l))
+              })
             }
-                (n_str + h(0.5em), raw(block: true, lang: lang, l))
-              },
-            )
-          } else {
-            (
-              (1fr,),
-              (left,),
+            else {
+                  ( ( 1fr, ),
+                    ( left, ),
                     e => {
                       let (i, l) = e
-                raw(block: true, lang: lang, l)
-              },
+                      raw( lang:content.lang, l)
+                    }
                   )
               }
           }
@@ -165,13 +124,9 @@
                   .enumerate()
                   .map(make_row)
                   .flatten()
-            .map(c => if c.has("text") and c.text == "" {
-            v(1em)
-          } else {
-            c
-          })
+                  .map(c => if c.has("text") and c.text == "" { v(1em) } else { c })
           )
-      },
+      }
     )
     #v(-1em)
     #align(center + top, it.caption)
@@ -183,8 +138,8 @@
   // based on: https://github.com/typst/typst/discussions/3871
   show figure.caption: c => [
     #if c.body.fields().len() > 0 {
-      text(weight: "medium")[
-        #c.supplement #context c.counter.display("1.1.1")
+      text(weight: "semibold")[
+        #c.supplement #c.counter.display("1.1.1")
       ]
       c.separator
     }
@@ -208,20 +163,8 @@
     stroke: (x, y) => (
       left: none,
       right: none,
-      top: if y == 0 {
-        1.5pt
-      } else if y < 2 {
-        1pt
-      } else {
-        0.5pt
-      },
-      bottom: if y == 0 {
-        1pt
-      } else {
-        1.5pt
-      },
-    ),
-  )
+      top: if y == 0 { 1.5pt } else if y < 2 { 1pt } else { 0.5pt },
+      bottom: if y == 0 { 1pt } else { 1.5pt } ))
 
   // make table header bold
   show table.cell.where(y: 0): set text(weight: "bold")
@@ -230,8 +173,7 @@
   set par(
     justify: true,
     first-line-indent: 1em,
-    leading: 1em,
-  )
+    leading: 1em)
 
   // give links a color
   show link: set text(fill: style.link.color)
@@ -244,26 +186,17 @@
     header-ascent: style.header.content-padding,
     footer-descent: style.header.content-padding,
     margin: (
-      top: style.page.margin.top + style.header.underline-top-padding + style
-        .header
-        .content-padding,
+      top: style.page.margin.top + style.header.underline-top-padding + style.header.content-padding,
       bottom: style.page.margin.bottom + style.footer.content-padding,
       left: style.page.margin.left,
-      right: style.page.margin.right,
-    ),
+      right: style.page.margin.right),
     numbering: (..nums) => {
       let current-page = here().page()
-      if current-page == 1 {
+      if current-page == 1{
         []
-      } else if query(<end-of-prelude>)
-        .first()
-        .location()
-        .page() > current-page {
+      } else if query(<end-of-prelude>).first().location().page() > current-page {
         numbering("I", nums.pos().first())
-      } else if query(<end-of-content>)
-        .first()
-        .location()
-        .page() >= current-page {
+      } else if query(<end-of-content>).first().location().page() >= current-page {
         numbering("1", nums.pos().first())
       } else {
         numbering("a", nums.pos().first())
@@ -280,11 +213,7 @@
         set align(center)
         numbering("I", page-counter)
       } else if query(<end-of-content>).first().location().page() >= page-number {
-        numbering(
-          "1 / 1",
-          page-counter,
-          counter(page).at(<end-of-content>).last(),
-        )
+        numbering("1 / 1", page-counter, counter(page).at(<end-of-content>).last())
       } else {
         numbering("a", page-counter)
       }
@@ -294,15 +223,17 @@
       let current-page = here().page()
 
       if current-page == 1 {
-        // logo moved to content
+        // logo of ABB and DHBW
+        grid(
+          // set width of columns
+          // we need two, so make both half the page width
+          columns: (50%, 50%),
+          // left align logo of ABB
+          align(left, image("res/ABB.svg", height: style.header.logo-height)),
+          // right align logo of DHBW
+          align(right, image("res/DHBW.svg", height: style.header.logo-height)))
 
-      } else if query(<end-of-content>)
-        .first()
-        .location()
-        .page() >= current-page and query(<end-of-prelude>)
-        .first()
-        .location()
-        .page() < current-page + 1 {
+      } else if query(<end-of-content>).first().location().page() >= current-page and query(<end-of-prelude>).first().location().page() < current-page + 1 {
         let heading = currentH()
 
         heading.at(0)
@@ -315,8 +246,7 @@
         v(style.header.underline-top-padding - 1em)
         line(length: 100%)
       }
-    },
-  )
+    })
 
   body
 }

template/appendix.typ

@@ -7,6 +7,3 @@
 == More raw data 
 
 #lorem(50)
-
-#figure(```
-```)

template/glossary.yml

@@ -7,7 +7,3 @@ oidc:
 potato:
   short: potato
   desc: "#lorem(50)"
-
-HTTP:
-  short: HTTP
-  long: Hyper Text Transfer Protocol

template/main.typ

@@ -3,8 +3,8 @@
 #import "abstract.typ": abstract, summary
 
 #show: dhbw-template.with((
-  lang: "de",
-  region: "de",
+  lang: "en",
+  region: "en",
   draft: false,
   author: (
     name: "Sven Vogel",
@@ -15,8 +15,7 @@
     university: "DHBW Mannheim",
     company: "ABB AG",
     supervisor: "Benny Goodman",
-    matriculation-number: 123456789,
-  ),
+    matriculation-number: 123456789),
   thesis: (
     title: "Unofficial ABB/DHBW Typst template",
     subtitle: "for reports and thesises",
@@ -26,17 +25,10 @@
     summary: summary,
     abstract: abstract,
     preface: include "preface.typ",
-    keywords: ("IT", "other stuff"),
+    keywords: ( "IT", "other stuff" ),
     bibliography: bibliography("refs.bib"),
     glossary: yaml("glossary.yml"),
-    appendices: include "appendix.typ",
-  ),
-  style: (
-    header: (
-      logo-image: ""
-    )
-  )
-))
+    appendices: include "appendix.typ")))
 
 #import "@preview/wrap-it:0.1.0": wrap-content
 
@@ -56,27 +48,21 @@
 #lorem(200)
 @einstein
 
-= Lorem Ipsum 3 <sec:hello>
+= Lorem Ipsum 3
 
-#lorem(15) t `Hello, World!` #lorem(50)
+#lorem(15)
 
 $
   angle.l a, b angle.r &= arrow(a) dot arrow(b) \
                        &= a_1 b_1 + a_2 b_2 + ... a_n b_n \
-  &= sum_(i=1)^n a_i b_i. \
-  integral_2^4(3x + 4x^2)
+                       &= sum_(i=1)^n a_i b_i.
 $
 
 #lorem(140)
 
 #wrap-content(
   figure(image("assets/digitaldog.jpg", width: 200pt), caption: [ Some image caption ]),
-  lorem(200),
-)
-
-#url("https://github.com", "text") @sec:hello
-
-#lorem(50)
+  lorem(200))
 
 #figure(
   table(
@@ -90,33 +76,29 @@ $
     [2023-03-18], [Yoga], [200],
     [2023-03-15], [Swimming], [400],
     [2023-03-17], [Weightlifting], [250],
-    [2023-03-18], [Yoga], [200],
-  ),
-  caption: [ Some table ],
-)
+    [2023-03-18], [Yoga], [200]),
+    caption: [ Some table ])
 
 #pagebreak()
 
 #lorem(100)
-#inline-color("#ff0000", "red") @HTTP
 
 #figure(
   ```rust
-  use std::env;
-  use std::fs::OpenOptions;
-  use std::io::Write;
+use std::env;
+use std::fs::OpenOptions;
+use std::io::Write;
 
-  fn main() {
+fn main() {
     println!("Hello, World!!!");
-  }
-  ```,
-  caption: [Some code],
-)
+}
+  ```, caption: [Some code])
 
 #lorem(100)
 
 #pagebreak()
 
+
 = Conclusion
 
 #lorem(320)

tests/invalid-config/test-case-1.typ

@@ -0,0 +1,29 @@
+
+#import "../../src/lib.typ": dhbw-template
+
+#show: dhbw-template.with(
+  config: (
+    lang: none,
+    region: "en",
+    author: (
+      name: "Sven Vogel",
+      semester: 4,
+      program: "Informationtechnology",
+      course: "TINF19IT1",
+      faculty: "Technik",
+      university: "DHBW Mannheim",
+      company: "ABB AG",
+      supervisor: "Benny Goodman",
+      matriculation-number: 123456789),
+    thesis: (
+      title: "Unofficial ABB/DHBW Typst template",
+      subtitle: "for reports and thesises",
+      submission-date: "23rd march 2020",
+      timeframe: "1st january 2020 - 20th march 2020",
+      kind: "T2000",
+      summary: none,
+      abstract: none,
+      keywords: ( "IT", "other stuff" ),
+      bibliography: none,
+      glossary: none,
+      appendices: none)))

tests/invalid-config/test-case-2.typ

@@ -0,0 +1,30 @@
+
+#import "../../src/lib.typ": dhbw-template
+
+#show: dhbw-template.with(
+  config: (
+    lang: "en",
+    this-key-is-not-in-config: "Ha Ha",
+    region: "en",
+    author: (
+      name: "Sven Vogel",
+      semester: 4,
+      program: "Informationtechnology",
+      course: "TINF19IT1",
+      faculty: "Technik",
+      university: "DHBW Mannheim",
+      company: "ABB AG",
+      supervisor: "Benny Goodman",
+      matriculation-number: 123456789),
+    thesis: (
+      title: "Unofficial ABB/DHBW Typst template",
+      subtitle: "for reports and thesises",
+      submission-date: "23rd march 2020",
+      timeframe: "1st january 2020 - 20th march 2020",
+      kind: "T2000",
+      summary: none,
+      abstract: none,
+      keywords: ( "IT", "other stuff" ),
+      bibliography: none,
+      glossary: none,
+      appendices: none)))

tests/invalid-config/test-case-3.typ

@@ -0,0 +1,24 @@
+
+#import "../../src/lib.typ": dhbw-template
+
+#show: dhbw-template.with(
+  config: (
+    lang: "en",
+    region: "en",
+    author: (
+      university: "DHBW Mannheim",
+      company: "ABB AG",
+      supervisor: none,
+      matriculation-number: 123456789),
+    thesis: (
+      title: "Unofficial ABB/DHBW Typst template",
+      subtitle: "for reports and thesises",
+      submission-date: "23rd march 2020",
+      timeframe: "1st january 2020 - 20th march 2020",
+      kind: "T2000",
+      summary: none,
+      abstract: none,
+      keywords: ( "IT", "other stuff" ),
+      bibliography: none,
+      glossary: none,
+      appendices: none)))

tests/local-import/main.typ

@@ -0,0 +1,29 @@
+
+#import "../../src/lib.typ": dhbw-template
+
+#show: dhbw-template.with(
+  config: (
+    lang: "en",
+    region: "en",
+    author: (
+      name: "Sven Vogel",
+      semester: 4,
+      program: "Informationtechnology",
+      course: "TINF19IT1",
+      faculty: "Technik",
+      university: "DHBW Mannheim",
+      company: "ABB AG",
+      supervisor: "Benny Goodman",
+      matriculation-number: 123456789),
+    thesis: (
+      title: "Unofficial ABB/DHBW Typst template",
+      subtitle: "for reports and thesises",
+      submission-date: "23rd march 2020",
+      timeframe: "1st january 2020 - 20th march 2020",
+      kind: "T2000",
+      summary: none,
+      abstract: none,
+      keywords: ( "IT", "other stuff" ),
+      bibliography: none,
+      glossary: none,
+      appendices: none)))

typst.toml

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