fix: layout

Co-authored-by: Carlo Rosso <carlorosso@Carlos-MacBook-Air.local>

.github/workflows/release.yml

@@ -14,7 +14,7 @@ env:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/tests.yml

@@ -1,22 +1,22 @@
 name: Tests
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   tests:
     strategy:
       matrix:
         # add any other Typst versions that your package should support
-        typst-version: ["0.12"]
+        typst-version: ["0.12", "0.13"]
         # the docs don't need to build with all versions supported by the package;
         # the latest one is enough
         include:
-          - typst-version: "0.12"
+          - typst-version: "0.13"
             doc: 1
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -37,12 +37,10 @@ jobs:
         with:
           crate: just
 
-      - name: Install typst-test from github
+      - name: Install tytanic
-        uses: baptiste0928/cargo-install@v3
+        uses: taiki-e/cache-cargo-install-action@v2
         with:
-          crate: typst-test
+          tool: tytanic@0.2.2
-          git: https://github.com/tingerrr/typst-test.git
-          tag: ci-semi-stable
 
       - name: Setup typst
         uses: typst-community/setup-typst@v3
@@ -51,22 +49,25 @@ jobs:
 
       - name: Install fonts
         run: |
-            sudo apt update
+          sudo apt update
-            sudo apt-get install fonts-roboto
+          sudo apt-get install fonts-roboto
-            ./scripts/install-fontawesome
+          ./scripts/install-fontawesome
-            ./scripts/install-source-sans
+          ./scripts/install-source-sans
+          typst fonts
 
-      - name: Install locally
+      - name: Uninstall previous local install
-        run: just install
+        run: just uninstall
 
       - name: Run test suite
-        run: just test
+        run: |
+          just install
+          tt run --font-path ~/.fonts --no-fail-fast
 
       - name: Archive diffs
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: diffs
+          name: diffs-typst-${{ matrix.typst-version }}
           path: |
             tests/**/diff/*.png
             tests/**/out/*.png

Justfile

@@ -7,39 +7,51 @@ default:
     @just --list --unsorted
 
 # generate manual
+[doc('Generate package documentation')]
+[group('package')]
 doc:
     typst compile docs/manual.typ docs/manual.pdf
 
-# run test suite
+[doc('Run test suite. Requires tytanic.')]
-test *args:
+[group('dev')]
-    typst-test run {{ args }}
+test *args: install
+    tt run {{ args }} --use-system-fonts --no-fail-fast
 
-# update test cases
+[doc('Update test cases. Requires tytanic.')]
+[group('dev')]
 update *args:
-    typst-test update {{ args }}
+    tt update {{ args }} --use-system-fonts
 
-# package the library into the specified destination folder
+[doc('Package the library into the specified destination folder')]
+[group('package')]
 package target:
   ./scripts/package "{{target}}"
 
-# install the library with the "@local" prefix
+[doc('Install the library with the "@local" prefix')]
+[group('dev')]
 install: (package "@local")
 
-# install the library with the "@preview" prefix (for pre-release testing)
+[doc('Install the library with the "@preview" prefix (for pre-release testing)')]
+[group('dev')]
 install-preview: (package "@preview")
 
 [private]
 remove target:
   ./scripts/uninstall "{{target}}"
 
-# uninstalls the library from the "@local" prefix
+[doc('Uninstall the library from the "@local" prefix')]
+[group('dev')]
 uninstall: (remove "@local")
 
-# uninstalls the library from the "@preview" prefix (for pre-release testing)
+[doc('Uninstall the library from the "@preview" prefix (for pre-release testing)')]
+[group('dev')]
 uninstall-preview: (remove "@preview")
 
+[doc('Format the source code. Requires typstyle.')]
+[group('dev')]
 format:
     ./scripts/format
 
-# run ci suite
+[doc('Run ci suite')]
+[group('dev')]
 ci: test doc

README.md

@@ -1,4 +1,8 @@
-# Modern CV
+<h1 align="center">
+  <img src="assets/images/header.png" alt="Header">
+  <br><br>
+  Modern CV
+</h1>
 
 [![say thanks](https://img.shields.io/badge/Say%20Thanks-👍-1EAEDB.svg)](https://github.com/DeveloperPaul123/modern-cv/stargazers)
 [![Discord](https://img.shields.io/discord/652515194572111872?logo=Discord)](https://discord.gg/CX2ybByRnt)
@@ -7,6 +11,20 @@
 
 A port of the [Awesome-CV](https://github.com/posquit0/Awesome-CV) Latex resume template in [typst](https://github.com/typst/typst).
 
+## Features
+
+- Modern and clean design
+- Easy to use and customize (colors, profile picture, fonts, etc.)
+- Support for multiple sections (education, experience, skills, etc.)
+- Support for multiple languages
+
+## Preview
+
+| Resumes | Cover letters |
+| --- | --- |
+| ![Resume](assets/images/resume.png) | ![Cover Letter](assets/images/coverletter.png) |
+| ![Resume 2](assets/images/resume2.png) | ![Cover Letter 2](assets/images/coverletter2.png)|
+
 ## Requirements
 
 ### Tools
@@ -56,7 +74,7 @@ Below is a basic example for a simple resume:
   ),
   profile-picture: none,
   date: datetime.today().display(),
-  page-size: "us-letter"
+  paper-size: "us-letter"
 )
 
 = Education
@@ -85,13 +103,6 @@ For more information on how to use and compile `typst` files, see the [official
 
 Documentation for this template is published with each commit. See the attached PDF on each Github Action run [here](https://github.com/DeveloperPaul123/modern-cv/actions).
 
-### Output Examples
-
-| Resumes | Cover letters |
-| --- | --- |
-| ![Resume](assets/images/resume.png) | ![Cover Letter](assets/images/coverletter.png) |
-| ![Resume 2](assets/images/resume2.png) | ![Cover Letter 2](assets/images/coverletter2.png)|
-
 ## Building and Testing Locally
 
 To build and test the project locally, you will need to install the `typst` CLI. You can find instructions on how to do this [here](https://github.com/typst/typst#installation).

docs/manual.typ

@@ -1,9 +1,7 @@
 #import "../lib.typ"
-#import "@preview/tidy:0.3.0"
+#import "@preview/tidy:0.4.1"
 
-#let docs = tidy.parse-module(
+#let docs = tidy.parse-module(read("../lib.typ"), name: "Modern CV", scope: (
-  read("../lib.typ"),
+  resume: lib,
-  name: "Modern CV",
+))
-  scope: (resume: lib),
+#tidy.show-module(docs, style: tidy.styles.minimal)
-)
-#tidy.show-module(docs)

lib.typ

@@ -1,37 +1,40 @@
 #import "@preview/fontawesome:0.5.0": *
-#import "@preview/linguify:0.4.1": *
+#import "@preview/linguify:0.4.2": *
-
-// const color
-#let color-darknight = rgb("#131A28")
-#let color-darkgray = rgb("#333333")
-#let color-gray = rgb("#5d5d5d")
-#let default-accent-color = rgb("#262F99")
-#let default-location-color = rgb("#333333")
 
 // const icons
-#let linkedin-icon = box(
+#let linkedin-icon = box(fa-icon("linkedin"))
-  fa-icon("linkedin", fill: color-darknight),
+#let github-icon = box(fa-icon("github"))
-)
+#let gitlab-icon = box(fa-icon("gitlab"))
-#let github-icon = box(
+#let bitbucket-icon = box(fa-icon("bitbucket"))
-  fa-icon("github", fill: color-darknight),
+#let twitter-icon = box(fa-icon("twitter"))
-)
+#let google-scholar-icon = box(fa-icon("google-scholar"))
-#let twitter-icon = box(
+#let orcid-icon = box(fa-icon("orcid"))
-  fa-icon("twitter", fill: color-darknight),
+#let phone-icon = box(fa-icon("square-phone"))
-)
+#let email-icon = box(fa-icon("envelope"))
-#let google-scholar-icon = box(
+#let birth-icon = box(fa-icon("cake"))
-  fa-icon("google-scholar", fill: color-darknight),
+#let homepage-icon = box(fa-icon("home"))
-)
+#let website-icon = box(fa-icon("globe"))
-#let orcid-icon = box(
+#let address-icon = box(fa-icon("location-crosshairs"))
-  fa-icon("orcid", fill: color-darknight),
-)
-#let phone-icon = box(fa-icon("square-phone", fill: color-darknight))
-#let email-icon = box(fa-icon("envelope", fill: color-darknight))
-#let birth-icon = box(fa-icon("cake", fill: color-darknight))
-#let homepage-icon = box(fa-icon("home", fill: color-darknight))
-#let website-icon = box(fa-icon("globe", fill: color-darknight))
 
 /// Helpers
 
+// Common helper functions
+#let __format_author_name(author, language) = {
+  if language == "zh" or language == "ja" {
+    str(author.firstname) + str(author.lastname)
+  } else {
+    str(author.firstname) + " " + str(author.lastname)
+  }
+}
+
+#let __apply_smallcaps(content, use-smallcaps) = {
+  if use-smallcaps {
+    smallcaps(content)
+  } else {
+    content
+  }
+}
+
 // layout utility
 #let __justify_align(left_body, right_body) = {
   block[
@@ -64,23 +67,24 @@
   ]
 }
 
-#let __coverletter_footer(author, language, date, lang_data) = {
+#let __coverletter_footer(
-  set text(
+  author,
-    fill: gray,
+  language,
-    size: 8pt,
+  date,
-  )
+  lang_data,
+  use-smallcaps: true,
+) = {
+  set text(size: 8pt)
   __justify_align_3[
-    #smallcaps[#date]
+    #__apply_smallcaps(date, use-smallcaps)
   ][
-    #smallcaps[
+    #__apply_smallcaps(
-      #if language == "zh" or language == "ja" [
+      {
-        #author.firstname#author.lastname
+        let name = __format_author_name(author, language)
-      ] else [
+        name + " · " + linguify("cover-letter", from: lang_data)
-        #author.firstname#sym.space#author.lastname
+      },
-      ]
+      use-smallcaps,
-      #sym.dot.c
+    )
-      #linguify("cover-letter", from: lang_data)
-    ]
   ][
     #context {
       counter(page).display()
@@ -88,23 +92,18 @@
   ]
 }
 
-#let __resume_footer(author, language, lang_data, date) = {
+#let __resume_footer(author, language, lang_data, date, use-smallcaps: true) = {
-  set text(
+  set text(size: 8pt)
-    fill: gray,
-    size: 8pt,
-  )
   __justify_align_3[
-    #smallcaps[#date]
+    #__apply_smallcaps(date, use-smallcaps)
   ][
-    #smallcaps[
+    #__apply_smallcaps(
-      #if language == "zh" or language == "ja" [
+      {
-        #author.firstname#author.lastname
+        let name = __format_author_name(author, language)
-      ] else [
+        name + " · " + linguify("resume", from: lang_data)
-        #author.firstname#sym.space#author.lastname
+      },
-      ]
+      use-smallcaps,
-      #sym.dot.c
+    )
-      #linguify("resume", from: lang_data)
-    ]
   ][
     #context {
       counter(page).display()
@@ -121,7 +120,7 @@
   set box(height: 11pt)
 
   align(right + horizon)[
-    #fa-icon("github", fill: color-darkgray) #link(
+    #fa-icon("github") #link(
       "https://github.com/" + github-path,
       github-path,
     )
@@ -131,20 +130,14 @@
 /// Right section for the justified headers
 /// - body (content): The body of the right header
 #let secondary-right-header(body) = {
-  set text(
+  set text(size: 11pt, weight: "medium")
-    size: 11pt,
-    weight: "medium",
-  )
   body
 }
 
 /// Right section of a tertiaty headers.
 /// - body (content): The body of the right header
 #let tertiary-right-header(body) = {
-  set text(
+  set text(weight: "light", size: 9pt)
-    weight: "light",
-    size: 9pt,
-  )
   body
 }
 
@@ -152,10 +145,7 @@
 /// - primary (content): The primary section of the header
 /// - secondary (content): The secondary section of the header
 #let justified-header(primary, secondary) = {
-  set block(
+  set block(above: 0.7em, below: 0.7em)
-    above: 0.7em,
-    below: 0.7em,
-  )
   pad[
     #__justify_align[
       == #primary
@@ -186,28 +176,25 @@
 /// - author (content): Structure that takes in all the author's information
 /// - profile-picture (image): The profile picture of the author. This will be cropped to a circle and should be square in nature.
 /// - date (string): The date the resume was created
-/// - accent-color (color): The accent color of the resume
 /// - colored-headers (boolean): Whether the headers should be colored or not
 /// - language (string): The language of the resume, defaults to "en". See lang.toml for available languages
+/// - use-smallcaps (boolean): Whether to use small caps formatting throughout the template
 /// - body (content): The body of the resume
 /// -> none
 #let resume(
   author: (:),
   profile-picture: image,
   date: datetime.today().display("[month repr:long] [day], [year]"),
-  accent-color: default-accent-color,
   colored-headers: true,
   show-footer: true,
   language: "en",
   font: ("Source Sans Pro", "Source Sans 3"),
-  header-font: ("Roboto"),
+  header-font: ("Source Sans Pro", "Source Sans 3"),
   paper-size: "a4",
+  use-smallcaps: true,
+  show-address-icon: false,
   body,
 ) = {
-  if type(accent-color) == "string" {
-    accent-color = rgb(accent-color)
-  }
-  
   let lang_data = toml("lang.toml")
 
   show: body => context {
@@ -222,7 +209,6 @@
     font: font,
     lang: language,
     size: 11pt,
-    fill: color-darkgray,
     fallback: true,
   )
 
@@ -234,72 +220,44 @@
         language,
         lang_data,
         date,
+        use-smallcaps: use-smallcaps,
       )] else [],
     footer-descent: 0pt,
   )
 
   // set paragraph spacing
-  set par(
+  set par(spacing: 0.75em, justify: true)
-    spacing: 0.75em,
-    justify: true,
-  )
 
-  set heading(
+  set heading(numbering: none, outlined: false)
-    numbering: none,
-    outlined: false,
-  )
 
   show heading.where(level: 1): it => [
-    #set text(
+    #set text(size: 16pt, weight: "regular")
-      size: 16pt,
-      weight: "regular",
-    )
     #set align(left)
     #set block(above: 1em)
-    #let color = if colored-headers {
+    #text[#strong[#text()[#it.body]]]
-      accent-color
-    } else {
-      color-darkgray
-    }
-    #text[#strong[#text(color)[#it.body]]]
     #box(width: 1fr, line(length: 100%))
   ]
 
   show heading.where(level: 2): it => {
-    set text(
+    set text(size: 12pt, style: "normal", weight: "bold")
-      color-darkgray,
-      size: 12pt,
-      style: "normal",
-      weight: "bold",
-    )
     it.body
   }
 
   show heading.where(level: 3): it => {
-    set text(
+    set text(size: 10pt, weight: "regular")
-      size: 10pt,
+    __apply_smallcaps(it.body, use-smallcaps)
-      weight: "regular",
-    )
-    smallcaps[#it.body]
   }
 
   let name = {
-    align(center)[
+    align(left)[
       #pad(bottom: 5pt)[
         #block[
-          #set text(
+          #set text(size: 32pt, style: "normal", font: header-font)
-            size: 32pt,
-            style: "normal",
-            font: header-font,
-          )
           #if language == "zh" or language == "ja" [
-            #text(
+            #text(weight: "thin")[#author.firstname]#text(weight: "thin")[#author.lastname]
-              accent-color,
-              weight: "thin",
-            )[#author.firstname]#text(weight: "bold")[#author.lastname]
           ] else [
-            #text(accent-color, weight: "thin")[#author.firstname]
+            #text(weight: "thin")[#author.firstname]
-            #text(weight: "bold")[#author.lastname]
+            #text(weight: "thin")[#author.lastname]
           ]
         ]
       ]
@@ -307,28 +265,25 @@
   }
 
   let positions = {
-    set text(
+    set text(size: 9pt, weight: "regular")
-      accent-color,
+    align(left)[
-      size: 9pt,
+      #__apply_smallcaps(
-      weight: "regular",
+        author.positions.join(text[#"  "#sym.dot.c#"  "]),
-    )
+        use-smallcaps,
-    align(center)[
+      )
-      #smallcaps[
-        #author.positions.join(
-          text[#"  "#sym.dot.c#"  "],
-        )
-      ]
     ]
   }
 
   let address = {
-    set text(
+    set text(size: 9pt, weight: "regular")
-      size: 9pt,
+    align(left)[
-      weight: "regular",
-    )
-    align(center)[
       #if ("address" in author) [
-        #author.address
+        #if show-address-icon [
+          #address-icon
+          #box[#text(author.address)]
+        ] else [
+          #text(author.address)
+        ]
       ]
     ]
   }
@@ -338,12 +293,8 @@
 
     let separator = box(width: 5pt)
 
-    align(center)[
+    align(left)[
-      #set text(
+      #set text(size: 9pt, weight: "regular", style: "normal")
-        size: 9pt,
-        weight: "regular",
-        style: "normal",
-      )
       #block[
         #align(horizon)[
           #if ("birth" in author) [
@@ -353,7 +304,7 @@
           ]
           #if ("phone" in author) [
             #phone-icon
-            #box[#text(author.phone)]
+            #box[#link("tel:" + author.phone)[#author.phone]]
             #separator
           ]
           #if ("email" in author) [
@@ -370,6 +321,16 @@
             #github-icon
             #box[#link("https://github.com/" + author.github)[#author.github]]
           ]
+          #if ("gitlab" in author) [
+            #separator
+            #gitlab-icon
+            #box[#link("https://gitlab.com/" + author.gitlab)[#author.gitlab]]
+          ]
+          #if ("bitbucket" in author) [
+            #separator
+            #bitbucket-icon
+            #box[#link("https://bitbucket.org/" + author.bitbucket)[#author.bitbucket]]
+          ]
           #if ("linkedin" in author) [
             #separator
             #linkedin-icon
@@ -398,6 +359,23 @@
             #website-icon
             #box[#link(author.website)[#author.website]]
           ]
+          #if ("custom" in author and type(author.custom) == array) [
+            #for item in author.custom [
+              #if ("text" in item) [
+                #separator
+                #if ("icon" in item) [
+                  #box(fa-icon(item.icon))
+                ]
+                #box[
+                  #if ("link" in item) [
+                    #link(item.link)[#item.text]
+                  ] else [
+                    #item.text
+                  ]
+                ]
+              ]
+            ]
+          ]
         ]
       ]
     ]
@@ -406,7 +384,7 @@
   if profile-picture != none {
     grid(
       columns: (100% - 4cm, 4cm),
-      rows: (100pt),
+      rows: 100pt,
       gutter: 10pt,
       [
         #name
@@ -433,23 +411,14 @@
   }
 
   body
-
 }
 
 /// The base item for resume entries.
 /// This formats the item for the resume entries. Typically your body would be a bullet list of items. Could be your responsibilities at a company or your academic achievements in an educational background section.
 /// - body (content): The body of the resume entry
 #let resume-item(body) = {
-  set text(
+  set text(size: 10pt, weight: "light")
-    size: 10pt,
+  set block(above: 0.75em, below: 1.25em)
-    style: "normal",
-    weight: "light",
-    fill: color-darknight,
-  )
-  set block(
-    above: 0.75em,
-    below: 1.25em,
-  )
   set par(leading: 0.65em)
   block(above: 0.5em)[
     #body
@@ -462,19 +431,15 @@
 /// - date (string): The date of the resume entry, this can be a range (e.g. "Jan 2020 - Dec 2020")
 /// - description (content): The body of the resume entry
 /// - title-link (string): The link to use for the title (can be none)
-/// - accent-color (color): Override the accent color of the resume-entry
-/// - location-color (color): Override the default color of the "location" for a resume entry.
 #let resume-entry(
   title: none,
   location: "",
   date: "",
   description: "",
   title-link: none,
-  accent-color: default-accent-color,
-  location-color: default-location-color,
 ) = {
   let title-content
-  if type(title-link) == "string" {
+  if type(title-link) == str {
     title-content = link(title-link)[#title]
   } else {
     title-content = title
@@ -493,11 +458,7 @@
 /// *Example:*
 /// #example(`resume.resume-gpa("3.5", "4.0")`)
 #let resume-gpa(numerator, denominator) = {
-  set text(
+  set text(size: 12pt, style: "italic", weight: "light")
-    size: 12pt,
-    style: "italic",
-    weight: "light",
-  )
   text[Cumulative GPA: #box[#strong[#numerator] / #denominator]]
 }
 
@@ -510,6 +471,25 @@
   justified-header(certification, date)
 }
 
+/// Styling for resume skill categories.
+/// - category (string): The category
+#let resume-skill-category(category) = {
+  align(left)[
+    #set text(hyphenate: false)
+    == #category
+  ]
+}
+
+/// Styling for resume skill values/items
+/// - values (array): The skills to display
+#let resume-skill-values(values) = {
+  align(left)[
+    #set text(size: 11pt, style: "normal", weight: "light")
+    // This is a list so join by comma (,)
+    #values.join(", ")
+  ]
+}
+
 /// Show a list of skills in the resume under a given category.
 /// - category (string): The category of the skills
 /// - items (list): The list of skills. This can be a list of strings but you can also emphasize certain skills by using the `strong` function.
@@ -519,20 +499,30 @@
 
   pad[
     #grid(
-      columns: (20fr, 80fr),
+      columns: (3fr, 10fr),
+      gutter: 15pt,
+      resume-skill-category(category), resume-skill-values(items),
+    )
+  ]
+}
+
+/// Show a grid of skill lists with each row corresponding to a category of skills, followed by the skills themselves. The dictionary given to this function should have the skill categories as the dictionary keys and the values should be an array of values for the corresponding key.
+/// - categories_with_values (dictionary): key value pairs of skill categories and it's corresponding values (skills)
+#let resume-skill-grid(categories_with_values: (:)) = {
+  set block(below: 1.25em)
+  set pad(top: 2pt)
+
+  pad[
+    #grid(
+      columns: (auto, auto),
       gutter: 10pt,
-      align(right)[
+      ..categories_with_values
-        #set text(hyphenate: false)
+        .pairs()
-        == #category
+        .map(((key, value)) => (
-      ],
+          resume-skill-category(key),
-      align(left)[
+          resume-skill-values(value),
-        #set text(
+        ))
-          size: 11pt,
+        .flatten()
-          style: "normal",
-          weight: "light",
-        )
-        #items.join(", ")
-      ],
     )
   ]
 }
@@ -543,40 +533,40 @@
 
 #let default-closing(lang_data) = {
   align(bottom)[
-    #text(weight: "light", style: "italic")[ #linguify(
+    #text(weight: "light", style: "italic")[
-        "attached",
+      #linguify("attached", from: lang_data)#sym.colon #linguify(
+        "curriculum-vitae",
         from: lang_data,
-      )#sym.colon #linguify("curriculum-vitae", from: lang_data)]
+      )]
   ]
 }
 
 /// Cover letter template that is inspired by the Awesome CV Latex template by posquit0. This template can loosely be considered a port of the original Latex template.
 /// This coverletter template is designed to be used with the resume template.
-/// - author (content): Structure that takes in all the author's information. The following fields are required: firstname, lastname, positions. The following fields are used if available: email, phone, github, linkedin, orcid, address, website.
+/// - author (content): Structure that takes in all the author's information. The following fields are required: firstname, lastname, positions. The following fields are used if available: email, phone, github, linkedin, orcid, address, website, custom. The `custom` field is an array of additional entries with the following fields: text (string, required), icon (string, optional Font Awesome icon name), link (string, optional).
 /// - profile-picture (image): The profile picture of the author. This will be cropped to a circle and should be square in nature.
 /// - date (datetime): The date the cover letter was created. This will default to the current date.
-/// - accent-color (color): The accent color of the cover letter
 /// - language (string): The language of the cover letter, defaults to "en". See lang.toml for available languages
 /// - font (array): The font families of the cover letter
+/// - header-font (array): The font families of the cover letter header
 /// - show-footer (boolean): Whether to show the footer or not
 /// - closing (content): The closing of the cover letter. This defaults to "Attached Curriculum Vitae". You can set this to `none` to show the default closing or remove it completely.
+/// - use-smallcaps (boolean): Whether to use small caps formatting throughout the template
 /// - body (content): The body of the cover letter
 #let coverletter(
   author: (:),
   profile-picture: image,
   date: datetime.today().display("[month repr:long] [day], [year]"),
-  accent-color: default-accent-color,
   language: "en",
   font: ("Source Sans Pro", "Source Sans 3"),
+  header-font: ("Source Sans Pro", "Source Sans 3"),
   show-footer: true,
   closing: none,
   paper-size: "a4",
+  use-smallcaps: true,
+  show-address-icon: false,
   body,
 ) = {
-  if type(accent-color) == "string" {
-    accent-color = rgb(accent-color)
-  }
-  
   // language data
   let lang_data = toml("lang.toml")
 
@@ -596,7 +586,6 @@
     font: font,
     lang: language,
     size: 11pt,
-    fill: color-darkgray,
     fallback: true,
   )
 
@@ -608,33 +597,22 @@
         language,
         date,
         lang_data,
+        use-smallcaps: use-smallcaps,
       )] else [],
-    footer-descent: 0pt,
+    footer-descent: 2mm,
   )
 
   // set paragraph spacing
-  set par(
+  set par(spacing: 0.75em, justify: true)
-    spacing: 0.75em,
-    justify: true,
-  )
 
-  set heading(
+  set heading(numbering: none, outlined: false)
-    numbering: none,
-    outlined: false,
-  )
 
   show heading: it => [
-    #set block(
+    #set block(above: 1em, below: 1em)
-      above: 1em,
+    #set text(size: 16pt, weight: "regular")
-      below: 1em,
-    )
-    #set text(
-      size: 16pt,
-      weight: "regular",
-    )
 
     #align(left)[
-      #text[#strong[#text(accent-color)[#it.body]]]
+      #text[#strong[#text()[#it.body]]]
       #box(width: 1fr, line(length: 100%))
     ]
   ]
@@ -643,19 +621,12 @@
     align(right)[
       #pad(bottom: 5pt)[
         #block[
-          #set text(
+          #set text(size: 32pt, style: "normal", font: header-font)
-            size: 32pt,
-            style: "normal",
-            font: ("Roboto"),
-          )
           #if language == "zh" or language == "ja" [
-            #text(
+            #text(weight: "thin")[#author.firstname]#text(weight: "thin")[#author.lastname]
-              accent-color,
-              weight: "thin",
-            )[#author.firstname]#text(weight: "bold")[#author.lastname]
           ] else [
-            #text(accent-color, weight: "thin")[#author.firstname]
+            #text(weight: "thin")[#author.firstname]
-            #text(weight: "bold")[#author.lastname]
+            #text(weight: "thin")[#author.lastname]
           ]
 
         ]
@@ -664,29 +635,25 @@
   }
 
   let positions = {
-    set text(
+    set text(size: 9pt, weight: "regular")
-      accent-color,
-      size: 9pt,
-      weight: "regular",
-    )
     align(right)[
-      #smallcaps[
+      #__apply_smallcaps(
-        #author.positions.join(
+        author.positions.join(text[#"  "#sym.dot.c#"  "]),
-          text[#"  "#sym.dot.c#"  "],
+        use-smallcaps,
-        )
+      )
-      ]
     ]
   }
 
   let address = {
-    set text(
+    set text(size: 9pt, weight: "regular")
-      size: 9pt,
-      weight: "bold",
-      fill: color-gray,
-    )
     align(right)[
       #if ("address" in author) [
-        #author.address
+        #if show-address-icon [
+          #address-icon
+          #box[#text(author.address)]
+        ] else [
+          #text(author.address)
+        ]
       ]
     ]
   }
@@ -694,70 +661,107 @@
   let contacts = {
     set box(height: 9pt)
 
-    let separator = [  #box(sym.bar.v)  ]
+    let separator = box(width: 5pt)
-    let author_list = ()
-
-    if ("phone" in author) {
-      author_list.push[
-        #phone-icon
-        #box[#text(author.phone)]
-      ]
-    }
-    if ("email" in author) {
-      author_list.push[
-        #email-icon
-        #box[#link("mailto:" + author.email)[#author.email]]
-      ]
-    }
-    if ("github" in author) {
-      author_list.push[
-        #github-icon
-        #box[#link("https://github.com/" + author.github)[#author.github]]
-      ]
-    }
-    if ("linkedin" in author) {
-      author_list.push[
-        #linkedin-icon
-        #box[
-          #link("https://www.linkedin.com/in/" + author.linkedin)[#author.firstname #author.lastname]
-        ]
-      ]
-    }
-    if ("orcid" in author) {
-      author_list.push[
-        #orcid-icon
-        #box[#link("https://orcid.org/" + author.orcid)[#author.orcid]]
-      ]
-    }
-    if ("website" in author) {
-      author_list.push[
-        #website-icon
-        #box[#link(author.website)[#author.website]]
-      ]
-    }
-
 
     align(right)[
-      #set text(
+      #set text(size: 9pt, weight: "regular", style: "normal")
-        size: 8pt,
+      #block[
-        weight: "light",
+        #align(horizon)[
-        style: "normal",
+          #if ("birth" in author) [
-      )
+            #birth-icon
-      #author_list.join(separator)
+            #box[#text(author.birth)]
+            #separator
+          ]
+          #if ("phone" in author) [
+            #phone-icon
+            #box[#link("tel:" + author.phone)[#author.phone]]
+            #separator
+          ]
+          #if ("email" in author) [
+            #email-icon
+            #box[#link("mailto:" + author.email)[#author.email]]
+          ]
+          #if ("homepage" in author) [
+            #separator
+            #homepage-icon
+            #box[#link(author.homepage)[#author.homepage]]
+          ]
+          #if ("github" in author) [
+            #separator
+            #github-icon
+            #box[#link("https://github.com/" + author.github)[#author.github]]
+          ]
+          #if ("gitlab" in author) [
+            #separator
+            #gitlab-icon
+            #box[#link("https://gitlab.com/" + author.gitlab)[#author.gitlab]]
+          ]
+          #if ("bitbucket" in author) [
+            #separator
+            #bitbucket-icon
+            #box[#link("https://bitbucket.org/" + author.bitbucket)[#author.bitbucket]]
+          ]
+          #if ("linkedin" in author) [
+            #separator
+            #linkedin-icon
+            #box[
+              #link("https://www.linkedin.com/in/" + author.linkedin)[#author.firstname #author.lastname]
+            ]
+          ]
+          #if ("twitter" in author) [
+            #separator
+            #twitter-icon
+            #box[#link("https://twitter.com/" + author.twitter)[\@#author.twitter]]
+          ]
+          #if ("scholar" in author) [
+            #let fullname = str(author.firstname + " " + author.lastname)
+            #separator
+            #google-scholar-icon
+            #box[#link("https://scholar.google.com/citations?user=" + author.scholar)[#fullname]]
+          ]
+          #if ("orcid" in author) [
+            #separator
+            #orcid-icon
+            #box[#link("https://orcid.org/" + author.orcid)[#author.orcid]]
+          ]
+          #if ("website" in author) [
+            #separator
+            #website-icon
+            #box[#link(author.website)[#author.website]]
+          ]
+          #if ("custom" in author and type(author.custom) == array) [
+            #for item in author.custom [
+              #if ("text" in item) [
+                #separator
+                #if ("icon" in item) [
+                  #box(fa-icon(item.icon))
+                ]
+                #box[
+                  #if ("link" in item) [
+                    #link(item.link)[#item.text]
+                  ] else [
+                    #item.text
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
     ]
   }
 
   let letter-heading = {
     grid(
-      columns: (1fr, 2fr),
+      columns: (4cm, 100% - 4cm),
-      rows: (100pt),
+      rows: 100pt,
       align(left + horizon)[
         #block(
           clip: true,
           stroke: 0pt,
           radius: 2cm,
           width: 4cm,
-          height: 4cm,
+          height: auto,
           profile-picture,
         )
       ],
@@ -773,15 +777,40 @@
   let signature = {
     align(bottom)[
       #pad(bottom: 2em)[
-        #text(weight: "light")[#linguify(
+        #text(weight: "light")[#linguify("sincerely", from: lang_data)#if (
-            "sincerely",
+            language != "de"
-            from: lang_data,
+          ) [#sym.comma]] \
-          )#if language != "de" [#sym.comma]] \
         #text(weight: "bold")[#author.firstname #author.lastname] \ \
       ]
     ]
   }
 
+  /// Cover letter heading that takes in the information for the hiring company and formats it properly.
+  /// - entity-info (content): The information of the hiring entity including the company name, the target (who's attention to), street address, and city
+  /// - date (date): The date the letter was written (defaults to the current date)
+  let hiring-entity-info(
+    entity-info: (:),
+    date: datetime.today().display("[month repr:long] [day], [year]"),
+    use-smallcaps: true,
+  ) = {
+    set par(leading: 1em)
+    pad(top: 1.5em, bottom: 1.5em)[
+      #__justify_align[
+        #text(weight: "bold", size: 12pt)[#entity-info.target]
+      ][
+        #text(weight: "light", style: "italic", size: 9pt)[#date]
+      ]
+
+      #pad(top: 0.65em, bottom: 0.65em)[
+        #text(weight: "regular", size: 9pt)[
+          #__apply_smallcaps(entity-info.name, use-smallcaps) \
+          #entity-info.street-address \
+          #entity-info.city \
+        ]
+      ]
+    ]
+  }
+
   // actual content
   letter-heading
   body
@@ -790,31 +819,6 @@
   closing
 }
 
-/// Cover letter heading that takes in the information for the hiring company and formats it properly.
-/// - entity-info (content): The information of the hiring entity including the company name, the target (who's attention to), street address, and city
-/// - date (date): The date the letter was written (defaults to the current date)
-#let hiring-entity-info(
-  entity-info: (:),
-  date: datetime.today().display("[month repr:long] [day], [year]"),
-) = {
-  set par(leading: 1em)
-  pad(top: 1.5em, bottom: 1.5em)[
-    #__justify_align[
-      #text(weight: "bold", size: 12pt)[#entity-info.target]
-    ][
-      #text(weight: "light", style: "italic", size: 9pt)[#date]
-    ]
-    
-    #pad(top: 0.65em, bottom: 0.65em)[
-      #text(weight: "regular", fill: color-gray, size: 9pt)[
-        #smallcaps[#entity-info.name] \
-        #entity-info.street-address \
-        #entity-info.city \
-      ]
-    ]
-  ]
-}
-
 /// Letter heading for a given job position and addressee.
 /// - job-position (string): The job position you are applying for
 /// - addressee (string): The person you are addressing the letter to
@@ -823,11 +827,14 @@
   let lang_data = toml("lang.toml")
 
   // TODO: Make this adaptable to content
-  underline(evade: false, stroke: 0.5pt, offset: 0.3em)[
+  [
-    #text(weight: "bold", size: 12pt)[#linguify("letter-position-pretext", from: lang_data) #job-position]
+    #text(weight: "bold", size: 12pt)[#linguify(
+        "letter-position-pretext",
+        from: lang_data,
+      ) "#job-position"]
   ]
-  pad(top: 1em, bottom: 1em)[
+  pad(top: 2em)[
-    #text(weight: "light", fill: color-gray)[
+    #text(weight: "light")[
       #if dear == "" [
         #linguify("dear", from: lang_data)
       ] else [

scripts/format

@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 set -eu
-
 find . -iname "*.typ" | xargs typstyle -i

scripts/install-source-sans

@@ -8,4 +8,14 @@ mkdir -p ~/.fonts
 find ~/source-sans-fonts -type f -name "*.otf" -exec cp {} ~/.fonts \;
 rm ~/source-sans.zip
 rm -rf ~/source-sans-fonts
+
+wget -O ~/source-sans-pro.zip https://github.com/adobe-fonts/source-sans-pro/archive/2.020R-ro/1.075R-it.zip
+mkdir -p ~/source-sans-pro-fonts
+unzip ~/source-sans-pro.zip -d ~/source-sans-pro-fonts
+mkdir -p ~/.fonts
+find ~/source-sans-pro-fonts -type f -name "*.otf" -exec cp {} ~/.fonts \;
+# clean up
+rm ~/source-sans-pro.zip
+rm -rf ~/source-sans-pro-fonts
+
 fc-cache -f -v

scripts/package

@@ -27,40 +27,40 @@ readarray -t ignores < <(grep -v '^#' .typstignore | grep '[^[:blank:]]')
 
 # recursively print all files that are not excluded via .typstignore
 function enumerate {
-	local root="$1"
+    local root="$1"
-	if [[ -f "$root" ]]; then
+    if [[ -f "$root" ]]; then
-		echo "$root"
+        echo "$root"
-	else
+    else
-		local files
+        local files
-		readarray -t files < <(find "$root" \
+        readarray -t files < <(find "$root" \
       -mindepth 1 -maxdepth 1 \
       -not -name .git \
       -not -name .typstignore)
-		# declare -p files >&2
+        # declare -p files >&2
 
-		local f
+        local f
-		for f in "${files[@]}"; do
+        for f in "${files[@]}"; do
-			local include
+            local include
-			include=1
+            include=1
 
-			local ignore
+            local ignore
-			for ignore in "${ignores[@]}"; do
+            for ignore in "${ignores[@]}"; do
-				if [[ "$ignore" =~ ^! ]]; then
+                if [[ "$ignore" =~ ^! ]]; then
-					ignore="${ignore:1}"
+                    ignore="${ignore:1}"
-					if [[ "$f" == ./$ignore ]]; then
+                    if [[ "$f" == ./$ignore ]]; then
-						# echo "\"$f\" matched \"!$ignore\"" >&2
+                        # echo "\"$f\" matched \"!$ignore\"" >&2
-						include=1
+                        include=1
-					fi
+                    fi
-				elif [[ "$f" == ./$ignore ]]; then
+                elif [[ "$f" == ./$ignore ]]; then
-					# echo "\"$f\" matched \"$ignore\"" >&2
+                    # echo "\"$f\" matched \"$ignore\"" >&2
-					include=0
+                    include=0
-				fi
+                fi
-			done
+            done
-			if [[ "$include" == 1 ]]; then
+            if [[ "$include" == 1 ]]; then
-				enumerate "$f"
+                enumerate "$f"
-			fi
+            fi
-		done
+        done
-	fi
+    fi
 }
 
 # List of all files that get packaged

scripts/update_thumbnails.ps1

@@ -2,4 +2,4 @@ typst compile -f png $PSScriptRoot/../template/resume.typ $PSScriptRoot/../asset
 typst compile -f png $PSScriptRoot/../template/coverletter.typ $PSScriptRoot/../assets/images/coverletter.png
 typst compile -f png $PSScriptRoot/../template/coverletter2.typ $PSScriptRoot/../assets/images/coverletter2.png
 
-oxipng.exe $PSScriptRoot/../assets/images/*
+oxipng.exe $PSScriptRoot/../assets/images/*.png

template/coverletter.typ

@@ -23,24 +23,25 @@
   // Remove the following line to show the footer
   // Or set the value to `true`
   show-footer: false,
+  // this defaults to false
+  show-address-icon: true,
   // set this to `none` to show the default or remove it completely
   closing: [],
   // see typst "page" documentation for more options
-  paper-size: "us-gov-legal"
+  paper-size: "us-gov-legal",
 )
 
-#hiring-entity-info(entity-info: (
+#hiring-entity-info(
-  target: "Company Recruitement Team",
+  entity-info: (
-  name: "Google, Inc.",
+    target: "Company Recruitement Team",
-  street-address: "1600 AMPHITHEATRE PARKWAY",
+    name: "Google, Inc.",
-  city: "MOUNTAIN VIEW, CA 94043",
+    street-address: "1600 AMPHITHEATRE PARKWAY",
-))
+    city: "MOUNTAIN VIEW, CA 94043",
-
+  ),
-#letter-heading(
-  job-position: "Software Engineer",
-  addressee: "Sir or Madame",
 )
 
+#letter-heading(job-position: "Software Engineer", addressee: "Sir or Madame")
+
 = About Me
 #coverletter-content[
   #lorem(80)

template/coverletter2.typ

@@ -14,23 +14,29 @@
       "Software Engineer",
       "Full Stack Developer",
     ),
+    custom: (
+      (
+        text: "Youtube Channel",
+        icon: "youtube",
+        link: "http://example.com",
+      ),
+    ),
   ),
   profile-picture: none,
   language: "sp",
 )
 
-#hiring-entity-info(entity-info: (
+#hiring-entity-info(
-  target: "Company Recruitement Team",
+  entity-info: (
-  name: "Google, Inc.",
+    target: "Company Recruitement Team",
-  street-address: "1600 AMPHITHEATRE PARKWAY",
+    name: "Google, Inc.",
-  city: "MOUNTAIN VIEW, CA 94043",
+    street-address: "1600 AMPHITHEATRE PARKWAY",
-))
+    city: "MOUNTAIN VIEW, CA 94043",
-
+  ),
-#letter-heading(
-  job-position: "Software Engineer",
-  addressee: "Sir or Madame",
 )
 
+#letter-heading(job-position: "Software Engineer", addressee: "Sir or Madame")
+
 #coverletter-content[
   #lorem(100)
 ]

template/resume.typ

@@ -19,12 +19,20 @@
       "Software Architect",
       "Developer",
     ),
+    custom: (
+      (
+        text: "Youtube Channel",
+        icon: "youtube",
+        link: "https://example.com",
+      ),
+    ),
   ),
-  profile-picture: none,
+  profile-picture: image("profile.png"),
   date: datetime.today().display(),
   language: "en",
   colored-headers: true,
   show-footer: false,
+  show-address-icon: true,
   paper-size: "us-letter",
 )
 
@@ -56,10 +64,7 @@
   #lorem(72)
 ]
 
-#resume-entry(
+#resume-entry(title: "Intern", location: "Example City, EX")
-  title: "Intern",
-  location: "Example City, EX",
-)
 
 #resume-item[
   - #lorem(20)
@@ -96,14 +101,62 @@
 = Skills
 
 #resume-skill-item(
-  "Languages",
+  "Programming Languages",
-  (strong("C++"), strong("Python"), "Java", "C#", "JavaScript", "TypeScript"),
+  (
+    strong("C++"),
+    strong("Python"),
+    "Rust",
+    "Java",
+    "C#",
+    "JavaScript",
+    "TypeScript",
+  ),
 )
 #resume-skill-item("Spoken Languages", (strong("English"), "Spanish"))
 #resume-skill-item(
   "Programs",
-  (strong("Excel"), "Word", "Powerpoint", "Visual Studio"),
+  (
+    strong("Excel"),
+    "Word",
+    "Powerpoint",
+    "Visual Studio",
+  ),
 )
+// spacing fix, not needed if you use `resume-skill-grid`
+#block(below: 0.65em)
+
+// An alternative way of list out your resume skills
+// #resume-skill-grid(
+//   categories_with_values: (
+//     "Programming Languages": (
+//       strong("C++"),
+//       strong("Python"),
+//       "Rust",
+//       "Java",
+//       "C#",
+//       "JavaScript",
+//       "TypeScript",
+//     ),
+//     "Spoken Languages": (
+//       strong("English"),
+//       "Spanish",
+//       "Greek",
+//     ),
+//     "Programs": (
+//       strong("Excel"),
+//       "Word",
+//       "Powerpoint",
+//       "Visual Studio",
+//       "git",
+//       "Zed"
+//     ),
+//     "Really Really Long Long Long Category": (
+//       "Thing 1",
+//       "Thing 2",
+//       "Thing 3"
+//     )
+//   ),
+// )
 
 = Education
 

tests/resume/test.typ

@@ -1,13 +1,8 @@
 #import "@local/modern-cv:0.8.0": *
 
 // setup the document like we do for the resume
-#let font = ("Source Sans Pro", "Source Sans 3")
+#let font = "Source Sans 3"
-#set text(
+#set text(font: font, size: 11pt, fill: color-darkgray, fallback: true)
-  font: font,
-  size: 11pt,
-  fill: color-darkgray,
-  fallback: true,
-)
 
 #set page(
   paper: "a4",
@@ -19,21 +14,12 @@
 // set paragraph spacing
 #set par(spacing: 0.75em, justify: true)
 
-#set heading(
+#set heading(numbering: none, outlined: false)
-  numbering: none,
-  outlined: false,
-)
 
 #show heading.where(level: 1): it => [
 
-  #set block(
+  #set block(above: 1em, below: 1em)
-    above: 1em,
+  #set text(size: 16pt, weight: "regular")
-    below: 1em,
-  )
-  #set text(
-    size: 16pt,
-    weight: "regular",
-  )
 
   #align(left)[
     #let color = if colored-headers {
@@ -48,20 +34,12 @@
 ]
 
 #show heading.where(level: 2): it => {
-  set text(
+  set text(color-darkgray, size: 12pt, style: "normal", weight: "bold")
-    color-darkgray,
-    size: 12pt,
-    style: "normal",
-    weight: "bold",
-  )
   it.body
 }
 
 #show heading.where(level: 3): it => {
-  set text(
+  set text(size: 10pt, weight: "regular")
-    size: 10pt,
-    weight: "regular",
-  )
   smallcaps[#it.body]
 }
 
@@ -77,19 +55,10 @@
 )
 
 // resume-entry also support omitting the date and description
-#resume-entry(
+#resume-entry(title: "Title", location: "Location")
-  title: "Title",
-  location: "Location",
-)
 
-#resume-certification(
+#resume-certification("Certified Scrum Master (CSM)", "Jan 2022")
-  "Certified Scrum Master (CSM)",
-  "Jan 2022",
-)
 
-#resume-skill-item(
+#resume-skill-item("Programming", (strong["C++"], "Python", "Java"))
-  "Programming",
-  (strong["C++"], "Python", "Java"),
-)
 
 #resume-gpa("3.5", "4.0")

tests/utilities/test.typ

@@ -1,13 +1,8 @@
 #import "@local/modern-cv:0.8.0": *
 
 // setup the document like we do for the resume
-#let font = ("Source Sans Pro", "Source Sans 3")
+#let font = "Source Sans 3"
-#set text(
+#set text(font: font, size: 11pt, fill: color-darkgray, fallback: true)
-  font: font,
-  size: 11pt,
-  fill: color-darkgray,
-  fallback: true,
-)
 
 #set page(
   paper: "a4",
@@ -19,21 +14,12 @@
 // set paragraph spacing
 #set par(spacing: 0.75em, justify: true)
 
-#set heading(
+#set heading(numbering: none, outlined: false)
-  numbering: none,
-  outlined: false,
-)
 
 #show heading.where(level: 1): it => [
 
-  #set block(
+  #set block(above: 1em, below: 1em)
-    above: 1em,
+  #set text(size: 16pt, weight: "regular")
-    below: 1em,
-  )
-  #set text(
-    size: 16pt,
-    weight: "regular",
-  )
 
   #align(left)[
     #let color = if colored-headers {
@@ -48,20 +34,12 @@
 ]
 
 #show heading.where(level: 2): it => {
-  set text(
+  set text(color-darkgray, size: 12pt, style: "normal", weight: "bold")
-    color-darkgray,
-    size: 12pt,
-    style: "normal",
-    weight: "bold",
-  )
   it.body
 }
 
 #show heading.where(level: 3): it => {
-  set text(
+  set text(size: 10pt, weight: "regular")
-    size: 10pt,
-    weight: "regular",
-  )
   smallcaps[#it.body]
 }
 
@@ -80,6 +58,8 @@
 #birth-icon
 #homepage-icon
 #website-icon
+#gitlab-icon
+#bitbucket-icon
 
 #square(size: 1em, fill: color-darkgray)
 #square(size: 1em, fill: color-darknight)