diff --git a/README.md b/README.md index 5ee3521..d5c8bfa 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ ## Features > ⚠️ **Notice**
-> Typst ist under active development and thus may lack features an experienced LaTeX is used to. +> Typst ist under active development and thus may lack features an experienced LaTeX is used to. This template includes designs for a titlepage, confidantiality statement, declaration of authorship and more with a consistent design inspired by various unofficial works made by students at DHBW. Layout and the choise fonts are based on the unofficial [supercharged-dhbw](https://github.com/DannySeidel/typst-dhbw-template) Typst template. It comes with automatic generation of outlines for figures, tables, code snippets and appendices. The template can generate sections for a glossary, combinging acronyms and technical terms into a singular section. @@ -57,7 +57,7 @@ A short overview of all features the template is capable of: - Watermark for draft versions - Automatic form filling for data provided via configuration - Styles for captions, tables and equations -- ABB branding inspired code theme +- ABB branding inspired code theme ## Preview @@ -131,9 +131,10 @@ Complies with ABB branding guidelines such as: ## Fonts -Both fonts used in the document are licensed under the [Open Font License](https://openfontlicense.org/) and can be used for non-commercial as well as commercial purposes. They can be downloaded from google fonts: -- [Montserrat](https://fonts.google.com/specimen/Montserrat) -- [Open Sans](https://fonts.google.com/specimen/Open+Sans) +Both fonts used in the document are licensed under the [Open Font License](https://openfontlicense.org/) and can be used for non-commercial as well as commercial purposes: +- [Fira Sans](https://github.com/bBoxType/FiraSans) +- [Fira Math](https://github.com/firamath/firamath) +- [Fira Code NF](https://www.nerdfonts.com/font-downloads) Consider giving the creators of the font credit for their amazing work! @@ -144,8 +145,8 @@ The developers around Typst have made pretty handy comparison guide between LaTe ## Legal This template and its content is in no way officially affiliaterd with either DHBW or ABB AG. -Its only purpose is to simplify the process of getting started with the typsetting language Typst for writing a university report or thesis. -As author and owner of the reposity I claim no copyright of the logos used in the document, the software used to compile the source or the documents based on this template. +Its only purpose is to simplify the process of getting started with the typsetting language Typst for writing a university report or thesis. +As author and owner of the reposity I claim no copyright of the logos used in the document, the software used to compile the source or the documents based on this template. ## FAQ @@ -166,4 +167,4 @@ Typst in comparison is serval orders of magnitudes faster and has native support The logos for both ABB AG and DHBW are freely available at Wikimedia Commons: - [ABB logo as svg](https://commons.wikimedia.org/wiki/File:ABB_logo.svg) -- [DHBW logo as svg](https://upload.wikimedia.org/wikipedia/de/1/1d/DHBW-Logo.svg) \ No newline at end of file +- [DHBW logo as svg](https://upload.wikimedia.org/wikipedia/de/1/1d/DHBW-Logo.svg) diff --git a/fonts/Fira Code/FiraCodeNerdFont-Bold.ttf b/fonts/Fira Code/FiraCodeNerdFont-Bold.ttf new file mode 100644 index 0000000..8272834 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFont-Bold.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFont-Light.ttf b/fonts/Fira Code/FiraCodeNerdFont-Light.ttf new file mode 100644 index 0000000..210aba9 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFont-Light.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFont-Medium.ttf b/fonts/Fira Code/FiraCodeNerdFont-Medium.ttf new file mode 100644 index 0000000..88f657f Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFont-Medium.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFont-Regular.ttf b/fonts/Fira Code/FiraCodeNerdFont-Regular.ttf new file mode 100644 index 0000000..c530364 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFont-Regular.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFont-Retina.ttf b/fonts/Fira Code/FiraCodeNerdFont-Retina.ttf new file mode 100644 index 0000000..ea2d5e1 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFont-Retina.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFont-SemiBold.ttf b/fonts/Fira Code/FiraCodeNerdFont-SemiBold.ttf new file mode 100644 index 0000000..fa4dbea Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFont-SemiBold.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontMono-Bold.ttf b/fonts/Fira Code/FiraCodeNerdFontMono-Bold.ttf new file mode 100644 index 0000000..ddc143e Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontMono-Bold.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontMono-Light.ttf b/fonts/Fira Code/FiraCodeNerdFontMono-Light.ttf new file mode 100644 index 0000000..606f2c3 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontMono-Light.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontMono-Medium.ttf b/fonts/Fira Code/FiraCodeNerdFontMono-Medium.ttf new file mode 100644 index 0000000..e0df7b7 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontMono-Medium.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontMono-Regular.ttf b/fonts/Fira Code/FiraCodeNerdFontMono-Regular.ttf new file mode 100644 index 0000000..fd34efd Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontMono-Regular.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontMono-Retina.ttf b/fonts/Fira Code/FiraCodeNerdFontMono-Retina.ttf new file mode 100644 index 0000000..8b808b1 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontMono-Retina.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontMono-SemiBold.ttf b/fonts/Fira Code/FiraCodeNerdFontMono-SemiBold.ttf new file mode 100644 index 0000000..6660bbe Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontMono-SemiBold.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontPropo-Bold.ttf b/fonts/Fira Code/FiraCodeNerdFontPropo-Bold.ttf new file mode 100644 index 0000000..356a531 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontPropo-Bold.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontPropo-Light.ttf b/fonts/Fira Code/FiraCodeNerdFontPropo-Light.ttf new file mode 100644 index 0000000..bf85d40 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontPropo-Light.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontPropo-Medium.ttf b/fonts/Fira Code/FiraCodeNerdFontPropo-Medium.ttf new file mode 100644 index 0000000..ea41616 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontPropo-Medium.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontPropo-Regular.ttf b/fonts/Fira Code/FiraCodeNerdFontPropo-Regular.ttf new file mode 100644 index 0000000..06e77e3 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontPropo-Regular.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontPropo-Retina.ttf b/fonts/Fira Code/FiraCodeNerdFontPropo-Retina.ttf new file mode 100644 index 0000000..a169716 Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontPropo-Retina.ttf differ diff --git a/fonts/Fira Code/FiraCodeNerdFontPropo-SemiBold.ttf b/fonts/Fira Code/FiraCodeNerdFontPropo-SemiBold.ttf new file mode 100644 index 0000000..fecdadd Binary files /dev/null and b/fonts/Fira Code/FiraCodeNerdFontPropo-SemiBold.ttf differ diff --git a/fonts/Fira Code/LICENSE b/fonts/Fira Code/LICENSE new file mode 100644 index 0000000..805e0b3 --- /dev/null +++ b/fonts/Fira Code/LICENSE @@ -0,0 +1,93 @@ +Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/Fira Code/README.md b/fonts/Fira Code/README.md new file mode 100644 index 0000000..d50c2f3 --- /dev/null +++ b/fonts/Fira Code/README.md @@ -0,0 +1,48 @@ +# Nerd Fonts + +This is an archived font from the Nerd Fonts release v3.2.1. + +For more information see: +* https://github.com/ryanoasis/nerd-fonts/ +* https://github.com/ryanoasis/nerd-fonts/releases/latest/ + +# Fira Code + +**Fira Code** is a free monospaced font with programming ligatures. + +For more information have a look at the upstream website: https://github.com/tonsky/FiraCode + +Version: 6.2 + +## Which font? + +### TL;DR + +* Pick your font family: + * If you are limited to monospaced fonts (because of your terminal, etc) then pick a font with `Nerd Font Mono` (or `NFM`). + * If you want to have bigger icons (usually around 1.5 normal letters wide) pick a font without `Mono` i.e. `Nerd Font` (or `NF`). Most terminals support this, but ymmv. + * If you work in a proportional context (GUI elements or edit a presentation etc) pick a font with `Nerd Font Propo` (or `NFP`). + +### Ligatures + +Ligatures are generally preserved in the patched fonts. +Nerd Fonts `v2.0.0` had no ligatures in the `Nerd Font Mono` fonts, this has been dropped with `v2.1.0`. +If you have a ligature-aware terminal and don't want ligatures you can (usually) disable them in the terminal settings. + +### Explanation + +Once you narrow down your font choice of family (`Droid Sans`, `Inconsolata`, etc) and style (`bold`, `italic`, etc) you have 2 main choices: + +#### `Option 1: Download already patched font` + + * For a stable version download a font package from the [release page](https://github.com/ryanoasis/nerd-fonts/releases) + * Or download the development version from the folders here + +#### `Option 2: Patch your own font` + + * Patch your own variations with the various options provided by the font patcher (i.e. not include all symbols for smaller font size) + +For more information see: [The FAQ](https://github.com/ryanoasis/nerd-fonts/wiki/FAQ-and-Troubleshooting#which-font) + +[SIL-RFN]:http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web_fonts_and_RFNs#14cbfd4a + diff --git a/fonts/Fira Math/FiraMath-Regular.otf b/fonts/Fira Math/FiraMath-Regular.otf new file mode 100644 index 0000000..f1f9d40 Binary files /dev/null and b/fonts/Fira Math/FiraMath-Regular.otf differ diff --git a/fonts/Fira Math/LICENSE b/fonts/Fira Math/LICENSE new file mode 100644 index 0000000..430f354 --- /dev/null +++ b/fonts/Fira Math/LICENSE @@ -0,0 +1,92 @@ +Copyright (C) 2018--2023 by Xiangdong Zeng + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION AND CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/Fira Sans/FiraSans-Bold.ttf b/fonts/Fira Sans/FiraSans-Bold.ttf new file mode 100644 index 0000000..f03425a Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Bold.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Book.ttf b/fonts/Fira Sans/FiraSans-Book.ttf new file mode 100644 index 0000000..f6c2a6c Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Book.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Eight.ttf b/fonts/Fira Sans/FiraSans-Eight.ttf new file mode 100644 index 0000000..b7e13f6 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Eight.ttf differ diff --git a/fonts/Fira Sans/FiraSans-ExtraBold.ttf b/fonts/Fira Sans/FiraSans-ExtraBold.ttf new file mode 100644 index 0000000..397b9b5 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-ExtraBold.ttf differ diff --git a/fonts/Fira Sans/FiraSans-ExtraLight.ttf b/fonts/Fira Sans/FiraSans-ExtraLight.ttf new file mode 100644 index 0000000..a81f017 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-ExtraLight.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Four.ttf b/fonts/Fira Sans/FiraSans-Four.ttf new file mode 100644 index 0000000..a116142 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Four.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Hair.ttf b/fonts/Fira Sans/FiraSans-Hair.ttf new file mode 100644 index 0000000..24bf712 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Hair.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Heavy.ttf b/fonts/Fira Sans/FiraSans-Heavy.ttf new file mode 100644 index 0000000..718f5b3 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Heavy.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Light.ttf b/fonts/Fira Sans/FiraSans-Light.ttf new file mode 100644 index 0000000..d06adde Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Light.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Medium.ttf b/fonts/Fira Sans/FiraSans-Medium.ttf new file mode 100644 index 0000000..fc45d5d Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Medium.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Regular.ttf b/fonts/Fira Sans/FiraSans-Regular.ttf new file mode 100644 index 0000000..0118749 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Regular.ttf differ diff --git a/fonts/Fira Sans/FiraSans-SemiBold.ttf b/fonts/Fira Sans/FiraSans-SemiBold.ttf new file mode 100644 index 0000000..650d941 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-SemiBold.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Thin.ttf b/fonts/Fira Sans/FiraSans-Thin.ttf new file mode 100644 index 0000000..1aa9b53 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Thin.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Two.ttf b/fonts/Fira Sans/FiraSans-Two.ttf new file mode 100644 index 0000000..ea69be4 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Two.ttf differ diff --git a/fonts/Fira Sans/FiraSans-Ultra.ttf b/fonts/Fira Sans/FiraSans-Ultra.ttf new file mode 100644 index 0000000..bd79742 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-Ultra.ttf differ diff --git a/fonts/Fira Sans/FiraSans-UltraLight.ttf b/fonts/Fira Sans/FiraSans-UltraLight.ttf new file mode 100644 index 0000000..9397863 Binary files /dev/null and b/fonts/Fira Sans/FiraSans-UltraLight.ttf differ diff --git a/run-ci.sh b/run-ci.sh index 3afcba3..a25ddb3 100755 --- a/run-ci.sh +++ b/run-ci.sh @@ -44,10 +44,10 @@ function enter-section() { } enter-section "Typstyle checking" "./run-fmt.sh --check src/lib.typ" 0 -enter-section "Compiling template..." "typst compile template/main.typ --root . example.pdf" -enter-section "TEST: local template import" "typst compile tests/local-import/main.typ --root ." -enter-section "TEST: invalid config case 1" "typst compile tests/invalid-config/test-case-1.typ --root ." "should fail" -enter-section "TEST: invalid config case 2" "typst compile tests/invalid-config/test-case-2.typ --root ." -enter-section "TEST: invalid config case 3" "typst compile tests/invalid-config/test-case-3.typ --root ." "should fail" +enter-section "Compiling template..." "typst compile template/main.typ --root . --font-path fonts example.pdf" +enter-section "TEST: local template import" "typst compile tests/local-import/main.typ --root . --font-path fonts" +enter-section "TEST: invalid config case 1" "typst compile tests/invalid-config/test-case-1.typ --root . --font-path fonts" "should fail" +enter-section "TEST: invalid config case 2" "typst compile tests/invalid-config/test-case-2.typ --root . --font-path fonts" +enter-section "TEST: invalid config case 3" "typst compile tests/invalid-config/test-case-3.typ --root . --font-path fonts" "should fail" log "INFO" "CI completed successfully" diff --git a/src/conf.typ b/src/conf.typ index 271202e..dea9e63 100644 --- a/src/conf.typ +++ b/src/conf.typ @@ -59,9 +59,9 @@ bottom: 2.5cm)), text: ( size: 12pt, - font: "Open Sans"), + font: "Fira Sans"), heading: ( - font: "Montserrat"), + font: "Fira Sans"), code: ( theme: "res/abb.tmTheme", font: "FiraCode Nerd Font", diff --git a/src/pages/titlepage.typ b/src/pages/titlepage.typ index 5d33a54..121ea88 100644 --- a/src/pages/titlepage.typ +++ b/src/pages/titlepage.typ @@ -16,18 +16,20 @@ // title #v(2cm) - #set par(justify: false) - #text(size: 2em, weight: "semibold", hyphenate: false, thesis.title) + #par(justify: false, leading: 1.5em)[ + #text(size: 2em, weight: "bold", hyphenate: false, thesis.title) + #linebreak() + // subtitle + #text(size: 2em, weight: "light", thesis.subtitle) + ] - // subtitle - #text(size: 1.5em, thesis.subtitle) + #set align(center + horizon) // type of paper - #v(1cm) - #text(size: 1.5em, weight: "bold", thesis.kind) + #text(size: 1.5em, weight: "medium", thesis.kind) // faculty - #pad(top: 0.5cm)[ + #pad()[ #if text.lang == "de" [ Praxisphase des #author.semester Semesters an der Fakultät für #author.faculty #linebreak() @@ -42,7 +44,7 @@ ] // university - #pad(top: 0.5cm)[ + #pad()[ #if text.lang == "de" [ an der ] else if text.lang == "en" [ @@ -54,7 +56,7 @@ #author.university ] - #set align(horizon + left) + #set align(bottom + left) #if text.lang == "de" [ #table( @@ -64,9 +66,7 @@ stroke: none, [*Verfasser:*], author.name, [*Bearbeitungszeitraum:*], thesis.timeframe, - [*Matrikelnummer, Kurs:*], - str(author.matriculation-number) + ", " + author.course, - + [*Matrikelnummer, Kurs:*], str(author.matriculation-number) + ", " + author.course, [*Ausbildungsbetrieb:*], author.company, [*Betrieblicher Betreuer:*], author.supervisor, [*Abgabedatum:*], thesis.submission-date, @@ -79,9 +79,7 @@ stroke: none, [*Author:*], author.name, [*Editing period:*], thesis.timeframe, - [*Matriculation number, course:*], - str(author.matriculation-number) + ", " + author.course, - + [*Matriculation number, course:*], str(author.matriculation-number) + ", " + author.course, [*Training company:*], author.company, [*Company supervisor:*], author.supervisor, [*Submission date:*], thesis.submission-date, diff --git a/src/style.typ b/src/style.typ index 31b8a57..fa41677 100644 --- a/src/style.typ +++ b/src/style.typ @@ -75,7 +75,7 @@ show heading: set text( font: style.heading.font, - weight: "semibold", + weight: "bold" ) let header-supplement = if config.lang == "de" { @@ -87,6 +87,7 @@ set heading(supplement: [#header-supplement]) set math.equation(numbering: "(1)") + show math.equation: set text(font: "Fira Math", size: 12pt) // Set header spacing show heading.where(level: 1): it => v(2em) + it + v(1em) @@ -182,7 +183,7 @@ // based on: https://github.com/typst/typst/discussions/3871 show figure.caption: c => [ #if c.body.fields().len() > 0 { - text(weight: "semibold")[ + text(weight: "medium")[ #c.supplement #c.counter.display("1.1.1") ] c.separator diff --git a/template/main.typ b/template/main.typ index 94d4001..8d78ca1 100644 --- a/template/main.typ +++ b/template/main.typ @@ -58,7 +58,8 @@ $ angle.l a, b angle.r &= arrow(a) dot arrow(b) \ &= a_1 b_1 + a_2 b_2 + ... a_n b_n \ - &= sum_(i=1)^n a_i b_i. + &= sum_(i=1)^n a_i b_i. \ + integral_2^4(3x + 4x^2) $ #lorem(140)