Skip to content

Commit

Permalink
Ole/prepare release (#32)
Browse files Browse the repository at this point in the history
* chore: Add copyright notice to document

* chore: Use Charis SIL font

* chore: Bump outrageous
  • Loading branch information
otytlandsvik authored Oct 28, 2024
1 parent 8c3c392 commit 03172c3
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
27 changes: 15 additions & 12 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,25 @@
"aarch64-darwin"
"x86_64-linux"
];
imports = [
inputs.pre-commit-hooks.flakeModule
];
imports = [ inputs.pre-commit-hooks.flakeModule ];
perSystem =
{
system,
config,
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;
Expand All @@ -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"
"./"
Expand All @@ -82,6 +83,8 @@
shellHook = ''
${config.pre-commit.installationScript}
'';

TYPST_FONT_PATHS = fontPackages;
};
};
};
Expand Down
8 changes: 4 additions & 4 deletions lib.typ
Original file line number Diff line number Diff line change
@@ -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": *

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions modules/supervisors.typ
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Binary file modified template/thesis.pdf
Binary file not shown.

0 comments on commit 03172c3

Please sign in to comment.