From df480875df8eb088ff4c1e2a17d7d803a3b978bc Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 18 Mar 2025 14:57:57 +0100 Subject: [PATCH] ref(lib): Rename skill_item to sidebar_entry We use the function for all entries in the sidebar (volunteering, languages, etc) not just skills. --- cv.typ | 8 ++++---- lib.typ | 36 ++++++++++++++++++------------------ resume.typ | 9 ++++----- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/cv.typ b/cv.typ index 227584a..19a5459 100644 --- a/cv.typ +++ b/cv.typ @@ -65,7 +65,7 @@ section( title: title, { - skill_item(item: contents.skills) + sidebar_entry(item: contents.skills) }, ) } @@ -75,7 +75,7 @@ section( title: title, { - skill_item(item: contents.languages) + sidebar_entry(item: contents.languages) }, ) } @@ -97,14 +97,14 @@ if "languages" in contents { let title = (en: "Languages", de: "Sprachen").at(lang) [== #title] - skill_item(item: contents.languages, is_sidebar: true) + sidebar_entry(item: contents.languages, is_sidebar: true) [\ ] } if "skills" in contents { let title = (en: "Qualifications", de: "Kenntnisse").at(lang) [== #title] - skill_item(item: contents.skills, is_sidebar: true) + sidebar_entry(item: contents.skills, is_sidebar: true) } } diff --git a/lib.typ b/lib.typ index c27d018..d82a0a1 100644 --- a/lib.typ +++ b/lib.typ @@ -90,6 +90,24 @@ } } + +#let sidebar_entry(item: (), is_sidebar: false) = { + let side_list(body) = if is_sidebar { list(body) } else { par(body) } + for skill in item { + side_list({ + [*#skill.name.at(lang)*] + if is_sidebar [\ ] else [ (] + for (i, v) in skill.items.enumerate() { + [#v.at(lang)] + if i < skill.items.len() - 1 { + [, ] + } + } + if not is_sidebar [)] + }) + } +} + #let horizon_line() = { v(-3pt) line(length: 100%) @@ -161,21 +179,3 @@ [*#item.title.at(lang)* #item.place.at(lang) #h(1fr)] [#par(item.abstract.at(lang))] } - -// skill-specific entry, changing its style for sidebar -#let skill_item(item: (), is_sidebar: false) = { - let side_list(body) = if is_sidebar { list(body) } else { par(body) } - for skill in item { - side_list({ - [*#skill.name.at(lang)*] - if is_sidebar [\ ] else [ (] - for (i, v) in skill.items.enumerate() { - [#v.at(lang)] - if i < skill.items.len() - 1 { - [, ] - } - } - if not is_sidebar [)] - }) - } -} diff --git a/resume.typ b/resume.typ index df2715a..42764df 100644 --- a/resume.typ +++ b/resume.typ @@ -75,7 +75,7 @@ section( title: title, { - skill_item(item: contents.skills) + sidebar_entry(item: contents.skills) }, ) } @@ -85,7 +85,7 @@ section( title: title, { - skill_item(item: contents.languages) + sidebar_entry(item: contents.languages) }, ) } @@ -108,14 +108,14 @@ if item == "languages" and "languages" in contents { let title = (en: "Languages", de: "Sprachen").at(lang) [== #title] - skill_item(item: contents.languages, is_sidebar: true) + sidebar_entry(item: contents.languages, is_sidebar: true) [\ ] } if item == "skills" and "skills" in contents { let title = (en: "Qualifications", de: "Kenntnisse").at(lang) [== #title] - skill_item(item: contents.skills, is_sidebar: true) + sidebar_entry(item: contents.skills, is_sidebar: true) } } } @@ -150,7 +150,6 @@ align( right, block( - fill: luma(250), width: 90%, { v(15pt)