src/glossarium.typ

@@ -40,7 +40,7 @@ SOFTWARE.*/
 
 // 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
@@ -80,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 {
@@ -93,7 +93,7 @@ SOFTWARE.*/
         [#entlongplural]
       }
        
-      let entplural = entry.at("plural", default: "")
+      let entplural = entry.at("plural", default: "");
       let short = if entplural == [] or entplural == "" {
         [#entry.short#suffix]
       } else {
@@ -187,10 +187,7 @@ SOFTWARE.*/
                         if hasLong and hasDesc [:]
                         if hasDesc [ #desc ] else [. ]
                         if disable-back-references != true {
-                        term_references
+                          term_references.map(x => x.location()).sorted(key: x => x.page()).fold(
-                          .map(x => x.location())
-                          .sorted(key: x => x.page())
-                          .fold(
                             (values: (), pages: ()),
                             ((values, pages), x) => if pages.contains(x.page()) {
                               (values: values, pages: pages)
@@ -199,19 +196,16 @@ SOFTWARE.*/
                               pages.push(x.page())
                               (values: values, pages: pages)
                             },
-                          )
+                          ).values.map(x => {
-                          .values
+                            let page-numbering = x.page-numbering();
-                          .map(x => {
-                              let page-numbering = x.page-numbering()
                               if page-numbering == none {
                                 page-numbering = "1"
                               }
                               link(x)[#numbering(page-numbering, ..counter(page).at(x))]
                             }
-                          )
+                          ).join(", ")
-                          .join(", ")
+                        }
                       }
-                    },
                     )
                   }
                 }
@@ -221,8 +215,6 @@ SOFTWARE.*/
         ]
       }
     }
-    if enable-group-pagebreak {
+    if enable-group-pagebreak { pagebreak(weak: true) }
-      pagebreak(weak: true)
-    }
   }
 };

src/glossary.typ

@@ -17,40 +17,34 @@
     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 group = if "long" in v {
             if (context text.lang) == "de" {
@@ -75,6 +69,6 @@
       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,38 +7,23 @@
 // Edited: 27.06.2024
 // License: MIT
 
-#import "conf.typ": validate-config, default-config
+  #import "conf.typ": validate-config
-#import "branding.typ": *
+  #import "branding.typ": *
-#import "style.typ": global_styled_doc, content_styled, end_styled
+  #import "style.typ": global_styled_doc, content_styled, end_styled
-#import "glossary.typ": glossary
+  #import "glossary.typ": glossary
-#import "pages/titlepage.typ": new_title_page
+  #import "pages/titlepage.typ": new_title_page
-#import "pages/declaration-of-authorship.typ": new_declaration_of_authorship
+  #import "pages/declaration-of-authorship.typ": new_declaration_of_authorship
-#import "pages/confidentiality-statement.typ": new_confidentiality_statement_page
+  #import "pages/confidentiality-statement.typ": new_confidentiality_statement_page
-#import "pages/prerelease-note.typ": new_prerelease_note
+  #import "pages/prerelease-note.typ": new_prerelease_note
-#import "pages/outline.typ": new_outline
+  #import "pages/outline.typ": new_outline
-#import "pages/abstract.typ": new_abstract
+  #import "pages/abstract.typ": new_abstract
-#import "pages/preface.typ": new-preface
+  #import "pages/preface.typ": new-preface
-#import "pages/appendix.typ": show-appendix
+  #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,
-      )],
-  )
-}
-
 // start of template pages and styles
 #let dhbw-template(config, body) = [
   #let config = validate-config(config)
@@ -51,14 +36,12 @@
     #set document(
       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)
@@ -85,8 +68,7 @@
       print-glossary(
         disable-back-references: true,
         enable-group-pagebreak: true,
-        glossary(config.thesis.glossary),
+        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) = (
+#let new_abstract(config) = context {
-  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) = (
+#let show-appendix(config: dictionary) = context {
-  context {
   counter(heading).update(0)
 
   let title = if text.lang == "en" {
@@ -42,5 +41,4 @@
 
     config.thesis.appendices
   }
-  }
+}
-)

src/pages/confidentiality-statement.typ

@@ -6,8 +6,7 @@
 // Edited: 28.06.2024
 // License: MIT
 
-#let new_confidentiality_statement_page(config) = (
+#let new_confidentiality_statement_page(config) = context {
-  context {
 
   pagebreak(weak: true)
 
@@ -60,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,8 +6,7 @@
 // Edited: 28.06.2024
 // License: MIT
 
-#let new_declaration_of_authorship(config) = (
+#let new_declaration_of_authorship(config) = context {
-  context {
 
   pagebreak(weak: true)
 
@@ -62,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,8 +10,7 @@
 // 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) = (
+#let render_filtered_outline(title: str, kind: selector) = context {
-  context {
 
   let elems = query(figure.where(kind: kind), here())
   let count = elems.len()
@@ -21,14 +20,11 @@
     pagebreak(weak: true)
     outline(
       title: title,
-        target: figure.where(kind: kind),
+      target: figure.where(kind: kind))
-      )
   }
-  }
+}
-)
 
-#let render_figures_outline() = (
+#let render_figures_outline() = context {
-  context {
   let title = if (text.lang == "de") {
       "Abbildungsverzeichnis"
     } else if text.lang == "en" {
@@ -36,11 +32,9 @@
     }
 
   render_filtered_outline(title: title, kind: image)
-  }
+}
-)
 
-#let render_table_outline() = (
+#let render_table_outline() = context {
-  context {
   let title = if (text.lang == "de") {
       "Tabellenverzeichnis"
     } else if text.lang == "en" {
@@ -48,11 +42,9 @@
     }
 
   render_filtered_outline(title: title, kind: table)
-  }
+}
-)
 
-#let render_raw_outline() = (
+#let render_raw_outline() = context {
-  context {
   let title = if (text.lang == "de") {
       "Quelltextverzeichnis"
     } else if text.lang == "en" {
@@ -60,11 +52,9 @@
     }
 
   render_filtered_outline(title: title, kind: raw)
-  }
+}
-)
 
-#let render_heading_outline() = (
+#let render_heading_outline() = context {
-  context {
   let title = if (text.lang == "de") {
       "Inhaltsverzeichnis"
     } else if text.lang == "en" {
@@ -75,13 +65,10 @@
   outline(
       target: heading.where(supplement: [chapter]),
       title: title,
-      indent: auto,
+      indent: auto)
-    )
+}
-  }
-)
 
-#let render_appendix_outline() = (
+#let render_appendix_outline() = context {
-  context {
   let supplement = if text.lang == "en" {
     [Appendix]
   } else {
@@ -99,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) = (
+#let new_prerelease_note(config) = context {
-  context {
 
   pagebreak(weak: true)
 
@@ -54,5 +53,4 @@
   v(1em)
   h(1em)
   [#author.name, #datetime.today().display()]
-  }
+}
-)

src/pages/titlepage.typ

@@ -6,8 +6,7 @@
 // Edited: 28.06.2024
 // License: MIT
 
-#let new_title_page(config) = (
+#let new_title_page(config) = context [
-  context [
 
   #let thesis = config.thesis
   #let author = config.author
@@ -61,12 +60,24 @@
       column-gutter: 1cm,
       align: left,
       stroke: none,
-        [*Verfasser:*], author.name,
+      
-        [*Bearbeitungszeitraum:*], thesis.timeframe,
+      [*Verfasser:*],
-        [*Matrikelnummer, Kurs:*], str(author.matriculation-number) + ", " + author.course,
+      author.name,
-        [*Ausbildungsbetrieb:*], author.company,
+
-        [*Betrieblicher Betreuer:*], author.supervisor,
+      [*Bearbeitungszeitraum:*],
-        [*Abgabedatum:*], thesis.submission-date,
+      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" [
     #table(
@@ -74,19 +85,30 @@
       column-gutter: 1cm,
       align: left,
       stroke: none,
-        [*Author:*], author.name,
+      
-        [*Editing period:*], thesis.timeframe,
+      [*Author:*],
-        [*Matriculation number, course:*], str(author.matriculation-number) + ", " + author.course,
+      author.name,
-        [*Training company:*], author.company,
+
-        [*Company supervisor:*], author.supervisor,
+      [*Editing period:*],
-        [*Submission date:*], thesis.submission-date,
+      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(
+  #align(bottom,
-      bottom,
     grid(
       // set width of columns
       // we need two, so make both half the page width
@@ -99,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

@@ -20,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)[
@@ -29,14 +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) = {
+#let currentH(level: 1)={
-  return numbering(c.numbering, ..counter(heading).at(c.location()))
-}
-
-#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() {
@@ -61,13 +59,11 @@
     hyphenate: true,
     dir: ltr,
     font: style.text.font,
-    fill: ABB-BLACK,
+    fill: ABB-BLACK)
-  )
 
   show heading: set text(
     font: style.heading.font,
-    weight: "semibold",
+    weight: "semibold")
-  )
 
   set heading(supplement: [chapter])
 
@@ -79,15 +75,10 @@
   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)
+  set raw(
-  show raw.where(block: false): it => box(
+    tab-size: style.code.tab-size,
-    stroke: 1pt + ABB-GRAY-05,
+    theme: style.code.theme)
-    radius: 2pt,
+  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))
-    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),
-  )
   show figure.where(kind: raw): it => align(left)[
     #let content = it.body
     #let lang = if content.has("lang") {
@@ -104,29 +95,23 @@
         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) {
+                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 }
-                  text(font: style.code.font, size: style.code.size, fill: ABB-BLACK, str(n))
-                } else {
-                  none
-                }
                 (n_str + h(0.5em), raw(block: true, lang: lang, l))
-              },
+              })
-            )
+            }
-          } else {
+            else {
-            (
+                  ( ( 1fr, ),
-              (1fr,),
+                    ( left, ),
-              (left,),
                     e => {
                       let (i, l) = e
                       raw(block: true, lang: lang, l)
-              },
+                    }
                   )
               }
           }
@@ -138,13 +123,15 @@
               inset: 0.25em,
               align: (col, _) => align.at(col),
               fill: ABB-GRAY-06,
-          ..content.text.split("\n").enumerate().map(make_row).flatten().map(c => if c.has("text") and c.text == "" {
+              ..content
-            v(1em)
+                  .text
-          } else {
+                  .split("\n")
-            c
+                  .enumerate()
-          })
+                  .map(make_row)
+                  .flatten()
+                  .map(c => if c.has("text") and c.text == "" { v(1em) } else { c })
           )
-      },
+      }
     )
     #v(-1em)
     #align(center + top, it.caption)
@@ -181,20 +168,8 @@
     stroke: (x, y) => (
       left: none,
       right: none,
-      top: if y == 0 {
+      top: if y == 0 { 1.5pt } else if y < 2 { 1pt } else { 0.5pt },
-        1.5pt
+      bottom: if y == 0 { 1pt } else { 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")
@@ -203,8 +178,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)
@@ -220,11 +194,10 @@
       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 {
         numbering("I", nums.pos().first())
@@ -265,10 +238,7 @@
           // 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>)
+      } else if query(<end-of-content>).first().location().page() >= current-page and query(<end-of-prelude>).first().location().page() < current-page + 1 {
-        .first()
-        .location()
-        .page() < current-page + 1 {
         let heading = currentH()
 
         heading.at(0)
@@ -281,8 +251,7 @@
         v(style.header.underline-top-padding - 1em)
         line(length: 100%)
       }
-    },
+    })
-  )
 
   body
 }

template/appendix.typ

@@ -8,5 +8,7 @@
 
 #lorem(50)
 
-#figure(```
+#figure(
-```)
+  ```
+  ```
+)

template/main.typ

@@ -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,12 +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",
+    appendices: include "appendix.typ")))
-  ),
-))
 
 #import "@preview/wrap-it:0.1.0": wrap-content
 
@@ -65,8 +62,7 @@ $
 
 #wrap-content(
   figure(image("assets/digitaldog.jpg", width: 200pt), caption: [ Some image caption ]),
-  lorem(200),
+  lorem(200))
-)
 
 #figure(
   table(
@@ -80,28 +76,23 @@ $
     [2023-03-18], [Yoga], [200],
     [2023-03-15], [Swimming], [400],
     [2023-03-17], [Weightlifting], [250],
-    [2023-03-18], [Yoga], [200],
+    [2023-03-18], [Yoga], [200]),
-  ),
+    caption: [ Some table ])
-  caption: [ Some table ],
-)
 
 #pagebreak()
 
 #lorem(100)
-#inline-color("#ff0000", "red")
 
 #figure(
   ```rust
-  use std::env;
+use std::env;
-  use std::fs::OpenOptions;
+use std::fs::OpenOptions;
-  use std::io::Write;
+use std::io::Write;
 
-  fn main() {
+fn main() {
     println!("Hello, World!!!");
-  }
+}
-  ```,
+  ```, caption: [Some code])
-  caption: [Some code],
-)
 
 #lorem(100)