Fix phrasing

Starting to move the separated efforts of functionality between CV and
resume into a library from which to import. Will take additional
simplification still.

content.yml

@@ -1,7 +1,7 @@
 about:
   fullname: Marty Oehme
   contact:
-    - text: Körnerstr. 54, 04107 Leipzig, Germany
+    - text: Pichelsdorfer Str. 133, 13595 Berlin, Germany
       icon: 
     - text: contact@martyoeh.me
       icon: 
@@ -28,7 +28,7 @@ summary:
 
     Through producing the development research literature I have developed a broad range of skills in data acquisition, organization and visualization, as well as manuscript editing and reference management. Additionally, I have gained insights into event management, teaching assistance, content creation, system and web administration. Beyond professional work I strive to foster the development of free and open software and open science without barriers.
 
-    I welcome opportunities to deepen my expertise in these topics, in addition to those expanding my range of applicable skills.
+    I welcome opportunities to advance my expertise in these topics, in addition to those expanding my range of applicable skills.
 
 experience_types:
   1:
@@ -99,6 +99,27 @@ experience:
         en: Analysis of procurement sub-processes as linear, cyclic and decision-oriented models
       - de: Klare Abgrenzung der Antriebe und Hindernisse für die Erreichung von Nachhaltigkeit in der Beschaffung
         en: Clear delineation of primary drivers and barriers of achieving sustainability in procurement
+  - date:
+      de: 2022
+      en: 2022
+    typeid: 1
+    title:
+      de: Forschungsassistenz, Entwicklungsprojekte zur Reduzierung Ungleichheitstrends
+      en: Research Assistant, Development projects to reduce inequality trends
+    place:
+      de: UNU-WIDER
+      en: UNU-WIDER
+    publication:
+      de: Niño-Zarazúa, M., \& Morabito, C. (angenommen). Assessing the potential distributional impacts of development interventions. UNU-WIDER.
+      en: Niño-Zarazúa, M., \& Morabito, C. (forthcoming). Assessing the potential distributional impacts of development interventions. UNU-WIDER.
+    bullets: # TODO: add numerical description of quantity of data (>2mil. datapoints)
+      - de: Sammlung, Verarbeitung und Bereinigung von 4 quantitativen Datensätzen, u.a. der UN Ungleichheitstrends
+        en: Collected, processed, and cleaned 4 datasets, including UN World inequality trends
+      - de: Durchführen einer beschreibenden Analyse von Ungleichheitstrends und -treibern in 4 Ländern
+        en: Conducted descriptive analysis of inequality trends and drivers in 4 countries
+      - de: Erstellen visueller Abbildungen der Daten und beschreibender Analysen der Entwicklungshilfen und ihrer Verteilung
+        en: Produced basic time-series visualizations and descriptive analysis of development aid contributions and their distribution
+    link: https://www.afd.fr/en/carte-des-projets/distributional-impact-development-cooperation-projects
   - date:
       de: 2022
       en: 2022
@@ -136,27 +157,6 @@ experience:
         en: Reviewing and correcting of footnotes, citations and sources
       - de: Herausarbeitung von klarer Sprache, Lesefluss und prägnantem Ausdruck
         en: Developing clear language, reading flow and concise expression
-  - date:
-      de: 2022
-      en: 2022
-    typeid: 1
-    title:
-      de: Forschungsassistenz, Entwicklungsprojekte zur Reduzierung Ungleichheitstrends
-      en: Research Assistant, Development projects to reduce inequality trends
-    place:
-      de: UNU-WIDER
-      en: UNU-WIDER
-    publication:
-      de: Niño-Zarazúa, M., \& Morabito, C. (angenommen). Assessing the potential distributional impacts of development interventions. UNU-WIDER.
-      en: Niño-Zarazúa, M., \& Morabito, C. (forthcoming). Assessing the potential distributional impacts of development interventions. UNU-WIDER.
-    bullets: # TODO: add numerical description of quantity of data (>2mil. datapoints)
-      - de: Sammlung, Verarbeitung und Bereinigung von 4 quantitativen Datensätzen, u.a. der UN Ungleichheitstrends
-        en: Collected, processed, and cleaned 4 datasets, including UN World inequality trends
-      - de: Durchführen einer beschreibenden Analyse von Ungleichheitstrends und -treibern in 4 Ländern
-        en: Conducted descriptive analysis of inequality trends and drivers in 4 countries
-      - de: Erstellen visueller Abbildungen der Daten und beschreibender Analysen der Entwicklungshilfen und ihrer Verteilung
-        en: Produced basic time-series visualizations and descriptive analysis of development aid contributions and their distribution
-    link: https://www.afd.fr/en/carte-des-projets/distributional-impact-development-cooperation-projects
   - date:
       de: 2022
       en: 2022
@@ -418,10 +418,10 @@ skills:
       de: Autorensoftware
       en: Authoring software
     items:
-      - de: LaTeX
-        en: LaTeX
       - de: Typst
         en: Typst
+      - de: LaTeX
+        en: LaTeX
       - de: Quarto
         en: Quarto
       - de: Pandoc
@@ -462,14 +462,14 @@ skills:
         en: Git
       - de: Jujutsu
         en: Jujutsu
-      - de: Fossil
+      # - de: Fossil
-        en: Fossil
+      #   en: Fossil
   - name:
       de: Web Content Management
       en: Web content management
     items:
-      - de: Wordpress
+      # - de: Wordpress
-        en: Wordpress
+      #   en: Wordpress
       - de: Hugo
         en: Hugo
       - de: Flask

cv.typ

@@ -1,149 +1,4 @@
-#show heading: set text(font: "New Computer Modern")
+#import "lib.typ": *
-#show link: underline
-
-// smartypants and latex compatibility
-#show "--": [#sym.dash.en]
-#show "---": [#sym.dash.em]
-#show "\&": [#sym.amp]
-
-// Choose the compiled language through cli by doing
-//
-// $ typst compile --input lang=de cv.typ
-//
-#let lang = {
-  if "lang" in sys.inputs and sys.inputs.lang == "de" {
-    "de"
-  } else {
-    "en"
-  }
-}
-#let sel_word_lang(de: "", en: "") = {
-  if lang == "de" {
-    de
-  } else {
-    en
-  }
-}
-
-#let _columns_3(left_body, center_body, right_body) = {
-  block[
-    #box(width: 1fr)[
-      #align(left)[#left_body]
-    ]
-    #box(width: 1fr)[
-      #align(center)[#center_body]
-    ]
-    #box(width: 1fr)[
-      #align(right)[#right_body]
-    ]
-  ]
-}
-
-#let header(about, columns: (1.5fr, 1fr, 1fr)) = {
-  [= #about.fullname]
-  let contact_fields = (
-    for c in about.contact {
-      if "link" in c {
-        ([#c.icon ~ #link(c.link)[#c.text]],)
-      } else {
-        ([#c.icon ~ #c.text],)
-      }
-    }
-  )
-  grid(
-    columns: columns,
-    gutter: 5pt,
-    ..contact_fields
-  )
-}
-
-#let subdued(body) = {
-  block(inset: 5%, width: 85%, text(fill: luma(150), body))
-}
-
-#let entry(item: ()) = {
-  if "title" in item {
-    [*#item.title.at(lang)*]
-  }
-  if "place" in item {
-    if "title" in item {
-      [, ]
-    }
-    [_#item.place.at(lang)_]
-  }
-  [#h(1fr)]
-  if "date" in item {
-    [ _#item.date.at(lang)_ \ ]
-  }
-  if "bullets" in item {
-    for bullet in item.bullets {
-      [- #bullet.at(lang)]
-    }
-  }
-  if "publication" in item {
-    subdued[#item.publication.at(lang) \ ]
-  }
-  if "abstract" in item {
-    subdued[#item.abstract.at(lang) \ ]
-  }
-}
-
-#let horizon_line() = {
-  v(-3pt)
-  line(length: 100%)
-  v(-5pt)
-}
-
-#let section_header(title) = {
-  [== #title]
-  horizon_line()
-};
-
-#let section(title: "Section", entries: (), body) = {
-  section_header(title)
-  if body == none or body == [] {
-    for e in entries {
-      entry(item: e)
-    }
-  } else {
-    body
-  }
-};
-
-// Slightly re-styled entry with PLACE first and TITLE second
-#let education_entry(item: ()) = {
-  assert(
-    "place" in item and "title" in item and "date" in item,
-    message: "Education items require place, program and date.",
-  )
-  [*#item.place.at(lang)*, #item.title.at(lang) #h(1fr)]
-  [ _#item.date.at(lang)_ \ ]
-}
-
-// Restyled entry with PLACE not emphasized like usual, and no date but an abstract
-#let thesis_entry(item: ()) = {
-  assert("title" in item and "place" in item, message: "Thesis items require type and title.")
-  [*#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 [)]
-    })
-  }
-}
 
 #let cv(contents, use_sidebar: false) = {
   set text(lang: lang)
@@ -188,23 +43,23 @@
     }
 
     if "experience" in contents {
-      let title = sel_word_lang(en: "Professional Experience", de: "Berufserfahrung")
+      let title = (en: "Professional Experience", de: "Berufserfahrung").at(lang)
       section(title: title, entries: contents.experience)[]
     }
 
     if "education" in contents {
-      let title = sel_word_lang(en: "Education", de: "Ausbildung")
+      let title = (en: "Education", de: "Ausbildung").at(lang)
       section(title: title, entries: contents.thesis + contents.education)[]
     }
 
     if not use_sidebar {
       if "volunteering" in contents {
-        let title = sel_word_lang(en: "Volunteer Work", de: "Ehrenamt")
+        let title = (en: "Volunteer Work", de: "Ehrenamt").at(lang)
         section(title: title, entries: contents.volunteering)[]
       }
 
       if "skills" in contents {
-        let title = sel_word_lang(en: "Qualifications", de: "Qualifikationen")
+        let title = (en: "Qualifications", de: "Qualifikationen").at(lang)
         section(
           title: title,
           {
@@ -214,7 +69,7 @@
       }
 
       if "languages" in contents {
-        let title = sel_word_lang(en: "Languages", de: "Sprachen")
+        let title = (en: "Languages", de: "Sprachen").at(lang)
         section(
           title: title,
           {
@@ -227,7 +82,7 @@
 
   let sidebar = {
     if "volunteering" in contents {
-      let title = sel_word_lang(en: "Volunteer Work", de: "Ehrenamt")
+      let title = (en: "Volunteer Work", de: "Ehrenamt").at(lang)
       [== #title]
       for e in contents.volunteering {
         [
@@ -238,14 +93,14 @@
     }
 
     if "languages" in contents {
-      let title = sel_word_lang(en: "Languages", de: "Sprachen")
+      let title = (en: "Languages", de: "Sprachen").at(lang)
       [== #title]
       skill_item(item: contents.languages, is_sidebar: true)
       [\ ]
     }
 
     if "skills" in contents {
-      let title = sel_word_lang(en: "Qualifications", de: "Kenntnisse")
+      let title = (en: "Qualifications", de: "Kenntnisse").at(lang)
       [== #title]
       skill_item(item: contents.skills, is_sidebar: true)
     }

lib.typ

@@ -0,0 +1,139 @@
+#show heading: set text(font: "New Computer Modern")
+#show link: underline
+
+// smartypants and latex compatibility
+#show "--": [#sym.dash.en]
+#show "---": [#sym.dash.em]
+#show "\&": [#sym.amp]
+
+// Choose the compiled language through cli by doing
+//
+// $ typst compile --input lang=de cv.typ
+//
+#let lang = {
+  if "lang" in sys.inputs and sys.inputs.lang == "de" {
+    "de"
+  } else {
+    "en"
+  }
+}
+
+#let _columns_3(left_body, center_body, right_body) = {
+  block[
+    #box(width: 1fr)[
+      #align(left)[#left_body]
+    ]
+    #box(width: 1fr)[
+      #align(center)[#center_body]
+    ]
+    #box(width: 1fr)[
+      #align(right)[#right_body]
+    ]
+  ]
+}
+
+#let header(about, columns: (1.5fr, 1fr, 1fr)) = {
+  [= #about.fullname]
+  let contact_fields = (
+    for c in about.contact {
+      if "link" in c {
+        ([#c.icon ~ #link(c.link)[#c.text]],)
+      } else {
+        ([#c.icon ~ #c.text],)
+      }
+    }
+  )
+  grid(
+    columns: columns,
+    gutter: 5pt,
+    ..contact_fields
+  )
+}
+
+#let subdued(body) = {
+  block(inset: 5%, width: 85%, text(fill: luma(150), body))
+}
+
+#let entry(item: ()) = {
+  if "title" in item {
+    [*#item.title.at(lang)*]
+  }
+  if "place" in item {
+    if "title" in item {
+      [, ]
+    }
+    [_#item.place.at(lang)_]
+  }
+  [#h(1fr)]
+  if "date" in item {
+    [ _#item.date.at(lang)_ \ ]
+  }
+  if "bullets" in item {
+    for bullet in item.bullets {
+      [- #bullet.at(lang)]
+    }
+  }
+  if "publication" in item {
+    subdued[#item.publication.at(lang) \ ]
+  }
+  if "abstract" in item {
+    subdued[#item.abstract.at(lang) \ ]
+  }
+}
+
+#let horizon_line() = {
+  v(-3pt)
+  line(length: 100%)
+  v(-5pt)
+}
+
+#let section_header(title) = {
+  [== #title]
+  horizon_line()
+};
+
+#let section(title: "Section", entries: (), body) = {
+  section_header(title)
+  if body == none or body == [] {
+    for e in entries {
+      entry(item: e)
+    }
+  } else {
+    body
+  }
+};
+
+// Slightly re-styled entry with PLACE first and TITLE second
+#let education_entry(item: ()) = {
+  assert(
+    "place" in item and "title" in item and "date" in item,
+    message: "Education items require place, program and date.",
+  )
+  [*#item.place.at(lang)*, #item.title.at(lang) #h(1fr)]
+  [ _#item.date.at(lang)_ \ ]
+}
+
+// Restyled entry with PLACE not emphasized like usual, and no date but an abstract
+#let thesis_entry(item: ()) = {
+  assert("title" in item and "place" in item, message: "Thesis items require type and title.")
+  [*#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 [)]
+    })
+  }
+}

resume.typ

@@ -1,59 +1,6 @@
-#show heading: set text(font: "New Computer Modern")
+#import "lib.typ": *
-#show link: underline
-
-// smartypants and latex compatibility
-#show "--": [#sym.dash.en]
-#show "---": [#sym.dash.em]
-#show "\&": [#sym.amp]
-
-// Choose the compiled language through cli by doing
-//
-// $ typst compile --input lang=de cv.typ
-//
-#let lang = {
-  if "lang" in sys.inputs and sys.inputs.lang == "de" {
-    "de"
-  } else {
-    "en"
-  }
-}
-
-#let _columns_3(left_body, center_body, right_body) = {
-  block[
-    #box(width: 1fr)[
-      #align(left)[#left_body]
-    ]
-    #box(width: 1fr)[
-      #align(center)[#center_body]
-    ]
-    #box(width: 1fr)[
-      #align(right)[#right_body]
-    ]
-  ]
-}
-
-#let header(about, columns: (1.5fr, 1fr, 1fr)) = {
-  [= #about.fullname]
-  let contact_fields = (
-    for c in about.contact {
-      if "link" in c {
-        ([#c.icon ~ #link(c.link)[#c.text]],)
-      } else {
-        ([#c.icon ~ #c.text],)
-      }
-    }
-  )
-  grid(
-    columns: columns,
-    gutter: 5pt,
-    ..contact_fields
-  )
-}
-
-#let subdued(body) = {
-  block(inset: 5%, width: 85%, text(fill: luma(150), body))
-}
 
+// TODO: make it _return_ the data, not display it on its own
 #let by_client(experience: ()) = {
   let by_client = (:)
 
@@ -86,90 +33,6 @@
   }
 }
 
-#let entry(item: ()) = {
-  if "title" in item {
-    [*#item.title.at(lang)*]
-  }
-  if "place" in item {
-    if "title" in item {
-      [, ]
-    }
-    [_#item.place.at(lang)_]
-  }
-  [#h(1fr)]
-  if "date" in item {
-    [ _#item.date.at(lang)_ \ ]
-  }
-  if "bullets" in item {
-    for bullet in item.bullets {
-      [- #bullet.at(lang)]
-    }
-  }
-  if "publication" in item {
-    subdued[#item.publication.at(lang) \ ]
-  }
-  if "abstract" in item {
-    subdued[#item.abstract.at(lang) \ ]
-  }
-}
-
-#let horizon_line() = {
-  v(-3pt)
-  line(length: 100%)
-  v(-5pt)
-}
-
-#let section_header(title) = {
-  [== #title]
-  horizon_line()
-};
-
-#let section(title: "Section", entries: (), body) = {
-  section_header(title)
-  if body == none or body == [] {
-    for e in entries {
-      entry(item: e)
-    }
-  } else {
-    body
-  }
-};
-
-// Slightly re-styled entry with PLACE first and TITLE second
-#let education_entry(item: ()) = {
-  assert(
-    "place" in item and "title" in item and "date" in item,
-    message: "Education items require place, program and date.",
-  )
-  [*#item.place.at(lang)*, #item.title.at(lang) #h(1fr)]
-  [ _#item.date.at(lang)_ \ ]
-}
-
-// Restyled entry with PLACE not emphasized like usual, and no date but an abstract
-#let thesis_entry(item: ()) = {
-  assert("title" in item and "place" in item, message: "Thesis items require type and title.")
-  [*#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 [)]
-    })
-  }
-}
-
 #let resume(contents, main: ("experience", "education"), sidebar: ("volunteering", "languages", "skills")) = {
   set text(lang: lang)
 
@@ -309,7 +172,7 @@
         width: 90%,
         {
           v(15pt)
-          set block(inset: (left: 20 * margin, right: 20 * margin))
+          set block(inset: (left: 5 * margin, right: 5 * margin))
           show heading: it => align(right, upper(it))
           set list(marker: "")
           show list: it => {