diff --git a/src/templates/modern.typ b/src/templates/modern.typ index a818527..8c49c0c 100644 --- a/src/templates/modern.typ +++ b/src/templates/modern.typ @@ -12,16 +12,18 @@ ) #let theme-state = state("homework-theme", default-theme) -#let exercise-label-state = state("homework-exercise-label", [Exercise]) +#let task-label-state = state("homework-task-label", [Exercise]) #let hint-label-state = state("homework-hint-label", [Hint]) -#let exercise-counter = counter("homework-exercises") +#let task-counter = counter("homework-tasks") #let subtask-indent = state("homework-subtask-indent", (0,)) -#let exercise-active = state("homework-exercise-active", false) +#let task-active = state("homework-task-active", false) + +#let doc-id = sys.inputs.at("doc-id", default: none) -#let exercise( +#let task( points: none, title, body, @@ -31,8 +33,8 @@ let theme = theme-state.get() let text-color = theme.primary let border-color = theme.primary - let background-color = theme.secondary.transparentize(50%) - let exercise-label = exercise-label-state.get() + let background-color = theme.secondary.transparentize(75%) + let task-label = task-label-state.get() let subtask-points = query( selector(metadata).within(here()), @@ -45,13 +47,13 @@ v(1.5em) - exercise-active.update(true) + task-active.update(true) block( breakable: false, sticky: true, fill: background-color, - inset: (y: 1em, left: 1.25em, right: 1em), + inset: (y: 0.7em, left: 1.25em, right: 1em), width: 100%, stroke: (bottom: (paint: border-color, dash: "dashed")), above: 0pt, @@ -59,7 +61,7 @@ { set text(fill: text-color, size: 1em) - [*#exercise-label #exercise-counter.display()*] + [*#task-label #task-counter.display()*] if title != none and title != [] { [ --- #title] } h(1fr) @@ -78,10 +80,13 @@ ), ) - exercise-active.update(false) - exercise-counter.step() + task-active.update(false) + task-counter.step() } +// deprecated, use #task instead +#let exercise = task + #let subtask( points: 0, @@ -139,10 +144,10 @@ let theme = theme-state.get() let hint-label = if label != none and label != [] { label } else { hint-label-state.get() } - let in-exercise = exercise-active.get() + let in-task = task-active.get() let indent = subtask-indent.get() - let in-subtask = in-exercise and indent.len() == 1 + let in-subtask = in-task and indent.len() == 1 let offset = 0.75em @@ -175,10 +180,13 @@ sheet-title: [], name: [], date: datetime.today(), - exercise-label: [Exercise], + task-label: [Exercise], hint-label: [Hint], theme: (:), decimal-comma: false, + show-datamatrix: false, + datamatrix-url: "https://example.com/", + datamatrix-slug: none, body, ) = { let _theme = default-theme @@ -192,10 +200,10 @@ let accent-color = _theme.accent theme-state.update(_theme) - exercise-label-state.update(exercise-label) + task-label-state.update(task-label) hint-label-state.update(hint-label) - exercise-counter.update(1) + task-counter.update(1) subtask-indent.update((0,)) set document(title: sheet-title, date: date, author: name.text) @@ -204,6 +212,41 @@ margin: (y: 3.5cm, x: 2.5cm), numbering: (..c) => [*#c.at(0)* / #c.at(-1)], + foreground: { + if show-datamatrix { + import "@preview/zebra:0.1.0": datamatrix + + context { + let page-num = here().page() + let payload = ( + (if doc-id != none { doc-id } else if datamatrix-slug != none { datamatrix-slug } else { "" }) + + "/" + + str(page-num) + ) + let theme = theme-state.get() + + let code = datamatrix( + datamatrix-url + payload, + width: 2.7em, + quiet-zone: true, + fill: theme.primary.transparentize(50%), + options: (symbols: "rect-ext-16"), + ) + + let outer-side = if calc.odd(page-num) { right } else { left } + + place( + top + center, + block( + width: 100%, + height: 3.25cm, + align(outer-side + horizon, rotate(-90deg, code)), + ), + ) + } + } + }, + background: context { let point-list = query(metadata).filter(e => { type(e.value) == dictionary and "type" in e.value and e.value.type == "subtask-points"