feat: revamp template API and box components
This commit is contained in:
8 files changed
+211
-130
No files matched your search
+29
-40
@@ -1,8 +1,8 @@
|
||||
#import "../theme.typ": colors, statement-colors
|
||||
|
||||
#let _box(header, body, color) = block(
|
||||
#let _box(header, body, color, radius) = block(
|
||||
inset: 12pt,
|
||||
radius: 3pt,
|
||||
radius: radius,
|
||||
width: 100%,
|
||||
fill: rgb(..color, 10),
|
||||
stroke: (
|
||||
@@ -15,7 +15,7 @@
|
||||
],
|
||||
)
|
||||
|
||||
#let _stmt(kind, body, color, label: [], nobreak: false) = context {
|
||||
#let _stmt(kind, body, color, label: [], nobreak: false, radius: 5pt) = context {
|
||||
let h = counter(heading).get()
|
||||
let x = if h.len() >= 1 { h.at(0) } else { 0 }
|
||||
let y = if h.len() >= 2 { h.at(1) } else { 0 }
|
||||
@@ -39,52 +39,41 @@
|
||||
[*#kind #mark*#lbl*.* #brk],
|
||||
body,
|
||||
color,
|
||||
radius,
|
||||
)
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
#let def(body, label: [], nobreak: false) = _stmt(
|
||||
"Definition",
|
||||
body,
|
||||
statement-colors.definition,
|
||||
label: label,
|
||||
nobreak: nobreak,
|
||||
#let statement-names = (
|
||||
en: (
|
||||
definition: [Definition],
|
||||
axiom: [Axiom],
|
||||
theorem: [Theorem],
|
||||
lemma: [Lemma],
|
||||
corollary: [Corollary],
|
||||
),
|
||||
de: (
|
||||
definition: [Definition],
|
||||
axiom: [Axiom],
|
||||
theorem: [Satz],
|
||||
lemma: [Lemma],
|
||||
corollary: [Korollar],
|
||||
),
|
||||
)
|
||||
|
||||
#let axiom(body, label: [], nobreak: false) = _stmt(
|
||||
"Axiom",
|
||||
body,
|
||||
statement-colors.axiom,
|
||||
label: label,
|
||||
nobreak: nobreak,
|
||||
)
|
||||
#let _stmt-name(kind, lang: "en") = { statement-names.at(lang).at(kind) }
|
||||
|
||||
#let satz(body, label: [], nobreak: false) = _stmt(
|
||||
"Satz",
|
||||
body,
|
||||
statement-colors.theorem,
|
||||
label: label,
|
||||
nobreak: nobreak,
|
||||
)
|
||||
#let definition(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name(kind, lang: lang), body, statement-colors.at(kind), label: label, nobreak: nobreak)
|
||||
#let axiom(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name(kind, lang: lang), body, statement-colors.at(kind), label: label, nobreak: nobreak)
|
||||
#let theorem(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name(kind, lang: lang), body, statement-colors.at(kind), label: label, nobreak: nobreak)
|
||||
#let lemma(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name(kind, lang: lang), body, statement-colors.at(kind), label: label, nobreak: nobreak)
|
||||
#let corollary(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name(kind, lang: lang), body, statement-colors.at(kind), label: label, nobreak: nobreak)
|
||||
// Aliases
|
||||
#let satz(..args) = theorem(..args, lang: "de")
|
||||
#let korollar(..args) = corollary(..args, lang: "de")
|
||||
|
||||
#let lemma(body, label: [], nobreak: false) = _stmt(
|
||||
"Lemma",
|
||||
body,
|
||||
statement-colors.lemma,
|
||||
label: label,
|
||||
nobreak: nobreak,
|
||||
)
|
||||
|
||||
#let kor(body, label: [], nobreak: false) = _stmt(
|
||||
"Korollar",
|
||||
body,
|
||||
statement-colors.corollary,
|
||||
label: label,
|
||||
nobreak: nobreak,
|
||||
)
|
||||
|
||||
#let ex_box(
|
||||
#let exercise(
|
||||
body,
|
||||
heading: [],
|
||||
points: [],
|
||||
|
||||
+17
-14
@@ -1,6 +1,6 @@
|
||||
#import "../config.typ": custom-raw-syntaxes
|
||||
#import "../helpers.typ": content-to-string, render-footnote-entry
|
||||
#import "../theme.typ": base-theme, code-theme, colors, common-theme, end-message, smallcaps
|
||||
#import "../theme.typ": base-theme, code-theme, colors, common-theme, credits, smallcaps
|
||||
#import "../components/student-table.typ": exercise-overview
|
||||
|
||||
/// Base template for exercise sheets.
|
||||
@@ -13,21 +13,23 @@
|
||||
students,
|
||||
tutor,
|
||||
tutor-label: none,
|
||||
sheet: [Exercise Sheet],
|
||||
sheet-label: [Exercise Sheet],
|
||||
logo: none,
|
||||
show-logo: true,
|
||||
page-numbering: common-theme.page-numbering,
|
||||
table-header-smallcaps: false,
|
||||
text-font: base-theme.text-font,
|
||||
math-font: base-theme.math-font,
|
||||
show-end-message: false,
|
||||
end-message: end-message,
|
||||
no-pagebreak: true,
|
||||
show-credits: false,
|
||||
credits: credits,
|
||||
body,
|
||||
) = {
|
||||
assert.eq(type(exercises), int, message: "exercises must be an integer")
|
||||
assert(exercises > 0, message: "exercises must be a positive integer")
|
||||
|
||||
let ttl = sheet + if { sheetnumber < 10 } { " 0" } else { " " } + str(sheetnumber)
|
||||
let ttl = if sheetnumber == none { sheet-label } else {
|
||||
sheet-label + if { sheetnumber < 10 } { " 0" } else { " " } + str(sheetnumber)
|
||||
}
|
||||
|
||||
set document(
|
||||
title: ttl,
|
||||
@@ -67,7 +69,9 @@
|
||||
if first-h1.get() {
|
||||
first-h1.update(false)
|
||||
} else {
|
||||
// pagebreak(weak: true)
|
||||
if (not no-pagebreak) {
|
||||
pagebreak(weak: true)
|
||||
}
|
||||
}
|
||||
v(0.3em)
|
||||
it
|
||||
@@ -97,8 +101,8 @@
|
||||
show raw.where(block: true): box.with(..base-theme.raw-block)
|
||||
show raw.where(block: false): box.with(..code-theme.inline)
|
||||
|
||||
let logo-content = if not show-logo or logo == none {
|
||||
[]
|
||||
let logo-content = if logo == none {
|
||||
none
|
||||
} else {
|
||||
logo
|
||||
}
|
||||
@@ -110,9 +114,8 @@
|
||||
columns: (6fr, 1fr),
|
||||
align: (start + horizon, end + horizon),
|
||||
row-gutter: 0.25cm,
|
||||
[
|
||||
#title[#sheet #if sheetnumber < 10 { "0" };#sheetnumber]
|
||||
],
|
||||
|
||||
title(ttl),
|
||||
logo-content,
|
||||
|
||||
grid.cell(
|
||||
@@ -134,10 +137,10 @@
|
||||
|
||||
body
|
||||
|
||||
if show-end-message {
|
||||
if show-credits {
|
||||
v(1fr)
|
||||
|
||||
set text(size: 10pt)
|
||||
align(center)[#end-message]
|
||||
align(center)[#credits]
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
/// Computer science exercise sheet template.
|
||||
#let computer-science-template(
|
||||
sheetnumber: 0,
|
||||
sheetnumber,
|
||||
subtitle: none,
|
||||
course,
|
||||
students,
|
||||
@@ -12,14 +12,14 @@
|
||||
university,
|
||||
institute,
|
||||
department: none,
|
||||
submit_until: none,
|
||||
testats_from: none,
|
||||
testats_until: none,
|
||||
group-digits: false,
|
||||
decimal-comma: false,
|
||||
page-numbering: common-theme.page-numbering,
|
||||
raw-syntaxes: custom-raw-syntaxes,
|
||||
submit-until: none,
|
||||
attestations-from: none,
|
||||
attestations-until: none,
|
||||
info-text: none,
|
||||
page-numbering: common-theme.page-numbering,
|
||||
group-digits: false,
|
||||
decimal-comma: true,
|
||||
raw-syntaxes: custom-raw-syntaxes,
|
||||
text-font: computer-science-theme.text-font,
|
||||
math-font: computer-science-theme.math-font,
|
||||
table-header-smallcaps: false,
|
||||
@@ -137,12 +137,12 @@
|
||||
v(2em)
|
||||
|
||||
[
|
||||
#if submit_until != none [
|
||||
*Abgabe bis #german-date-time(submit_until);.*
|
||||
#if submit-until != none [
|
||||
*Abgabe bis #german-date-time(submit-until);.*
|
||||
]
|
||||
|
||||
#if testats_from != none and testats_until != none [
|
||||
*Testate vom #german-date-time(testats_from) bis #german-date-time(testats_until).*
|
||||
#if attestations-from != none and attestations-until != none [
|
||||
*Testate vom #german-date-time(attestations-from) bis #german-date-time(attestations-until).*
|
||||
]
|
||||
|
||||
#if info-text != none [#info-text]
|
||||
|
||||
+4
-4
@@ -15,11 +15,11 @@
|
||||
)
|
||||
|
||||
#let fonts = (
|
||||
base: "Fira Sans",
|
||||
base-math: "Fira Math",
|
||||
base: ("Fira Sans", "New Computer Modern"),
|
||||
base-math: ("Fira Math", "New Computer Modern Math"),
|
||||
cmu: "New Computer Modern",
|
||||
cmu-math: "New Computer Modern Math",
|
||||
code: "Fira Code",
|
||||
code: ("Fira Code", "DejaVu Sans Mono"),
|
||||
)
|
||||
|
||||
#let code-text-features = (
|
||||
@@ -100,7 +100,7 @@
|
||||
raw-block: code-theme.block,
|
||||
)
|
||||
|
||||
#let end-message = [_Typeset with #link("https://typst.app")[#text(fill: colors.text)[#underline[Typst]]]\; template available from #link("https://git.p0pa.de/Popa/clean-sheets")[#text(fill: colors.text)[#underline[clean-sheets]]]._]
|
||||
#let credits = [_Typeset with #link("https://typst.app")[#text(fill: colors.text)[#underline[Typst]]]\; template available from #link("https://git.p0pa.de/Popa/clean-sheets")[#text(fill: colors.text)[#underline[clean-sheets]]]._]
|
||||
|
||||
#let statement-colors = (
|
||||
definition: (247, 57, 72),
|
||||
|
||||
Reference in new issue
Block a user