ci: remove run condition for CI on push on main

.gitea/workflows/ci.yml

@@ -1,13 +1,7 @@
 name: Build'n check
 run-name: Performing Typst compilation
 on:
-  pull_request:
-      branches:
-        - main
   push:
-    branches-ignore:
-      - main
-
 jobs:
   run-ci-linux:
     runs-on: ubuntu-latest
@@ -15,8 +9,7 @@ jobs:
     # push with commit containing "Run-Checks"
     if: >
       (contains(github.event.head_commit.message, 'Run-Checks') &&
-      github.event_name == 'push') ||
+      github.event_name == 'push')
-      github.event_name == 'pull_request'
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3

.gitea/workflows/prepare.yml

@@ -1,55 +0,0 @@
-name: Create Release Commit
-on:
-  push:
-    branches:
-      - main
-    tags-ignore:
-      - v*.*.*
-jobs:
-  prepare:
-    runs-on: ubuntu-latest
-    if: contains(github.event.head_commit.message, 'Release-As:')
-    env:
-      USERNAME: servostar
-      EMAIL: sven.vogel123@web.de
-      GIT_AUTH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-      COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-        with:
-          ref: 'main'
-          token:  ${{ secrets.RELEASE_TOKEN }}
-      - 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: Setup Git
-        run: |
-          git config --global user.name "${USERNAME}"
-          git config --global user.email "${EMAIL}"
-      - name: Update Typst.toml
-        run: |
-          export VERSION=$(echo "${COMMIT_MESSAGE}" | grep -Po '(?<=Release-As: )v\d+\.\d+\.\d+')
-          sed -i "/version/c\version = \"${VERSION#v}\"" typst.toml
-          git add typst.toml
-          git commit -m "chore: bump release version to $VERSION" -m "Generated-By: ${{ gitea.actor }}"
-      - name: Generate Example Document
-        run: nix-shell --run ./run-ci.sh
-      - name: Generate Assets
-        if: contains(github.event.head_commit.message, 'Generate-Assets')
-        run: |
-          ./run-bake-assets.sh
-          git add assets/banner.png
-          git add assets/page-preview.png
-          git commit -m "chore: update assets" -m "Generated-By: ${{ gitea.actor }}"
-      - name: Tag and Push Changes
-        run: |
-          git push origin main
-          export VERSION=$(echo "${COMMIT_MESSAGE}" | grep -Po '(?<=Release-As: )v\d+\.\d+\.\d+')
-          git tag -m "Release" "${VERSION}"
-          git push origin "${VERSION}"

.gitea/workflows/release.yml

@@ -1,8 +1,10 @@
-name: Create Release
+name: Build'n check
 on:
-  push:
+  pull_request:
-    tags:
+    branches:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - main
+    types:
+      - closed
 jobs:
   build:
     name: Check Template and Build example
@@ -37,6 +39,9 @@ jobs:
   release:
     runs-on: ubuntu-latest
     needs: build
+    if: contains(github.event.head_commit.message, 'Release-As:')
+    env:
+      USERNAME: servostar
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -54,6 +59,14 @@ jobs:
         run: echo ${{ steps.download.outputs.download-path }}
       - name: Prepare Release
         run: echo ${{ github.sha }} > Release.txt
+      - name: Tag Release Commit
+        run: |
+          echo ${{github.event.head_commit.message}} | grep -Po '(?<=Release-As: )v\d+\.\d+\.\d+' > Version.txt
+          echo "==> Tagging for version: $(cat Version.txt)"
+          git config --global credential.helper store
+          echo "https://${USERNAME}:${{secrets.RELEASE_TOKEN}}}@${{github.repositoryUrl}}" > ~/.git-credentials
+          git tag -m "Release" $(cat Version.txt)
+          git push ${{github.repositoryUrl}} $(cat Version.txt)
       - name: Create release
         id: create-release
         uses: https://gitea.com/actions/release-action@main
@@ -61,5 +74,6 @@ jobs:
           files: |-
             Example.pdf
             Release.txt
+            Version.txt
             LICENSE
           api_key: '${{secrets.RELEASE_TOKEN}}'

.github/workflows/release.yml

@@ -1,10 +1,10 @@
 name: Build'n check
+
 on:
   push:
     branches:
       - main
-    tags:
+
-      - 'v[0-9]+.[0-9]+.[0-9]+'
 jobs:
   build:
     name: Check Template and Build example
@@ -24,7 +24,7 @@ jobs:
           nix-shell --run ./run-ci.sh
       - name: Upload artifact
         id: artifact-upload
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: example-document
           path: ${{ github.workspace }}/example.pdf
@@ -47,7 +47,7 @@ jobs:
           go-version: '>=1.20.1'
       - name: Download Artifcat
         id: download
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: example-document
           path: ${{ github.workspace }}/Example.pdf

.gitignore

@@ -1,3 +1,2 @@
 *.pdf
 *.log
-images/

CONTRIBUTING.md

@@ -1,17 +0,0 @@
-# Contributing
-
-Development of this template happens at
-[git.montehaselino.de](https://git.montehaselino.de/DHBW/dhbw-abb-typst-template).
-For this reason pull request opened at any mirror such as on GitHub, will not be
-merged as this would compromise the push mirror.
-
-Pull requests shall be opened exclusively in the official
-[repository](https://git.montehaselino.de/DHBW/dhbw-abb-typst-template).
-Issues may be created at GitHub or the official repository.
-Beware, that linked pull requests and issues in commits messages refer to those
-in the official instance and may be broken or invalid on mirrors such as GitHub.
-
-Direct pushes to the `main` branch are discouraged. In order to make a change
-create a new pull request and wait for a maintainer to merge it. Note that in
-order to be able to merge, the continuous integration pipeline must run
-successfully.

README.md

@@ -2,7 +2,7 @@
 <div align="center">
     <h1>DHBW-ABB template for Typst</h1>
     <img src="https://img.shields.io/gitea/last-commit/dhbw/dhbw-abb-typst-template?gitea_url=https%3A%2F%2Fgit.montehaselino.de">
-    <img src="https://img.shields.io/github/actions/workflow/status/Servostar/dhbw-abb-typst-template/release.yml?label=build">
+    <img src="https://img.shields.io/github/actions/workflow/status/Servostar/dhbw-abb-typst-template/ci.yml?label=build">
     <img src="https://img.shields.io/gitea/v/release/dhbw/dhbw-abb-typst-template?gitea_url=https%3A%2F%2Fgit.montehaselino.de&display_name=release">
     <img src="https://img.shields.io/badge/license-MIT-ff0000">
     <img src="https://img.shields.io/badge/Typst-2B9CB0">

baker/banner.typ

@@ -1,59 +0,0 @@
-#import "@preview/shadowed:0.1.2": shadowed
-
-#let LE = 10cm
-#let shadow = 0.25cm
-
-#set page(margin: 0pt, width: 2 * LE, height: LE, fill: rgb(0, 0, 0, 0))
-
-#place(
-  dx: 3cm,
-  dy: 1.1cm,
-  rotate(
-    -9deg,
-    shadowed(
-      radius: 0pt,
-      inset: 0pt,
-      blur: shadow,
-      image("./images/21.svg", height: LE * 0.6))))
-
-#place(
-  dx: 1cm,
-  dy: 3.25cm,
-  rotate(
-    -20deg,
-    shadowed(
-      radius: 0pt,
-      inset: 0pt,
-      blur: shadow,
-      image("./images/51.svg", height: LE * 0.55))))
-
-#place(
-  dx: 14cm,
-  dy: 1.5cm,
-  rotate(
-    6deg,
-    shadowed(
-      radius: 0pt,
-      inset: 0pt,
-      blur: shadow,
-      image("./images/41.svg", height: LE * 0.65))))
-
-#place(
-  dx: 11cm,
-  dy: 2cm,
-  rotate(
-    25deg,
-    shadowed(
-      radius: 0pt,
-      inset: 0pt,
-      blur: shadow,
-      image("./images/31.svg", height: LE * 0.6))))
-
-#place(
-  dx: 7cm,
-  dy: 0.75cm,
-  shadowed(
-    radius: 0pt,
-    inset: 0pt,
-    blur: shadow,
-    image("./images/11.svg", height: LE * 0.75)))

baker/preview.typ

@@ -1,34 +0,0 @@
-
-#let gap = 0.5cm
-
-#set page(margin: 0pt, width: 210mm * 3 + 2 * gap, height: 297mm * 2 + gap, fill: rgb(0, 0, 0, 0))
-
-#place(
-  dx: 0mm,
-  dy: 0mm,
-    image("./images/11.svg", height: 297mm))
-
-#place(
-  dx: 210mm + gap,
-  dy: 0mm,
-    image("./images/21.svg", height: 297mm))
-
-#place(
-  dx: (210mm + gap) * 2,
-  dy: 0mm,
-    image("./images/31.svg", height: 297mm))
-
-#place(
-  dx: 210mm * 0,
-  dy: 297mm + gap,
-    image("./images/71.svg", height: 297mm))
-
-#place(
-  dx: (210mm + gap) * 1,
-  dy: 297mm + gap,
-    image("./images/41.svg", height: 297mm))
-
-#place(
-  dx: (210mm + gap) * 2,
-  dy: 297mm + gap,
-    image("./images/51.svg", height: 297mm))

baker/run-bake-banner.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-echo "==> generate images"
-mkdir images || true
-
-# extract images from document created by action
-mutool convert -o images/1.svg "$1" 1
-mutool convert -o images/2.svg "$1" 2
-mutool convert -o images/2.svg "$1" 2
-mutool convert -o images/3.svg "$1" 5
-mutool convert -o images/7.svg "$1" 7
-mutool convert -o images/4.svg "$1" 15
-mutool convert -o images/5.svg "$1" 16
-
-echo "==> generate banner"
-typst compile banner.typ --ppi 360 ../assets/banner.png
-echo "==> generate preview"
-typst compile preview.typ --ppi 360 ../assets/page-preview.png

baker/shell.nix

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

run-bake-assets.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-cd baker
-
-echo "==> generate assets"
-nix-shell --run "./run-bake-banner.sh ../example.pdf"

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/branding.typ

@@ -3,16 +3,16 @@
 //  https://brand.abb/portal/en/branding-principles/basic-brand-elements/color
 
 // ABB branding colors
-#let ABB-RED = rgb(255, 0, 13)
+#let ABB-RED = cmyk(0%, 100%, 95%, 0%)
-#let ABB-BLACK = rgb(0, 0, 0)
+#let ABB-BLACK = cmyk(0%, 0%, 0%, 100%)
-#let ABB-GRAY-01 = rgb(25, 25, 25)
+#let ABB-GRAY-01 = cmyk(0%, 0%, 0%, 90%)
-#let ABB-GRAY-02 = rgb(64, 64, 64)
+#let ABB-GRAY-02 = cmyk(0%, 0%, 0%, 75%)
-#let ABB-GRAY-03 = rgb(115, 115, 115)
+#let ABB-GRAY-03 = cmyk(0%, 0%, 0%, 55%)
-#let ABB-GRAY-04 = rgb(166, 166, 166)
+#let ABB-GRAY-04 = cmyk(0%, 0%, 0%, 35%)
-#let ABB-GRAY-05 = rgb(217, 217, 217)
+#let ABB-GRAY-05 = cmyk(0%, 0%, 0%, 15%)
-#let ABB-GRAY-06 = rgb(242, 242, 242)
+#let ABB-GRAY-06 = cmyk(0%, 0%, 0%, 5%)
-#let ABB-WHITE = rgb(255, 255, 255)
+#let ABB-WHITE = cmyk(0%, 0%, 0%, 0%)
 // ABB branding functinal colors
-#let ABB-BLUE = rgb(0, 101, 210)
+#let ABB-BLUE = cmyk(100%, 53%, 2%, 16%)
-#let ABB-GREEN = rgb(17, 184, 0)
+#let ABB-GREEN = cmyk(91%, 4%, 100%, 25%)
-#let ABB-YELLOW = rgb(255, 232, 0)
+#let ABB-YELLOW = cmyk(0%, 9%, 100%, 0%)

src/conf.typ

@@ -11,75 +11,78 @@
 
 // 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: (
+    authors: (
-      content-padding: 1.5em,
+      (
-    ),
+        name: "Sven Vogel",
-    page: (
+        course: "TINF19IT1",
-      format: "a4",
+        company: "ABB AG",
-      margin: (
+        supervisor: "Benny Goodman",
-        left: 3cm,
+        matriculation-number: 123456789
-        right: 2.5cm,
+      ),
-        top: 2.5cm,
+      (
-        bottom: 2.5cm,
+        name: "Kurt Jammer",
+        course: "TINF24AI2",
+        company: "Siemens",
+        supervisor: "Henry Badman",
+        matriculation-number: 478568763
       ),
     ),
-    text: (
+    // information about thesis
-      size: 12pt,
+    thesis: (
-      font: "Fira Sans",
+      title: "Unofficial ABB/DHBW Typst template",
-    ),
+      subtitle: "for reports and thesises",            // subtitle may be none
-    heading: (
+      submission-date: "23rd march 2020",
-      font: "Fira Sans",
+      timeframe: "1st january 2020 - 20th march 2020",
-    ),
+      kind: "T2000",
-    code: (
+      // translated version of abstract, only used in case language is not english
-      theme: "res/abb.tmTheme",
+      summary: none,
-      font: "FiraCode Nerd Font",
+      abstract: none,
-      lines: false,
+      preface: none,
-      size: 10pt,
+      keywords: ( "IT", "other stuff" ),
-      tab-size: 4,
+      bibliography: none /* bibliography("refs.bib") */,
-    ),
+      glossary: none,
-    link: (
+      appendices: none),
-      color: ABB-GRAY-02,
+    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)))
 
 // Insert a dictionary `update` into `base` but only the entries of update that also exist in base
 // Runs recursively on all sub dictionaries
@@ -98,21 +101,12 @@
 
       if type(val) == array {
         // ignore checking arraay
-        base.insert(key, update_val)
       } else 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)
       } else {
-        panic(
+        panic("missmatched dictionary entry `" + key + "` type: expected `" + type(val) + "` got `" + type(update_val) + "`")
-          "missmatched dictionary entry `"
-            + key
-            + "` type: expected `"
-            + type(val)
-            + "` got `"
-            + type(update_val)
-            + "`",
-        )
       }
     } else {
       base.insert(key, val)

src/glossarium.typ

@@ -59,13 +59,8 @@ SOFTWARE.*/
       let textLink = if display != none {
         [#display]
       } else if (
-        (
+        is_first or long == true
-          is_first or long == true
+      ) and entlong != [] and entlong != "" and long != false {
-        )
-          and entlong != []
-          and entlong != ""
-          and long != false
-      ) {
         [#entlong (#entry.short#suffix)]
       } else {
         [#entry.short#suffix]
@@ -113,13 +108,8 @@ SOFTWARE.*/
       }
 
       let textLink = if (
-        (
+        is_first or long == true
-          is_first or long == true
+      ) and entlong != [] and entlong != "" and long != false {
-        )
-          and entlong != []
-          and entlong != ""
-          and long != false
-      ) {
         [#entlong (#short)]
       } else {
         [#short]
@@ -138,11 +128,9 @@ SOFTWARE.*/
 // show rule to make the references for glossarium
 #let make-glossary(body) = {
   show ref: r => {
-    if (
+    if r.element != none and r.element.func() == figure and r
-      r.element != none
+      .element
-        and r.element.func() == figure
+      .kind == __glossarium_figure {
-        and r.element.kind == __glossarium_figure
-    ) {
       // call to the general citing function
       gls(str(r.target), suffix: r.citation.supplement)
     } else {
@@ -209,7 +197,6 @@ SOFTWARE.*/
                   #let hasLong = long != "" and long != []
                   #let hasDesc = desc != "" and desc != []
 
-                  #set align(left)
                   #block(
                     below: 1.5em,
                     width: 100%,
@@ -242,15 +229,16 @@ SOFTWARE.*/
                             )
                             .values
                             .map(x => {
-                              let page-numbering = x.page-numbering()
+                                let page-numbering = x.page-numbering()
-                              if page-numbering == none {
+                                if page-numbering == none {
-                                page-numbering = "1"
+                                  page-numbering = "1"
+                                }
+                                link(x)[#numbering(
+                                    page-numbering,
+                                    ..counter(page).at(x),
+                                  )]
                               }
-                              link(x)[#numbering(
+                            )
-                                  page-numbering,
-                                  ..counter(page).at(x),
-                                )]
-                            })
                             .join(", ")
                         }
                       ],

src/glossary.typ

@@ -8,6 +8,7 @@
 // License: MIT
 
 #let glossary(entries, config) = {
+
   assert(
     type(entries) == dictionary,
     message: "The glossary is not a dictionary",
@@ -43,18 +44,14 @@
     if "desc" in v {
       assert(
         type(v.desc) == str,
-        message: "The description of glossary entry `"
+        message: "The description of glossary entry `" + k + "` is not a string",
-          + k
-          + "` is not a string",
       )
     }
 
     if "group" in v {
       assert(
         type(v.group) == str,
-        message: "The optional group of glossary entry `"
+        message: "The optional group of glossary entry `" + k + "` is not a string",
-          + k
-          + "` is not a string",
       )
     } else {
       let acronym_group = if config.lang == "de" {
@@ -93,13 +90,11 @@
     }
   }
 
-  return processed_glossary
+  return processed_glossary.pairs().map(((key, entry)) => (
-    .pairs()
+    key: key,
-    .map(((key, entry)) => (
+    short: entry.short,
-      key: key,
+    long: eval(entry.at("long", default: ""), mode: "markup"),
-      short: entry.short,
+    desc: eval(entry.at("desc", default: ""), mode: "markup"),
-      long: eval(entry.at("long", default: ""), mode: "markup"),
+    group: entry.at("group", default: ""),
-      desc: eval(entry.at("desc", default: ""), mode: "markup"),
+  ))
-      group: entry.at("group", default: ""),
-    ))
 }

src/lib.typ

@@ -122,29 +122,17 @@
 
     #metadata("content terminate") <end-of-content>
 
-    #end_styled(
+    #end_styled(config)[
-      config,
+      // add bibliography if set
-      context [
+      #if "bibliography" in config.thesis and config.thesis.bibliography != none {
-        // add bibliography if set
+        pagebreak(weak: true)
-        #if (
+        counter(page).update(1)
-          "bibliography" in config.thesis and config.thesis.bibliography != none
+        set bibliography(style: "ieee")
-        ) {
+        config.thesis.bibliography
-          pagebreak(weak: true)
+      }
-          counter(page).update(1)
-          set bibliography(
-            style: "ieee",
-            title: if (text.lang == "de") {
-              "Literaturverzeichnis"
-            } else if text.lang == "en" {
-              "Bibliography"
-            },
-          )
-          config.thesis.bibliography
-        }
 
-        // appendix
+      // appendix
-        #show-appendix(config: config)
+      #show-appendix(config: config)
-      ],
+    ]
-    )
   ]
 ]

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
@@ -50,24 +51,13 @@
     set align(horizon)
 
     grid(
-      // set width of columns
+    // set width of columns
-      // we need two, so make both half the page width
+    // we need two, so make both half the page width
-      columns: (50%, 50%),
+    columns: (50%, 50%),
-      row-gutter: 0.75em,
+    row-gutter: 0.75em,
-      align(left, { line(length: 6cm) }),
+    align(left, {line(length: 6cm)}),
-      align(left, { line(length: 6cm) }),
+    align(left, {line(length: 6cm)}),
-      align(
+    align(left, if text.lang == "de" [ Ort, Datum ] else if text.lang == "en" [ Place, Date ] else { panic("no translation for language: ", text.lang) }),
-        left,
+    align(left, if text.lang == "de" [ Unterschrift ] else if text.lang == "en" [ Signature ] else { panic("no translation for language: ", text.lang) }))
-        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

@@ -8,6 +8,7 @@
 
 #let new_declaration_of_authorship(config) = (
   context {
+
     pagebreak(weak: true)
 
     let thesis = config.thesis
@@ -52,24 +53,13 @@
     set align(horizon)
 
     grid(
-      // set width of columns
+    // set width of columns
-      // we need two, so make both half the page width
+    // we need two, so make both half the page width
-      columns: (50%, 50%),
+    columns: (50%, 50%),
-      row-gutter: 0.75em,
+    row-gutter: 0.75em,
-      align(left, { line(length: 6cm) }),
+    align(left, {line(length: 6cm)}),
-      align(left, { line(length: 6cm) }),
+    align(left, {line(length: 6cm)}),
-      align(
+    align(left, if text.lang == "de" [ Ort, Datum ] else if text.lang == "en" [ Place, Date ] else { panic("no translation for language: ", text.lang) }),
-        left,
+    align(left, if text.lang == "de" [ Unterschrift ] else if text.lang == "en" [ Signature ] else { panic("no translation for language: ", text.lang) }))
-        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

@@ -12,18 +12,16 @@
 // 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()
 
     show outline.entry: it => {
       link(it.element.location())[
         #v(12pt, weak: true)
-        #it.prefix()
+        #text(weight: "regular", it.body)
-        #[:]
-        #h(0.5em)
-        #text(weight: "regular", it.body())
         #box(width: 1fr, it.fill)
-        #[ #it.page()]
+        #[ #it.page]
       ]
     }
 
@@ -125,14 +123,9 @@
 #let new_outline() = {
   pagebreak(weak: true)
 
-  show outline.entry: it => {
+  show outline.entry.where(level: 1): it => {
-    if it.level == 1 {
+    v(1.5em, weak: true)
-      v(1.5em, weak: true)
+    strong(it)
-      strong(it)
-    } else {
-      v(1.0em, weak: true)
-      it
-    }
   }
 
   render_heading_outline()

src/pages/prerelease-note.typ

@@ -8,6 +8,7 @@
 
 #let new_prerelease_note(config) = (
   context {
+
     pagebreak(weak: true)
 
     let thesis = config.thesis
@@ -46,7 +47,7 @@
     if text.lang == "de" [
       handelt es sich _nicht_ um die fertige Fassung. Das Dokument kann Inhaltliche-, Grammatikalische- sowie Format-Fehler enthalten. Das Dokument ist im Rahmen der Aufgabenstellung von Seiten der #university.name nicht zur Bewertung freigegeben und ein anderer Verwendungszweck als eine Vorschau ist nicht gestattet.
     ] else if text.lang == "en" [
-      is not the final version. The document may contain errors in content, grammar and formatting. The document may not be released for evaluation to #config.university.name as part of the assignment, and any use other than a preview is not permitted.
+      is not the final version. The document may contain errors in content, grammar and formatting. The document may not be released for evaluation to #university.name as part of the assignment, and any use other than a preview is not permitted.
     ]
   }
 )

src/pages/titlepage.typ

@@ -21,27 +21,14 @@
       if config.style.header.logo-image == none {
         // error
       } else if config.style.header.logo-image.len() > 0 {
-        align(
+        align(left, image(config.style.header.logo-image, height: config.style.header.logo-height))
-          left,
-          image(
-            config.style.header.logo-image,
-            height: config.style.header.logo-height,
-          ),
-        )
       } else {
-        align(
+        align(left, image("../res/DHBW.svg", height: config.style.header.logo-height))
-          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(
+        align(right, image("../res/DHBW.svg", height: config.style.header.logo-height))
-          right,
+      })
-          image("../res/DHBW.svg", height: config.style.header.logo-height),
-        )
-      }
-    )
 
     #set align(center)
 
@@ -62,17 +49,9 @@
     // faculty
     #pad()[
       #if text.lang == "de" [
-        aus dem Studiengang #config.university.program
+        aus dem Studiengang #config.university.program | #config.university.faculty
       ] else if text.lang == "en" [
-        from the course of studies #config.university.program
+        from the course of studies #config.university.program | #config.university.faculty
-      ] else [
-        #context panic("no translation for language: ", text.lang)
-      ]
-
-      #if text.lang == "de" [
-        an der Fakultät #config.university.faculty
-      ] else if text.lang == "en" [
-        at the faculty of #config.university.faculty
       ] else [
         #context panic("no translation for language: ", text.lang)
       ]
@@ -89,19 +68,14 @@
       ]
       #config.university.name
       #linebreak()
-      #if text.lang == "de" [
-        in
-      ] else if text.lang == "en" [
-        in
-      ] else [
-        #context panic("no translation for language: ", text.lang)
-      ]
       #config.university.campus
     ]
 
-    #pad(top: 1.5em)[
+    #pad(top: 1em)[
       #let names = ()
-
+      #for author in config.authors {
+        names.push(author.name)
+      }
       #if text.lang == "de" [
         von
       ] else if text.lang == "en" [
@@ -109,62 +83,86 @@
       ] else [
         #context panic("no translation for language: ", text.lang)
       ]
-
+      #set text(size: 16pt)
-      #v(1.5em)
+      #grid(columns: 1, row-gutter: 1em, ..names)
-
-      #let rows = int(config.authors.len() / 3 + 0.5)
-
-      #for i in range(0, rows) {
-        let cols = calc.min(config.authors.len() - i * 3, 3)
-
-        grid(columns: cols, column-gutter: 1.5em, ..config
-            .authors
-            .slice(i * 3, i * 3 + cols)
-            .map(author => par([
-              #if author.at("name", default: none) != none {
-                text(size: 1.25em, author.name)
-                linebreak()
-              }
-              #if author.at("company", default: none) != none {
-                text(size: 1em, author.company)
-                linebreak()
-              }
-              #if author.at("contact", default: none) != none {
-                text(size: 1em, author.contact)
-                linebreak()
-              }
-              #str(author.matriculation-number), #author.course
-            ])))
-      }
     ]
 
-    #set align(bottom)
+    #pad(top: 1em)[
-
-    #pad(top: 1.5em)[
       #thesis.timeframe
     ]
 
-    #if config.supervisor-signature {
+    #set align(bottom + left)
-      align(
+
-        bottom,
+    #if text.lang == "de" [
-        grid(
+      #grid(
-          // set width of columns
+        columns: 2,
-          // we need two, so make both half the page width
+        column-gutter: 1cm,
-          columns: (60%, 40%),
+        row-gutter: 0.5cm,
-          align(
+        align: top + left,
-            left,
+        stroke: none,
-            if text.lang == "de" [
+        [Matrikelnummer, Kurs:],
-              Unterschrift des betrieblichen Betreuers
+        par(
-            ] else if text.lang == "en" [
+          leading: 0.5em,
-              Signature of the company supervisor
+          for author in config.authors {
-            ] else [
+            str(author.matriculation-number) + ", " + author.course
-              #context panic("no translation for language: ", text.lang)
+            linebreak()
-            ],
+          },
-          ),
+        ),
-          align(right, { line(length: 6cm) })
+
+        [Betrieb, Betreuer:],
+        par(
+          leading: 0.5em,
+          for author in config.authors {
+            author.company + ", " + author.supervisor
+            linebreak()
+          },
         ),
       )
-    }
+    ] else if text.lang == "en" [
+      #grid(
+        columns: 2,
+        column-gutter: 1cm,
+        row-gutter: 0.5cm,
+        align: top + 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()
+          },
+        ),
+      )
+    ] else [
+      #context panic("no translation for language: ", text.lang)
+    ]
+
+    #align(
+      bottom,
+      grid(
+      // set width of columns
+      // we need two, so make both half the page width
+      columns: (60%, 40%),
+      align(left, if text.lang == "de" [
+          Unterschrift des betrieblichen Betreuers
+        ] else if text.lang == "en" [
+          Signature of the company supervisor
+        ] else [
+          #context panic("no translation for language: ", text.lang)
+        ]
+      ),
+      align(right, {line(length: 6cm)})),
+    )
 
     #counter(page).update(0)
   ]

src/style.typ

@@ -166,10 +166,10 @@
             .map(make_row)
             .flatten()
             .map(c => if c.has("text") and c.text == "" {
-              v(1em)
+            v(1em)
-            } else {
+          } else {
-              c
+            c
-            })
+          })
         )
       },
     )
@@ -193,15 +193,13 @@
 
   // change the display supplement according to the text langugae
   // based on: https://github.com/typst/typst/issues/3273
-  show figure.where(kind: raw): set figure(
+  show figure.where(kind: raw): set figure(supplement: context {
-    supplement: context {
+    if text.lang == "de" {
-      if text.lang == "de" {
+      "Quelltext"
-        "Quelltext"
+    } else {
-      } else {
+      "Listing"
-        "Listing"
+    }
-      }
+  })
-    },
-  )
 
   // APA style table
   set table(
@@ -243,13 +241,12 @@
   set page(
     paper: style.page.format,
     foreground: watermark(config),
-    background: [#rect(width: 100%, height: 100%, fill: white)],
     header-ascent: style.header.content-padding,
     footer-descent: style.header.content-padding,
     margin: (
-      top: style.page.margin.top
+      top: style.page.margin.top + style.header.underline-top-padding + style
-        + style.header.underline-top-padding
+        .header
-        + style.header.content-padding,
+        .content-padding,
       bottom: style.page.margin.bottom + style.footer.content-padding,
       left: style.page.margin.left,
       right: style.page.margin.right,
@@ -258,13 +255,15 @@
       let current-page = here().page()
       if current-page == 1 {
         []
-      } else if (
+      } else if query(<end-of-prelude>)
-        query(<end-of-prelude>).first().location().page() > current-page
+        .first()
-      ) {
+        .location()
+        .page() > current-page {
         numbering("I", nums.pos().first())
-      } else if (
+      } else if query(<end-of-content>)
-        query(<end-of-content>).first().location().page() >= current-page
+        .first()
-      ) {
+        .location()
+        .page() >= current-page {
         numbering("1", nums.pos().first())
       } else {
         numbering("a", nums.pos().first())
@@ -277,14 +276,10 @@
 
       #if page-number == 1 {
         []
-      } else if (
+      } else if query(<end-of-prelude>).first().location().page() > page-number {
-        query(<end-of-prelude>).first().location().page() > page-number
-      ) {
         set align(center)
         numbering("I", page-counter)
-      } else if (
+      } else if query(<end-of-content>).first().location().page() >= page-number {
-        query(<end-of-content>).first().location().page() >= page-number
-      ) {
         numbering(
           "1 / 1",
           page-counter,
@@ -300,11 +295,14 @@
 
       if current-page == 1 {
         // logo moved to content
-      } else if (
+
-        query(<end-of-content>).first().location().page() >= current-page
+      } else if query(<end-of-content>)
-          and query(<end-of-prelude>).first().location().page()
+        .first()
-            < current-page + 1
+        .location()
-      ) {
+        .page() >= current-page and query(<end-of-prelude>)
+        .first()
+        .location()
+        .page() < current-page + 1 {
         let heading = currentH()
 
         heading.at(0)

template/main.typ

@@ -6,23 +6,16 @@
   lang: "de",
   region: "de",
   draft: false,
-  authors: (
+  author: (
-      (
+    name: "Sven Vogel",
-        name: "Sven Vogel",
+    semester: 4,
-        course: "TINF19IT1",
+    program: "Informationtechnology",
-        company: none,
+    course: "TINF19IT1",
-        supervisor: "Benny Goodman",
+    faculty: "Technik",
-        matriculation-number: 123456789,
+    university: "DHBW Mannheim",
-        contact: "sven.vogel123@web.de"
+    company: "ABB AG",
-      ),
+    supervisor: "Benny Goodman",
-      (
+    matriculation-number: 123456789,
-        name: "Sven Vogel",
-        course: "TINF19IT1",
-        company: "ABB AG",
-        supervisor: "Benny Goodman",
-        matriculation-number: 123456789,
-        contact: "sven.vogel123@web.de"
-      )
   ),
   thesis: (
     title: "Unofficial ABB/DHBW Typst template",
@@ -45,7 +38,7 @@
   )
 ))
 
-#import "@preview/wrap-it:0.1.1": wrap-content
+#import "@preview/wrap-it:0.1.0": wrap-content
 
 = Lorem Ipsum
 

typst.toml

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