fix: update statement numbering with headings
This commit is contained in:
6 files changed
+103
-72
No files matched your search
+11
-15
@@ -15,25 +15,21 @@
|
||||
],
|
||||
)
|
||||
|
||||
#let _stmt(kind, body, color, label: [], nobreak: false, radius: 5pt) = context {
|
||||
#let _stmt(kind, body, color, label: none, 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 }
|
||||
let x = if h.len() >= 1 { calc.max(1, h.at(0)) } else { 1 }
|
||||
let y = if h.len() >= 2 { calc.max(1, h.at(1)) } else { 1 }
|
||||
|
||||
let statement = counter(
|
||||
"statement-" + str(x) + "-" + str(y),
|
||||
)
|
||||
let statement = counter("statement-" + str(x) + "-" + str(y))
|
||||
|
||||
let lbl = if label != [] { [ (#label)] } else { [] }
|
||||
let lbl = if label != none { [ (#label)] }
|
||||
let brk = if nobreak { "" } else { [\ ] }
|
||||
|
||||
[
|
||||
#statement.step()
|
||||
|
||||
#context {
|
||||
let mark = statement.display(
|
||||
z => numbering("1.1.1", x, y, z),
|
||||
)
|
||||
let mark = statement.display(z => numbering("1.1.1", x, y, z))
|
||||
|
||||
_box(
|
||||
[*#kind #mark*#lbl*.* #brk],
|
||||
@@ -64,11 +60,11 @@
|
||||
|
||||
#let _stmt-name(kind, lang: "en") = { statement-names.at(lang).at(kind) }
|
||||
|
||||
#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)
|
||||
#let definition(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name("definition", lang: lang), body, statement-colors.at("definition"), label: label, nobreak: nobreak)
|
||||
#let axiom(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name("axiom", lang: lang), body, statement-colors.at("axiom"), label: label, nobreak: nobreak)
|
||||
#let theorem(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name("theorem", lang: lang), body, statement-colors.at("theorem"), label: label, nobreak: nobreak)
|
||||
#let lemma(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name("lemma", lang: lang), body, statement-colors.at("lemma"), label: label, nobreak: nobreak)
|
||||
#let corollary(body, label: none, nobreak: false, lang: "en") = _stmt(_stmt-name("corollary", lang: lang), body, statement-colors.at("corollary"), label: label, nobreak: nobreak)
|
||||
// Aliases
|
||||
#let satz(..args) = theorem(..args, lang: "de")
|
||||
#let korollar(..args) = corollary(..args, lang: "de")
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
tutor-label: none,
|
||||
sheet-label: [Exercise Sheet],
|
||||
logo: none,
|
||||
track-heading-counter: true,
|
||||
page-numbering: common-theme.page-numbering,
|
||||
table-header-smallcaps: false,
|
||||
text-font: base-theme.text-font,
|
||||
@@ -66,18 +67,17 @@
|
||||
show heading: set text(fill: colors.text)
|
||||
let first-h1 = state("first-h1", true)
|
||||
show heading.where(level: 1): it => {
|
||||
if first-h1.get() {
|
||||
first-h1.update(false)
|
||||
} else {
|
||||
if (not no-pagebreak) {
|
||||
pagebreak(weak: true)
|
||||
}
|
||||
}
|
||||
v(0.3em)
|
||||
if track-heading-counter and it.numbering == none { counter(heading).step(level: 1) }
|
||||
if first-h1.get() { first-h1.update(false) } else { if (not no-pagebreak) { pagebreak(weak: true) } }
|
||||
it
|
||||
v(-0.9em)
|
||||
line(length: 100%, stroke: 0.4pt + colors.stroke)
|
||||
v(0.3em)
|
||||
v(0.25cm)
|
||||
}
|
||||
|
||||
show heading.where(level: 2): it => {
|
||||
if track-heading-counter and it.numbering == none { counter(heading).step(level: 2) }
|
||||
it
|
||||
}
|
||||
|
||||
set footnote(numbering: common-theme.footnote.numbering.note)
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
attestations-from: none,
|
||||
attestations-until: none,
|
||||
info-text: none,
|
||||
track-heading-counter: true,
|
||||
page-numbering: common-theme.page-numbering,
|
||||
group-digits: false,
|
||||
decimal-comma: true,
|
||||
@@ -50,13 +51,13 @@
|
||||
|
||||
let first-h1 = state("first-h1", true)
|
||||
show heading.where(level: 1): it => {
|
||||
if first-h1.get() {
|
||||
first-h1.update(false)
|
||||
} else {
|
||||
if (not no-pagebreak) {
|
||||
pagebreak(weak: true)
|
||||
}
|
||||
}
|
||||
if track-heading-counter and it.numbering == none { counter(heading).step(level: 1) }
|
||||
if first-h1.get() { first-h1.update(false) } else { if (not no-pagebreak) { pagebreak(weak: true) } }
|
||||
it
|
||||
}
|
||||
|
||||
show heading.where(level: 2): it => {
|
||||
if track-heading-counter and it.numbering == none { counter(heading).step(level: 2) }
|
||||
it
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user