Merge branch 'main' of https://git.montehaselino.de/DHBW/dhbw-abb-typst-template

src/pages/confidentiality-statement.typ

@@ -43,11 +43,11 @@
 
     set par(justify: true)
 
-    if text.lang == "de" [
+  if text.lang == "de" [
-      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.
+    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.
-    ] else if text.lang == "en" [
+  ] 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.
+    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.
-    ]
+  ]
 
     set align(horizon)
 

src/pages/titlepage.typ

@@ -28,11 +28,11 @@
     // faculty
     #pad(top: 0.5cm)[
       #if text.lang == "de" [
-        Praxisphase des #author.semester Studienjahrs an der Fakultät für #author.faculty
+        Praxisphase des #author.semester Semesters an der Fakultät für #author.faculty
         #linebreak()
         im Studiengang #author.program
       ] else if text.lang == "en" [
-        Practical phase of the #author.semester academic year at the Faculty of #author.faculty
+        Practical phase of the #author.semester semester at the Faculty of #author.faculty
         #linebreak()
         in the degree program #author.program
       ] else [

src/style.typ

@@ -111,40 +111,37 @@
               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 => {
-              e => {
+                      let (i, l) = e
-                let (i, l) = e
+                      raw(block: true, lang: lang, l)
-                raw(block: true, lang: lang, l)
+                    }
-              },
+                  )
-            )
+              }
           }
-        }
+          grid(
-        grid(
+              stroke: none,
-          stroke: none,
+              columns: columns,
-          columns: columns,
+              rows: (auto,),
-          rows: (auto,),
+              gutter: 0pt,
-          gutter: 0pt,
+              inset: 0.25em,
-          inset: 0.25em,
+              align: (col, _) => align.at(col),
-          align: (col, _) => align.at(col),
+              fill: ABB-GRAY-06,
-          fill: ABB-GRAY-06,
+              ..content
-          ..content.text.split("\n").enumerate().map(make_row).flatten().map(c => if c.has("text") and c.text == "" {
+                  .text
-            v(1em)
+                  .split("\n")
-          } else {
+                  .enumerate()
-            c
+                  .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 +178,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 +188,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 +204,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 +248,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 +261,7 @@
         v(style.header.underline-top-padding - 1em)
         line(length: 100%)
       }
-    },
+    })
-  )
 
   body
 }

template/main.typ

@@ -107,7 +107,6 @@ $
 
 #pagebreak()
 
-
 = Conclusion
 
 #lorem(320)