diff --git a/README.md b/README.md index f738325..cacf583 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This template uses a number of different fonts: - Open Sans (Noto Sans) - JetBrains Mono (Fira Code) -- Charter +- Charis SIL (Charter) The above parenthesized fonts are fallback typefaces available by default in [the web app](https://typst.app). If you'd like to use the main fonts instead, simply upload the `.ttf`s to the web app and it will detect and apply them automatically. diff --git a/flake.nix b/flake.nix index 693b604..ad372d1 100644 --- a/flake.nix +++ b/flake.nix @@ -26,9 +26,7 @@ "aarch64-darwin" "x86_64-linux" ]; - imports = [ - inputs.pre-commit-hooks.flakeModule - ]; + imports = [ inputs.pre-commit-hooks.flakeModule ]; perSystem = { system, @@ -36,6 +34,17 @@ pkgs, ... }: + let + fontPackages = pkgs.symlinkJoin { + name = "typst-fonts"; + paths = with pkgs; [ + noto-fonts + open-sans + jetbrains-mono + charis-sil + ]; + }; + in { pre-commit = { check.enable = true; @@ -50,15 +59,7 @@ default = inputs.typst-nix.lib.${system}.mkTypstDerivation { name = "modern-uit-thesis"; src = ./.; - extraFonts = pkgs.symlinkJoin { - name = "typst-fonts"; - paths = with pkgs; [ - noto-fonts - open-sans - jetbrains-mono - texlivePackages.charter - ]; - }; + extraFonts = fontPackages; extraCompileFlags = [ "--root" "./" @@ -82,6 +83,8 @@ shellHook = '' ${config.pre-commit.installationScript} ''; + + TYPST_FONT_PATHS = fontPackages; }; }; }; diff --git a/lib.typ b/lib.typ index 131b140..02604fa 100644 --- a/lib.typ +++ b/lib.typ @@ -1,6 +1,6 @@ #import "@preview/subpar:0.1.1" #import "@preview/physica:0.9.3": * -#import "@preview/outrageous:0.2.0" +#import "@preview/outrageous:0.3.0" #import "@preview/glossarium:0.5.0": make-glossary, register-glossary #import "@preview/codly:1.0.0": * @@ -250,8 +250,8 @@ show footnote.entry: set par(hanging-indent: 1.5em) // Set the body font. - // Default is Charter at 11pt - set text(font: "Charter", size: 11pt) + // Default is Charis SIL at 11pt + set text(font: ("Charis SIL", "Charter"), size: 11pt) // Set raw text font. // Default is JetBrains Mono at 9tp with DejaVu Sans Mono as fallback @@ -568,7 +568,7 @@ ..outrageous.presets.typst, font-weight: ("bold", auto), fill: (none, auto), - font: ("Charter", "Charter"), + font: (("Charis SIL", "Charter"), ("Charis SIL", "Charter")), vspace: (1.5em, 0.5em), // Manually add indent and spacing diff --git a/modules/supervisors.typ b/modules/supervisors.typ index 1b78156..e07d467 100644 --- a/modules/supervisors.typ +++ b/modules/supervisors.typ @@ -13,6 +13,17 @@ // --- Supervisors --- page( numbering: none, + footer: [ + #align(center)[ + #par(spacing: .75em)[ + This document was typeset with Typst using the _modern UiT thesis_ template + + #sym.copyright 2024 -- Moritz Jörg and Ole Tytlandsvik + + #link("https://github.com/mrtz-j/typst-thesis-template") + ] + ] + ], [ #text( 14pt, diff --git a/template/thesis.pdf b/template/thesis.pdf index 5f36a61..5237a9e 100644 Binary files a/template/thesis.pdf and b/template/thesis.pdf differ