Fix Anhangverzeichnis

Add #show: addendum before your addendum to insert an addendum-outline and correct formatting

README.md

@@ -64,3 +64,15 @@ This content is taken out of a book #footnote[Vgl. @booklabel]
 This content is taken out of another book #footnote[Vgl. #cite(<anotherbook>), S. 15]
 
 ````
+
+## How to contribute
+
+If you have any suggestions/feedback or wnat to submit a pull request, usually you would do it via an issue or a direct pull request on this instance. But registration is not enabled here so the best way to do it would be:
+
+1. Clone the repo
+2. Make your changes
+3. Upload the repo to another git server (e.x. github, codeberg,...)
+4. Send a friendly mail to s3005647@edu.dhsn.de with a link to the repo or the .patch file of the commit(s) an attachment.
+5. I will merge your changes into this repo!
+
+*If you have any other suggestions besides pull requests, you can also send a mail to s3005647@edu.dhsn.de*

dhsn.typ

@@ -1,4 +1,4 @@
-#import "@preview/acrostiche:0.6.0": *
+#import "@preview/acrostiche:0.7.0": *
 
 #let statement(location, submission-date, gender) = context [
   #pagebreak()
@@ -17,11 +17,11 @@
 
   #v(1.5cm)
   #grid(
-    columns: (50%, 50%),
     column-gutter: 1cm,
+    columns: (50%, 50%),
     row-gutter: 10pt,
-    [#location, #submission-date.display("[day].[month].[year]")], align(bottom, line(length: 6cm, stroke: 0.75pt)),
-    [Ort, Abgabetermin],
+    [#location, #submission-date.display("[day].[month].[year]")], [],
+    [],
     (
       if gender == none {
         [Unterschrift des Verfassers]
@@ -32,7 +32,35 @@
       }
     ),
   )
+
 ]
+#let addendum(supplement: "Anhang", body) = {
+  pagebreak()
+  counter(heading).update(0)
+  set heading(numbering: none)
+  context if query(selector(figure).after(here())).len() > 0 {
+    {
+    show regex("(\. ).+"): none
+    {
+      show heading: none
+      heading(numbering: none)[Anhangverzeichnis]
+    }
+    outline(title: "Anhangverzeichnis", target: selector(figure).after(here()))
+    pagebreak()
+    }
+    set figure(kind: raw, supplement: "Anhang")
+    counter(figure.where(kind: raw)).update(0)
+
+    [= #supplement <dhsn.addendum>]
+    body
+    pagebreak()
+  } else {
+    body
+  }
+}
+}
+
+
 #let dhsn(
   topic: "Thema der Arbeit",
   subtitle: [Art der Arbeit],
@@ -57,11 +85,16 @@
   body,
 ) = {
   // show figure.where(kind: table): set figure(kind: raw, supplement: "Anhang")
-  show figure.where(kind: raw): set figure(supplement: "Anhang")
   set heading(numbering: (..nums) => nums.pos().map(str).join("."))
 
-  set bibliography(style: "harvard-cite-them-right", title: "Literaturverzeichnis")
-  set cite(form: "prose")
+  set bibliography(style: "ieee", title: "Literaturverzeichnis")
+  set document(
+    title: topic,
+    author: author,
+    description: [#subtitle],
+    date: submission-date,
+  )
+  /*set cite(form: "prose")
   show cite: c => {
     show "ohne Datum": "o.D."
     show regex("ohne Datum \D\)"): it => {
@@ -70,9 +103,21 @@
       it
     }
     c
-  }
+  }*/
   set text(size: 12pt, lang: "de", region: "de")
-  set par(justify: true)
+  set par(justify: true, leading: 1.2em)
+  show heading: set block(below: 1.2em)
+  show figure: set par(leading: 0.8em)
+  show figure.caption: set text(size: 10pt)
+  show table: set par(leading: 0.8em)
+  show raw: it => {
+    if (it.lines.first().count > 1) {
+      set par(leading: 1em)
+      it
+    } else {
+      it
+    }
+  }
   set page(
     margin: (
       top: 2cm,
@@ -88,6 +133,7 @@
   context [
     #set page(footer: none, margin: (left: 2cm))
     #set text(size: 14pt)
+    #set par(leading: (1 / 1.2) * 1em)
     #show heading.where(level: 1): it => {
       set text(size: 24pt)
       block(it.body)
@@ -141,58 +187,46 @@
   pagebreak()
 
   context {
-    if query(figure.where(kind: image)).len() > 0 {
+    show regex("(\. ).+"): none
+    show ref: none
+    if query(selector(figure.where(kind: image).before(<dhsn.addendum>))).len() > 0 {
       {
         show heading: none
         heading(numbering: none)[Abbildungsverzeichnis]
       }
-      outline(title: "Abbildungsverzeichnis", target: figure.where(kind: image))
+
+      outline(title: "Abbildungsverzeichnis", target: selector(figure.where(kind: image)).before(<dhsn.addendum>))
     }
-  }
-  context {
-    if query(figure.where(kind: raw)).len() > 0 {
-      {
-        show heading: none
-        heading(numbering: none)[Anhangverzeichnis]
-      }
-      outline(title: "Anhangverzeichnis", target: figure.where(kind: raw))
-    }
-  }
-  context {
-    if query(figure.where(kind: table)).len() > 0 {
+    if query(selector(figure.where(kind: table)).before(<dhsn.addendum>)).len() > 0 {
       {
         show heading: none
         heading(numbering: none)[Tabellenverzeichnis]
       }
-      outline(title: "Tabellenverzeichnis", target: figure.where(kind: table))
+      outline(title: "Tabellenverzeichnis", target: selector(figure.where(kind: table)).before(<dhsn.addendum>))
+    }
+    if (
+      query(selector(figure.where(kind: table).or(figure.where(kind: table))).before(<dhsn.addendum>)).len() > 0
+    ) {
+      pagebreak()
+      counter(footnote).update(0)
     }
   }
 
   context {
-    if (acros.get() != none and acros.get().len() > 0) {
+    if (_acronyms.final() != none and _acronyms.final().len() > 0) {
       {
         show heading: none
         heading(numbering: none)[Abkürzungsverzeichnis]
       }
-      print-index(title: "Abkürzungsverzeichnis", row-gutter: 5pt)
-    }
-  }
-
-
+      print-index(title: "Abkürzungsverzeichnis", row-gutter: 1.2em)
       pagebreak()
+    }
+  }
   counter(page).update(1)
   set page(numbering: (..nums) => numbering("1", counter(page).get().at(0)))
 
   body
-  {
-    show "ohne Datum": "o.D."
-    show regex("ohne Datum \D\)"): it => {
-      show ")": "])"
-      show "ohne Datum ": "o.D.["
-      it
-    }
   bib
-  }
   statement(location, submission-date, author_gender)
 }