chore: bump release version to v0.6.3

Generated-By: servostar

.gitea/workflows/prepare.yml

@@ -12,27 +12,44 @@ jobs:
     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: Tag Release Commit
-        env:
-          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
-          GIT_AUTH_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: |
-          export VERSION=$(echo "${COMMIT_MESSAGE}" | grep -Po '(?<=Release-As: )v\d+\.\d+\.\d+')
           git config --global user.name "${USERNAME}"
           git config --global user.email "${EMAIL}"
-          echo "==> Update typst.toml version"
+      - 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
-          echo "::endgroup::"
-          echo "::group::{Tag commit}"
+          export VERSION=$(echo "${COMMIT_MESSAGE}" | grep -Po '(?<=Release-As: )v\d+\.\d+\.\d+')
           git tag -m "Release" "${VERSION}"
           git push origin "${VERSION}"
-          echo "::endgroup::"

.gitignore

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

baker/banner.typ

@@ -0,0 +1,59 @@
+#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

@@ -0,0 +1,34 @@
+
+#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

@@ -0,0 +1,18 @@
+#!/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

@@ -0,0 +1,14 @@
+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

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

shell.nix

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

src/conf.typ

@@ -11,79 +11,75 @@
 
 // default configuration
 #let default-config = (
-    // 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"
+  // 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",
+  ),
+  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",
     ),
-    supervisor-signature: false,
-    authors: (
-      (
-        name: "Sven Vogel",
-        course: "TINF19IT1",
-        company: "ABB AG",
-        supervisor: "Benny Goodman",
-        matriculation-number: 123456789
-      ),
-      (
-        name: "Kurt Jammer",
-        course: "TINF24AI2",
-        company: "Siemens",
-        supervisor: "Henry Badman",
-        matriculation-number: 478568763
+    footer: (
+      content-padding: 1.5em,
+    ),
+    page: (
+      format: "a4",
+      margin: (
+        left: 3cm,
+        right: 2.5cm,
+        top: 2.5cm,
+        bottom: 2.5cm,
       ),
     ),
-    // 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: (
-        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)))
+    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
@@ -102,6 +98,7 @@
 
       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) {

src/glossary.typ

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

src/pages/abstract.typ

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

src/pages/confidentiality-statement.typ

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

src/pages/declaration-of-authorship.typ

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

src/pages/outline.typ

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

src/pages/prerelease-note.typ

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

src/pages/titlepage.typ

@@ -49,9 +49,17 @@
     // faculty
     #pad()[
       #if text.lang == "de" [
-        aus dem Studiengang #config.university.program | #config.university.faculty
+        aus dem Studiengang #config.university.program
       ] else if text.lang == "en" [
-        from the course of studies #config.university.program | #config.university.faculty
+        from the course of studies #config.university.program
+      ] 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)
       ]
@@ -68,14 +76,19 @@
       ]
       #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: 1em)[
+    #pad(top: 1.5em)[
       #let names = ()
-      #for author in config.authors {
-        names.push(author.name)
-      }
+
       #if text.lang == "de" [
         von
       ] else if text.lang == "en" [
@@ -83,70 +96,41 @@
       ] else [
         #context panic("no translation for language: ", text.lang)
       ]
-      #set text(size: 16pt)
-      #grid(columns: 1, row-gutter: 1em, ..names)
+
+      #v(1.5em)
+
+      #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
+          ])))
+      }
     ]
 
-    #pad(top: 1em)[
+    #set align(bottom)
+
+    #pad(top: 1.5em)[
       #thesis.timeframe
     ]
 
-    #set align(bottom + left)
-
-    #if text.lang == "de" [
-      #grid(
-        columns: 2,
-        column-gutter: 1cm,
-        row-gutter: 0.5cm,
-        align: top + 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()
-          },
-        ),
-      )
-    ] 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)
-    ]
-
     #if config.supervisor-signature {
       align(
         bottom,

src/style.typ

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

template/main.typ

@@ -6,16 +6,23 @@
   lang: "de",
   region: "de",
   draft: false,
-  author: (
-    name: "Sven Vogel",
-    semester: 4,
-    program: "Informationtechnology",
-    course: "TINF19IT1",
-    faculty: "Technik",
-    university: "DHBW Mannheim",
-    company: "ABB AG",
-    supervisor: "Benny Goodman",
-    matriculation-number: 123456789,
+  authors: (
+      (
+        name: "Sven Vogel",
+        course: "TINF19IT1",
+        company: none,
+        supervisor: "Benny Goodman",
+        matriculation-number: 123456789,
+        contact: "sven.vogel123@web.de"
+      ),
+      (
+        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",

typst.toml

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