From 29718284fc30a8688a654f63e9ddc6d7a87f437e Mon Sep 17 00:00:00 2001 From: Popa <115492561+Popa-42@users.noreply.github.com> Date: Tue, 15 Sep 2026 17:00:23 +0200 Subject: [PATCH] feat: improve modern template theming and header --- src/templates/modern.typ | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/src/templates/modern.typ b/src/templates/modern.typ index 1260f81..a818527 100644 --- a/src/templates/modern.typ +++ b/src/templates/modern.typ @@ -171,20 +171,27 @@ professor: [], assistant: none, semester: [], + uni: [], sheet-title: [], name: [], date: datetime.today(), exercise-label: [Exercise], hint-label: [Hint], - theme: default-theme, + theme: (:), decimal-comma: false, body, ) = { - let text-color = theme.primary - let border-color = theme.primary - let accent-color = theme.accent + let _theme = default-theme + for (k, v) in _theme { + let val = theme.at(k, default: none) + if val != none { _theme.at(k) = val } + } - theme-state.update(theme) + let text-color = _theme.primary + let border-color = _theme.primary + let accent-color = _theme.accent + + theme-state.update(_theme) exercise-label-state.update(exercise-label) hint-label-state.update(hint-label) @@ -194,7 +201,7 @@ set document(title: sheet-title, date: date, author: name.text) set page( - margin: (y: 3cm), + margin: (y: 3.5cm, x: 2.5cm), numbering: (..c) => [*#c.at(0)* / #c.at(-1)], background: context { @@ -212,17 +219,22 @@ header: { set text(size: 8pt) + let _lines = ( + (professor, assistant).filter(x => x != none and x != []), + (semester, uni).filter(x => x != none and x != []), + ) + grid( columns: (auto, auto), column-gutter: 1fr, align: (start, end), [ - #text(weight: 800)[#seminar] \ - #(professor, assistant).join([#h(0.25em)·#h(0.25em)]) \ - #semester + *#seminar* \ + #_lines.at(0).join([#h(0.25em)·#h(0.25em)]) \ + #_lines.at(1).join([#h(0.25em)·#h(0.25em)]) ], [ - #text(fill: text-color, weight: 800)[#sheet-title] \ + #text(fill: text-color)[*#sheet-title*] \ #name \ #if date != none { date.display("[day].[month].[year]") } ], @@ -233,7 +245,7 @@ footer: context { line(length: 100%, stroke: border-color) - + v(1em) grid( columns: (2fr, 1fr, 2fr), align: (start, center, end), @@ -242,13 +254,13 @@ }, ) - set text(font: theme.text-font) - show math.equation: set text(font: theme.math-font) + set text(font: _theme.text-font) + show math.equation: set text(font: _theme.math-font) show raw: set text(font: "Fira Code", size: 10pt) set footnote(numbering: "[1]") set footnote.entry( - separator: line(length: 30% + 0pt, stroke: (paint: theme.primary.lighten(50%), dash: "dotted")), + separator: line(length: 30% + 0pt, stroke: (paint: _theme.primary.lighten(50%), dash: "dotted")), indent: 1em, )