From 3026dc1a1e8ff214f851664352b77bf1246a374d Mon Sep 17 00:00:00 2001 From: servostar Date: Tue, 20 Aug 2024 09:49:13 +0200 Subject: [PATCH] fixed spelling mistakes --- src/pages/confidentiality-statement.typ | 2 +- src/pages/titlepage.typ | 4 +- src/style.typ | 155 +++++++++++++++--------- template/main.typ | 1 - 4 files changed, 99 insertions(+), 63 deletions(-) diff --git a/src/pages/confidentiality-statement.typ b/src/pages/confidentiality-statement.typ index 4a85795..b020ef7 100644 --- a/src/pages/confidentiality-statement.typ +++ b/src/pages/confidentiality-statement.typ @@ -43,7 +43,7 @@ set par(justify: true) if text.lang == "de" [ - darf weder als Ganzes noch in Auszügen Personen außerhalb des Prüfungsprozesses und des Evalua-tionsverfahrens zugänglich gemacht werden, sofern keine anderslautende Genehmigung der Ausbildungsstätte vorliegt. + darf weder als Ganzes noch in Auszügen Personen außerhalb des Prüfungsprozesses und des Evaluationsverfahrens zugänglich gemacht werden, sofern keine anderslautende Genehmigung der Ausbildungsstätte vorliegt. ] else if text.lang == "en" [ may not be made accessible to persons outside the examination process and the evaluation procedure, either as a whole or in excerpts, unless otherwise authorized by the training institution. ] diff --git a/src/pages/titlepage.typ b/src/pages/titlepage.typ index d77268b..24d20b9 100644 --- a/src/pages/titlepage.typ +++ b/src/pages/titlepage.typ @@ -27,11 +27,11 @@ // faculty #pad(top: 0.5cm)[ #if text.lang == "de" [ - Praxisphase des #author.semester Studienjahrs an der Fakultät für #author.faculty + Praxisphase des #author.semester Semesters an der Fakultät für #author.faculty #linebreak() im Studiengang #author.program ] else if text.lang == "en" [ - Practical phase of the #author.semester academic year at the Faculty of #author.faculty + Practical phase of the #author.semester semester at the Faculty of #author.faculty #linebreak() in the degree program #author.program ] else [ diff --git a/src/style.typ b/src/style.typ index 79fc183..1815d2c 100644 --- a/src/style.typ +++ b/src/style.typ @@ -9,7 +9,7 @@ #import "branding.typ": * -#let watermark-color = luma(50%).transparentize(70%) +#let watermark-color = luma(50%).transparentize(70%) #let watermark-pattern = pattern(size: (5pt, 5pt))[ #place(line(start: (50%, 0%), end: (50%, 100%), stroke: (paint: watermark-color, thickness: 3pt))) @@ -18,9 +18,10 @@ #let watermark(config) = if config.draft { rotate(-22.5deg)[ #rect( - radius: 1em, - inset: 1em, - stroke: watermark-color)[ + radius: 1em, + inset: 1em, + stroke: watermark-color, + )[ #text(size: 4em, weight: "bold", fill: watermark-pattern, "DRAFT") #linebreak() #text(size: 1.25em, weight: "bold", fill: watermark-color)[ @@ -28,13 +29,14 @@ #linebreak() document version. #linebreak() - #text(size: 0.75em, "Further usage without the authors consent is not permitted.")]]]} - -#let numberingH(c)={ - return numbering(c.numbering,..counter(heading).at(c.location())) + #text(size: 0.75em, "Further usage without the authors consent is not permitted.")]]] } -#let currentH(level: 1)={ +#let numberingH(c) = { + return numbering(c.numbering, ..counter(heading).at(c.location())) +} + +#let currentH(level: 1) = { let elems = query(selector(heading.where(level: level)).after(here())) if elems.len() != 0 and elems.first().location().page() == here().page() { @@ -59,11 +61,13 @@ hyphenate: true, dir: ltr, font: style.text.font, - fill: ABB-BLACK) + fill: ABB-BLACK, + ) show heading: set text( font: style.heading.font, - weight: "semibold") + weight: "semibold", + ) set heading(supplement: [chapter]) @@ -75,10 +79,15 @@ show heading.where(level: 3): it => v(0.5em) + it + v(0.25em) // set theme for code blocks - set raw( - tab-size: style.code.tab-size, - theme: style.code.theme) - show raw.where(block: false): it => box(stroke: 1pt + ABB-GRAY-05, radius: 2pt, inset: (left: 2pt, right: 2pt), outset: (top: 4pt, bottom: 4pt), fill: ABB-GRAY-06, text(font: style.code.font, size: style.code.size, it.text)) + set raw(tab-size: style.code.tab-size) + show raw.where(block: false): it => box( + stroke: 1pt + ABB-GRAY-05, + radius: 2pt, + inset: (left: 2pt, right: 2pt), + outset: (top: 4pt, bottom: 4pt), + fill: ABB-GRAY-06, + text(font: style.code.font, size: style.code.size, it.text), + ) show figure.where(kind: raw): it => align(left)[ #let content = it.body #let lang = if content.has("lang") { @@ -87,51 +96,61 @@ none } #block( - width: 100%, - fill: ABB-GRAY-06, - stroke: 1pt + ABB-GRAY-05, - radius: 0.5em, - inset: 0.75em, - clip: false, - { - let (columns, align, make_row) = { - if style.code.lines {( + width: 100%, + fill: ABB-GRAY-06, + stroke: 1pt + ABB-GRAY-05, + radius: 0.5em, + inset: 0.75em, + clip: false, + { + let (columns, align, make_row) = { + if style.code.lines { + ( (auto, 1fr), (right + top, left), e => { let (i, l) = e let n = i + 1 - let n_str = if (calc.rem(n, 1) == 0) or (true and i == 0) { text(font: style.code.font, size: style.code.size, fill: ABB-BLACK, str(n)) } else { none } + let n_str = if (calc.rem(n, 1) == 0) or (true and i == 0) { + text(font: style.code.font, size: style.code.size, fill: ABB-BLACK, str(n)) + } else { + none + } (n_str + h(0.5em), raw(block: true, lang: lang, l)) - }) - } - else { - ( ( 1fr, ), - ( left, ), - e => { - let (i, l) = e - raw(block: true, lang: lang, l) - } - ) - } + }, + ) + } else { + ( + (1fr,), + (left,), + e => { + let (i, l) = e + raw(block: true, lang: lang, l) + }, + ) } - grid( - stroke: none, - columns: columns, - rows: (auto,), - gutter: 0pt, - inset: 0.25em, - align: (col, _) => align.at(col), - fill: ABB-GRAY-06, - ..content - .text - .split("\n") - .enumerate() - .map(make_row) - .flatten() - .map(c => if c.has("text") and c.text == "" { v(1em) } else { c }) + } + grid( + stroke: none, + columns: columns, + rows: (auto,), + gutter: 0pt, + inset: 0.25em, + align: (col, _) => align.at(col), + fill: ABB-GRAY-06, + ..content.text.split("\n").enumerate().map(make_row).flatten().map(c => if c.has("text") and c.text == "" { + v(1em) + } else { + c + }) + ) + if lang != none { + place( + top + right, + text(font: style.code.font, size: style.code.size, ligatures: true, fill: ABB-GRAY-03, lang), ) - } + } + }, ) #v(-1em) #align(center + top, it.caption) @@ -168,8 +187,20 @@ stroke: (x, y) => ( left: none, right: none, - top: if y == 0 { 1.5pt } else if y < 2 { 1pt } else { 0.5pt }, - bottom: if y == 0 { 1pt } else { 1.5pt } )) + top: if y == 0 { + 1.5pt + } else if y < 2 { + 1pt + } else { + 0.5pt + }, + bottom: if y == 0 { + 1pt + } else { + 1.5pt + }, + ), + ) // make table header bold show table.cell.where(y: 0): set text(weight: "bold") @@ -178,7 +209,8 @@ set par( justify: true, first-line-indent: 1em, - leading: 1em) + leading: 1em, + ) // give links a color show link: set text(fill: style.link.color) @@ -194,10 +226,11 @@ top: style.page.margin.top + style.header.underline-top-padding + style.header.content-padding, bottom: style.page.margin.bottom + style.footer.content-padding, left: style.page.margin.left, - right: style.page.margin.right), + right: style.page.margin.right, + ), numbering: (..nums) => { let current-page = here().page() - if current-page == 1{ + if current-page == 1 { [] } else if query().first().location().page() > current-page { numbering("I", nums.pos().first()) @@ -238,7 +271,10 @@ // right align logo of DHBW align(right, image("res/DHBW.svg", height: style.header.logo-height))) - } else if query().first().location().page() >= current-page and query().first().location().page() < current-page + 1 { + } else if query().first().location().page() >= current-page and query() + .first() + .location() + .page() < current-page + 1 { let heading = currentH() heading.at(0) @@ -251,7 +287,8 @@ v(style.header.underline-top-padding - 1em) line(length: 100%) } - }) + }, + ) body } diff --git a/template/main.typ b/template/main.typ index abff4a4..fac607d 100644 --- a/template/main.typ +++ b/template/main.typ @@ -98,7 +98,6 @@ fn main() { #pagebreak() - = Conclusion #lorem(320) \ No newline at end of file