From 2d053df024a6fd7e02a7ececccd6735388c50283 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 20:16:07 +0300 Subject: [PATCH 01/10] Ran latexindent --- marko_korhonen_cv_en.tex | 154 +++++++++++++++++++-------------------- marko_korhonen_cv_fi.tex | 154 +++++++++++++++++++-------------------- 2 files changed, 154 insertions(+), 154 deletions(-) diff --git a/marko_korhonen_cv_en.tex b/marko_korhonen_cv_en.tex index 8a33f8a..5cd51ac 100644 --- a/marko_korhonen_cv_en.tex +++ b/marko_korhonen_cv_en.tex @@ -37,24 +37,24 @@ %---------------------------------------------------------------------------------------- \begin{aside} % In the aside, each new line forces a line break -\section{contact} -\restorecr -\include{contact_info} -\obeycr -\section{languages} -\textbf{fluent} -finnish \& english -\textbf{basics} -german, russian \& swedish -\section{programming} -Java -Bash -Rust -Python -HTML \& CSS -JavaScript -Node.js -React + \section{contact} + \restorecr + \include{contact_info} + \obeycr + \section{languages} + \textbf{fluent} + finnish \& english + \textbf{basics} + german, russian \& swedish + \section{programming} + Java + Bash + Rust + Python + HTML \& CSS + JavaScript + Node.js + React \end{aside} %---------------------------------------------------------------------------------------- @@ -70,27 +70,27 @@ programming, open source software, Linux, networking, self-hosted applications, \section{education} \begin{entrylist} -\entry -{2016 - 2020} -{Bachelor of ICT} -{Metropolia UoAS} -{Specialization in Software Engineering} + \entry + {2016 - 2020} + {Bachelor of ICT} + {Metropolia UoAS} + {Specialization in Software Engineering} -\entry -{2018 - 2019} -{Student Exchange} -{Frankfurt UoAS, Germany} + \entry + {2018 - 2019} + {Student Exchange} + {Frankfurt UoAS, Germany} -\entry -{2013 - 2015} -{Upper secondary {\normalfont qualification}} -{Saimaan Ammattiopisto} -{Specialization in Business Economics} + \entry + {2013 - 2015} + {Upper secondary {\normalfont qualification}} + {Saimaan Ammattiopisto} + {Specialization in Business Economics} -\entry -{2009 - 2012} -{High school {\normalfont and matriculation examination}} -{Lauritsalan Lukio} + \entry + {2009 - 2012} + {High school {\normalfont and matriculation examination}} + {Lauritsalan Lukio} \end{entrylist} @@ -101,43 +101,43 @@ programming, open source software, Linux, networking, self-hosted applications, \section{experience} \begin{entrylist} -\entry -{05/2020 -} -{Rossum Oy} -{Full-time job} -{Software developer} + \entry + {05/2020 -} + {Rossum Oy} + {Full-time job} + {Software developer} -\entry -{06-07/2018} -{Uskonnen Oy} -{Internship} -{Repairing and troubleshooting customer computers.\\ -Also selling computers} + \entry + {06-07/2018} + {Uskonnen Oy} + {Internship} + {Repairing and troubleshooting customer computers.\\ + Also selling computers} -\entry -{06-07/2017} -{Auto-Suni Oy Lappeenranta} -{Internship} -{Internal technical support} + \entry + {06-07/2017} + {Auto-Suni Oy Lappeenranta} + {Internship} + {Internal technical support} -\entry -{2014-2015, 2017} -{Gigantti Oy Lappeenranta} -{Part-time job} -{Service adviser and dispatcher of customer electronics,\\ -customer service, warehouse work} + \entry + {2014-2015, 2017} + {Gigantti Oy Lappeenranta} + {Part-time job} + {Service adviser and dispatcher of customer electronics,\\ + customer service, warehouse work} -\entry -{07-08/2014} -{Kaskein Marja Oy} -{Summer job} -{Warehouse worker} + \entry + {07-08/2014} + {Kaskein Marja Oy} + {Summer job} + {Warehouse worker} -\entry -{2010-2012} -{K-Market Niiva} -{Summer job} -{Grocery store worker} + \entry + {2010-2012} + {K-Market Niiva} + {Summer job} + {Grocery store worker} \end{entrylist} @@ -147,17 +147,17 @@ Metropolia. These have been the most fruitious \begin{itemize} \item \textbf{Scorebook} (Closed source project) - \begin{itemize} - \item Innovation project for the Finnish Baseball association, where a new score keeping application was developed using modern technologies - \end{itemize} + \begin{itemize} + \item Innovation project for the Finnish Baseball association, where a new score keeping application was developed using modern technologies + \end{itemize} \item \textbf{Codename Frozen Omega} \href{https://gitlab.com/ReekyMarko/Codename-Frozen-Omega}{(Link to source code)} - \begin{itemize} - \item An ecosystem simulator written in Java - \end{itemize} + \begin{itemize} + \item An ecosystem simulator written in Java + \end{itemize} \item \textbf{Codename Swift Steel} \href{https://gitlab.com/ReekyMarko/Codename-Swift-Steel}{(Link to source code)} - \begin{itemize} - \item A robotic hand built from LEGO and programmed in Java - \end{itemize} + \begin{itemize} + \item A robotic hand built from LEGO and programmed in Java + \end{itemize} \end{itemize} \let\cleardoublepage\clearpage \end{document} diff --git a/marko_korhonen_cv_fi.tex b/marko_korhonen_cv_fi.tex index e6d1dec..32d8512 100644 --- a/marko_korhonen_cv_fi.tex +++ b/marko_korhonen_cv_fi.tex @@ -37,23 +37,23 @@ %---------------------------------------------------------------------------------------- \begin{aside} % In the aside, each new line forces a line break -\section{Yhteystiedot} -\restorecr -\include{contact_info} -\obeycr -\section{Kielet} -\textbf{Sujuva} -suomi \& englanti -\textbf{Alkeet} -saksa, venäjä \& ruotsi -\section{Ohjelmointi} -Java -Bash -Rust -Python -HTML \& CSS -Node.js -React + \section{Yhteystiedot} + \restorecr + \include{contact_info} + \obeycr + \section{Kielet} + \textbf{Sujuva} + suomi \& englanti + \textbf{Alkeet} + saksa, venäjä \& ruotsi + \section{Ohjelmointi} + Java + Bash + Rust + Python + HTML \& CSS + Node.js + React \end{aside} %---------------------------------------------------------------------------------------- @@ -69,25 +69,25 @@ Linux, avoin lähdekoodi, tietoverkot, serverit, tietokoneen korjaukset \section{Koulutus} \begin{entrylist} -\entry -{2016 - 2020} -{Tietotekniikan Insinööri} {Metropolia AMK} -{Pääaineena ohjelmistotuotanto} + \entry + {2016 - 2020} + {Tietotekniikan Insinööri} {Metropolia AMK} + {Pääaineena ohjelmistotuotanto} -\entry -{2018 - 2019} -{Opiskelijavaihto} -{Frankfurt UoAS} + \entry + {2018 - 2019} + {Opiskelijavaihto} + {Frankfurt UoAS} -\entry -{2013 - 2015} -{Merkonomi} -{Saimaan Ammattiopisto} + \entry + {2013 - 2015} + {Merkonomi} + {Saimaan Ammattiopisto} -\entry -{2009 - 2012} -{Lukio ja ylioppilastutkinto} -{Lauritsalan Lukio} + \entry + {2009 - 2012} + {Lukio ja ylioppilastutkinto} + {Lauritsalan Lukio} \end{entrylist} @@ -98,47 +98,47 @@ Linux, avoin lähdekoodi, tietoverkot, serverit, tietokoneen korjaukset \section{Työkokemus} \begin{entrylist} -\entry -{05/2020 -} -{Rossum Oy} -{Kokopäivätyö} -{Ohjelmistokehittäjä} + \entry + {05/2020 -} + {Rossum Oy} + {Kokopäivätyö} + {Ohjelmistokehittäjä} -\entry -{06-08/2019} -{Touch \& Go Aerial Photography} -{Harjoittelu} -{Web-ohjelmointiprojekti} + \entry + {06-08/2019} + {Touch \& Go Aerial Photography} + {Harjoittelu} + {Web-ohjelmointiprojekti} -\entry -{06-07/2018} -{Uskonnen Oy} -{Harjoittelu} -{Tietokoneiden korjauksia myyntiä} + \entry + {06-07/2018} + {Uskonnen Oy} + {Harjoittelu} + {Tietokoneiden korjauksia myyntiä} -\entry -{06-07/2017} -{Auto-Suni Oy Lappeenranta} -{Harjoittelu} -{Sisäinen tekninen tuki} + \entry + {06-07/2017} + {Auto-Suni Oy Lappeenranta} + {Harjoittelu} + {Sisäinen tekninen tuki} -\entry -{2014-2015} -{Gigantti Oy Lappeenranta} -{Osa-aikaistyö} -{Asiakaspalvelu ja varastotyö} + \entry + {2014-2015} + {Gigantti Oy Lappeenranta} + {Osa-aikaistyö} + {Asiakaspalvelu ja varastotyö} -\entry -{07-08/2014} -{Kaskein Marja Oy} -{Kesätyö} -{Tuotteiden valmistus ja varastotyöt} + \entry + {07-08/2014} + {Kaskein Marja Oy} + {Kesätyö} + {Tuotteiden valmistus ja varastotyöt} -\entry -{2010-2012} -{K-Market Niiva} -{Kesätyö} -{Ruokakaupan työt} + \entry + {2010-2012} + {K-Market Niiva} + {Kesätyö} + {Ruokakaupan työt} \end{entrylist} @@ -148,16 +148,16 @@ Tässä muutama esimerkki: \begin{itemize} \item \textbf{Scorebook} (Omisteinen ohjelmisto, ei lähdekoodia saatavilla) - \begin{itemize} - \item Innovaatioprojekti Suomen Baseball-liitolle, jossa tehtiin uusi pelien kirjanpitosovellus moderneilla web-ohjelmointitekniikoilla - \end{itemize} + \begin{itemize} + \item Innovaatioprojekti Suomen Baseball-liitolle, jossa tehtiin uusi pelien kirjanpitosovellus moderneilla web-ohjelmointitekniikoilla + \end{itemize} \item \textbf{Codename Frozen Omega} \href{https://gitlab.com/ReekyMarko/Codename-Frozen-Omega}{(Linkki lähdekoodiin)} - \begin{itemize} - \item Ekosysteemin simulointia Javalla - \end{itemize} + \begin{itemize} + \item Ekosysteemin simulointia Javalla + \end{itemize} \item \textbf{Codename Swift Steel} \href{https://gitlab.com/ReekyMarko/Codename-Swift-Steel}{(Linkki lähdekoodiin)} - \begin{itemize} - \item LEGOista rakennettu robottikäsi joka on koodattu Javalla - \end{itemize} + \begin{itemize} + \item LEGOista rakennettu robottikäsi joka on koodattu Javalla + \end{itemize} \end{itemize} \end{document} From 41e1ed4beebba5ac4d67f046b8d76d677f541e0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 20:38:06 +0300 Subject: [PATCH 02/10] Clean up Makefile --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1f67601..4c71503 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,13 @@ -.PHONY: outputdir en fi pdf -.DEFAULT_GOAL := all +.PHONY: en fi -en: outputdir +all: en fi + +en: xelatex marko_korhonen_cv_en biber marko_korhonen_cv_en xelatex marko_korhonen_cv_en -fi: outputdir +fi: xelatex marko_korhonen_cv_fi biber marko_korhonen_cv_fi xelatex marko_korhonen_cv_fi - -all: en fi From 684fdbffcf8ee187d6320c5da36f7331e76b8838 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 20:44:59 +0300 Subject: [PATCH 03/10] Ran latexindent --- friggeri-cv-a4.cls | 376 ++++++++++++++++++++++----------------------- 1 file changed, 188 insertions(+), 188 deletions(-) diff --git a/friggeri-cv-a4.cls b/friggeri-cv-a4.cls index 1cdb65e..83c859f 100644 --- a/friggeri-cv-a4.cls +++ b/friggeri-cv-a4.cls @@ -4,7 +4,7 @@ \DeclareOption{nocolors}{\def\@cv@nocolors{}} \DeclareOption{print}{\def\@cv@print{}} \DeclareOption*{% - \PassOptionsToClass{\CurrentOption}{article}% + \PassOptionsToClass{\CurrentOption}{article}% } \ProcessOptions\relax \LoadClass{article} @@ -34,31 +34,31 @@ \definecolor{blue}{HTML}{6CE0F1} \ifdefined\@cv@print - \colorlet{green}{gray} - \colorlet{orange}{gray} - \colorlet{purple}{gray} - \colorlet{brown}{gray} - \colorlet{red}{gray} - \colorlet{blue}{gray} - \colorlet{fillheader}{white} - \colorlet{header}{gray} + \colorlet{green}{gray} + \colorlet{orange}{gray} + \colorlet{purple}{gray} + \colorlet{brown}{gray} + \colorlet{red}{gray} + \colorlet{blue}{gray} + \colorlet{fillheader}{white} + \colorlet{header}{gray} \else - \colorlet{fillheader}{gray} - \colorlet{header}{white} + \colorlet{fillheader}{gray} + \colorlet{header}{white} \fi \colorlet{textcolor}{gray} \colorlet{headercolor}{gray} \ifdefined\@cv@nocolors - \colorlet{green}{gray} - \colorlet{rdfgreen}{gray} - \colorlet{orange}{gray} - \colorlet{rdforange}{gray} - \colorlet{purple}{gray} - \colorlet{rdfpurple}{gray} - \colorlet{brown}{gray} - \colorlet{red}{gray} - \colorlet{blue}{gray} + \colorlet{green}{gray} + \colorlet{rdfgreen}{gray} + \colorlet{orange}{gray} + \colorlet{rdforange}{gray} + \colorlet{purple}{gray} + \colorlet{rdfpurple}{gray} + \colorlet{brown}{gray} + \colorlet{red}{gray} + \colorlet{blue}{gray} \fi %%%%%%%%% @@ -70,8 +70,8 @@ \newfontfamily\bodyfont [BoldFont=texgyreheros-bold.otf, -ItalicFont=texgyreheros-italic.otf, -BoldItalicFont=texgyreheros-bolditalic.otf] + ItalicFont=texgyreheros-italic.otf, + BoldItalicFont=texgyreheros-bolditalic.otf] {texgyreheros-regular.otf} \newfontfamily\thinfont[]{Lato-Light.ttf} \newfontfamily\headingfont[]{texgyreheros-bold.otf} @@ -79,9 +79,9 @@ BoldItalicFont=texgyreheros-bolditalic.otf] \defaultfontfeatures{Mapping=tex-text} \setmainfont [Mapping=tex-text, Color=textcolor, -BoldFont=texgyreheros-bold.otf, -ItalicFont=texgyreheros-italic.otf, -BoldItalicFont=texgyreheros-bolditalic.otf + BoldFont=texgyreheros-bold.otf, + ItalicFont=texgyreheros-italic.otf, + BoldItalicFont=texgyreheros-bolditalic.otf ] {texgyreheros-regular.otf} @@ -95,25 +95,25 @@ BoldItalicFont=texgyreheros-bolditalic.otf \RequirePackage{tikz} \newcommand{\rolefont}{% - \fontsize{14pt}{24pt}\selectfont% - \thinfont% - \color{white}% + \fontsize{14pt}{24pt}\selectfont% + \thinfont% + \color{white}% } \newcommand{\header}[3]{% - \begin{tikzpicture}[remember picture,overlay] - \node [rectangle, fill=fillheader, anchor=north, minimum width=\paperwidth, minimum height=4cm] (box) at (current page.north){}; - \node [anchor=center] (name) at (box) {% - \fontsize{40pt}{72pt}\color{header}% - {\thinfont #1}{\bodyfont #2} - }; - \node [anchor=north] at (name.south) {% - \fontsize{14pt}{24pt}\color{header}% - \thinfont #3% - }; - \end{tikzpicture} - \vspace{2.5cm} - \vspace{-2\parskip} + \begin{tikzpicture}[remember picture,overlay] + \node [rectangle, fill=fillheader, anchor=north, minimum width=\paperwidth, minimum height=4cm] (box) at (current page.north){}; + \node [anchor=center] (name) at (box) {% + \fontsize{40pt}{72pt}\color{header}% + {\thinfont #1}{\bodyfont #2} + }; + \node [anchor=north] at (name.south) {% + \fontsize{14pt}{24pt}\color{header}% + \thinfont #3% + }; + \end{tikzpicture} + \vspace{2.5cm} + \vspace{-2\parskip} } @@ -124,40 +124,40 @@ BoldItalicFont=texgyreheros-bolditalic.otf \newcounter{colorCounter} \def\@sectioncolor#1#2#3{% - {% - \color{% - \ifcase\value{colorCounter}% - blue\or% - red\or% - orange\or% - green\or% - purple\or% - brown\else% - headercolor\fi% - } #1#2#3% - }% - \stepcounter{colorCounter}% + {% + \color{% + \ifcase\value{colorCounter}% + blue\or% + red\or% + orange\or% + green\or% + purple\or% + brown\else% + headercolor\fi% + } #1#2#3% + }% + \stepcounter{colorCounter}% } \renewcommand{\section}[1]{ - \par\vspace{\parskip} - {% - \LARGE\headingfont\color{headercolor}% - \@sectioncolor #1% - } - \par\vspace{\parskip} + \par\vspace{\parskip} + {% + \LARGE\headingfont\color{headercolor}% + \@sectioncolor #1% + } + \par\vspace{\parskip} } \renewcommand{\subsection}[1]{ - \par\vspace{.5\parskip}% - {\Large\headingfont\color{headercolor} #1} - \par\vspace{.25\parskip}% + \par\vspace{.5\parskip}% + {\Large\headingfont\color{headercolor} #1} + \par\vspace{.25\parskip}% } \renewcommand{\subsubsection}[2]{ - \par\vspace{.5\parskip}% - {\Large\headingfont\color{headercolor} #2} - \par\vspace{.25\parskip}% + \par\vspace{.5\parskip}% + {\Large\headingfont\color{headercolor} #2} + \par\vspace{.25\parskip}% } \pagestyle{empty} @@ -169,18 +169,18 @@ BoldItalicFont=texgyreheros-bolditalic.otf \setlength{\tabcolsep}{0pt} \newenvironment{entrylist}{% - \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}}ll} -}{% - \end{tabular*} + \begin{tabular*}{\textwidth}{@{\extracolsep{\fill}}ll} + }{% + \end{tabular*} } \renewcommand{\bfseries}{\headingfont\color{headercolor}} \newcommand{\entry}[4]{% - \parbox[t]{2cm}{#1}&\parbox[t]{11.3cm}{% - \textbf{#2}% - \hfill% - {\footnotesize\addfontfeature{Color=lightgray} #3}\\% - #4\vspace{\parsep}% - }\\} + \parbox[t]{2cm}{#1}&\parbox[t]{11.3cm}{% + \textbf{#2}% + \hfill% + {\footnotesize\addfontfeature{Color=lightgray} #3}\\% + #4\vspace{\parsep}% + }\\} %%%%%%%%%%%%%% @@ -191,18 +191,18 @@ BoldItalicFont=texgyreheros-bolditalic.otf \setlength{\TPHorizModule}{1cm} \setlength{\TPVertModule}{1cm} \newenvironment{aside}{% - \let\oldsection\section - \renewcommand{\section}[1]{ - \par\vspace{\baselineskip}{\Large\headingfont\color{headercolor} ##1} - } - \begin{textblock}{5.0}(0.5, 4.33) - \begin{flushright} - \obeycr -}{% - \restorecr - \end{flushright} - \end{textblock} - \let\section\oldsection + \let\oldsection\section + \renewcommand{\section}[1]{ + \par\vspace{\baselineskip}{\Large\headingfont\color{headercolor} ##1} + } + \begin{textblock}{5.0}(0.5, 4.33) + \begin{flushright} + \obeycr + }{% + \restorecr + \end{flushright} + \end{textblock} + \let\section\oldsection } %%%%%%%%%%%%%%%% @@ -218,126 +218,126 @@ BoldItalicFont=texgyreheros-bolditalic.otf \DeclareFieldFormat[report]{title}{#1\par} \DeclareBibliographyDriver{article}{% - \printfield{title}% - \newblock% - \printnames{author}% - \par% - \newblock% - {% - \footnotesize\addfontfeature{Color=lightgray}\itshape% - \usebibmacro{journal+issuetitle}% - \setunit{\space}% - \printfield{pages}% - \newunit% - \printlist{publisher}% - \setunit*{\addcomma\space}% - \printfield{year}% - \newunit% - } - \par\vspace{0.3\baselineskip} + \printfield{title}% + \newblock% + \printnames{author}% + \par% + \newblock% + {% + \footnotesize\addfontfeature{Color=lightgray}\itshape% + \usebibmacro{journal+issuetitle}% + \setunit{\space}% + \printfield{pages}% + \newunit% + \printlist{publisher}% + \setunit*{\addcomma\space}% + \printfield{year}% + \newunit% + } + \par\vspace{0.3\baselineskip} } \DeclareBibliographyDriver{book}{% - \printfield{title}% - \newblock% - \printnames{author}% - \par% - \newblock% - {% - \footnotesize\addfontfeature{Color=lightgray}\itshape% - \printlist{publisher}% - \setunit*{\addcomma\space}% - \printfield{note}% - \setunit*{\addcomma\space}% - \printfield{year}% - \setunit{\addcomma\space}% - \printlist{location}% - \newunit% - } - \par\vspace{0.3\baselineskip} + \printfield{title}% + \newblock% + \printnames{author}% + \par% + \newblock% + {% + \footnotesize\addfontfeature{Color=lightgray}\itshape% + \printlist{publisher}% + \setunit*{\addcomma\space}% + \printfield{note}% + \setunit*{\addcomma\space}% + \printfield{year}% + \setunit{\addcomma\space}% + \printlist{location}% + \newunit% + } + \par\vspace{0.3\baselineskip} } \DeclareBibliographyDriver{inproceedings}{% - \printfield{title}% - \newblock% - \printnames{author}% - \par% - \newblock% - {% - \footnotesize\addfontfeature{Color=lightgray}% - \printfield{booktitle}% - \setunit{\addcomma\space}% - \printfield{year}% - \setunit{\addcomma\space}% - \printlist{location}% - \newunit% - } - \par\vspace{0.3\baselineskip} + \printfield{title}% + \newblock% + \printnames{author}% + \par% + \newblock% + {% + \footnotesize\addfontfeature{Color=lightgray}% + \printfield{booktitle}% + \setunit{\addcomma\space}% + \printfield{year}% + \setunit{\addcomma\space}% + \printlist{location}% + \newunit% + } + \par\vspace{0.3\baselineskip} } \DeclareBibliographyDriver{misc}{% - \printfield{title}% - \newblock% - \printnames{author}% - \par% - \newblock% - {% - \footnotesize\addfontfeature{Color=lightgray}\itshape% - \printfield{booktitle}% - \setunit*{\addcomma\space}% - \printfield{note}% - \setunit*{\addcomma\space}% - \printfield{year}% - \setunit{\addcomma\space}% - \printlist{location}% - \newunit% - } - \par\vspace{0.3\baselineskip} + \printfield{title}% + \newblock% + \printnames{author}% + \par% + \newblock% + {% + \footnotesize\addfontfeature{Color=lightgray}\itshape% + \printfield{booktitle}% + \setunit*{\addcomma\space}% + \printfield{note}% + \setunit*{\addcomma\space}% + \printfield{year}% + \setunit{\addcomma\space}% + \printlist{location}% + \newunit% + } + \par\vspace{0.3\baselineskip} } \DeclareBibliographyDriver{report}{% - \printfield{title}% - \newblock% - \printnames{author}% - \par% - \newblock% - {% - \footnotesize\addfontfeature{Color=lightgray}\itshape% - \printfield{type}% - \setunit{\space}% - \printfield{number}% - \setunit{\addcomma\space}% - \printfield{year}% - \newunit% - } - \par\vspace{0.3\baselineskip} + \printfield{title}% + \newblock% + \printnames{author}% + \par% + \newblock% + {% + \footnotesize\addfontfeature{Color=lightgray}\itshape% + \printfield{type}% + \setunit{\space}% + \printfield{number}% + \setunit{\addcomma\space}% + \printfield{year}% + \newunit% + } + \par\vspace{0.3\baselineskip} } \DeclareNameFormat{author}{% - \small\addfontfeature{Color=lightgray}% - \nameparts{#1}\ifblank{\namepartgiven}{}{\namepartgiven\space}\namepartfamily% - \ifthenelse{\value{listcount}<\value{liststop}} - {\addcomma\space} - {}% + \small\addfontfeature{Color=lightgray}% + \nameparts{#1}\ifblank{\namepartgiven}{}{\namepartgiven\space}\namepartfamily% + \ifthenelse{\value{listcount}<\value{liststop}} + {\addcomma\space} + {}% } \defbibheading{bibheading}[\bibname]{% - \subsubsection*{#1} - \markboth{#1}{#1} + \subsubsection*{#1} + \markboth{#1}{#1} } \newcommand{\printbibsection}[2]{ - \begin{refsection} - \newrefcontext[sorting=chronological]% - \nocite{*} - \printbibliography[type={#1}, title={#2}, heading=bibheading] - \end{refsection} + \begin{refsection} + \newrefcontext[sorting=chronological]% + \nocite{*} + \printbibliography[type={#1}, title={#2}, heading=bibheading] + \end{refsection} } \DeclareSortingTemplate{chronological}{ - \sort[direction=descending]{\field{year}} - \sort[direction=descending]{\field{month}} + \sort[direction=descending]{\field{year}} + \sort[direction=descending]{\field{month}} } @@ -349,12 +349,12 @@ BoldItalicFont=texgyreheros-bolditalic.otf \RequirePackage[left=6.1cm,top=2cm,right=2.5cm,bottom=2.5cm,nohead,nofoot]{geometry} \RequirePackage{hyperref} \hypersetup{ - colorlinks=false, - linkcolor=red, - citecolor=red, - filecolor=red, - urlcolor = red} - + colorlinks=false, + linkcolor=red, + citecolor=red, + filecolor=red, + urlcolor = red} + % A fix for \href{}{} colors not working with fontspec \makeatletter \def\HyColor@@@@UseColor#1\@nil{\addfontfeatures{Color=#1}} From 7d9fd7292586f8a8dfa1f0dee46c2c367ee6c0f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:03:11 +0300 Subject: [PATCH 04/10] Move fonts to own directory --- Lato-Hairline.ttf => fonts/Lato-Hairline.ttf | Bin Lato-Light.ttf => fonts/Lato-Light.ttf | Bin .../texgyreheros-bold.otf | Bin .../texgyreheros-bolditalic.otf | Bin .../texgyreheros-italic.otf | Bin .../texgyreheros-regular.otf | Bin friggeri-cv-a4.cls | 31 ++++++++++-------- 7 files changed, 17 insertions(+), 14 deletions(-) rename Lato-Hairline.ttf => fonts/Lato-Hairline.ttf (100%) rename Lato-Light.ttf => fonts/Lato-Light.ttf (100%) rename texgyreheros-bold.otf => fonts/texgyreheros-bold.otf (100%) rename texgyreheros-bolditalic.otf => fonts/texgyreheros-bolditalic.otf (100%) rename texgyreheros-italic.otf => fonts/texgyreheros-italic.otf (100%) rename texgyreheros-regular.otf => fonts/texgyreheros-regular.otf (100%) diff --git a/Lato-Hairline.ttf b/fonts/Lato-Hairline.ttf similarity index 100% rename from Lato-Hairline.ttf rename to fonts/Lato-Hairline.ttf diff --git a/Lato-Light.ttf b/fonts/Lato-Light.ttf similarity index 100% rename from Lato-Light.ttf rename to fonts/Lato-Light.ttf diff --git a/texgyreheros-bold.otf b/fonts/texgyreheros-bold.otf similarity index 100% rename from texgyreheros-bold.otf rename to fonts/texgyreheros-bold.otf diff --git a/texgyreheros-bolditalic.otf b/fonts/texgyreheros-bolditalic.otf similarity index 100% rename from texgyreheros-bolditalic.otf rename to fonts/texgyreheros-bolditalic.otf diff --git a/texgyreheros-italic.otf b/fonts/texgyreheros-italic.otf similarity index 100% rename from texgyreheros-italic.otf rename to fonts/texgyreheros-italic.otf diff --git a/texgyreheros-regular.otf b/fonts/texgyreheros-regular.otf similarity index 100% rename from texgyreheros-regular.otf rename to fonts/texgyreheros-regular.otf diff --git a/friggeri-cv-a4.cls b/friggeri-cv-a4.cls index 83c859f..3aa292f 100644 --- a/friggeri-cv-a4.cls +++ b/friggeri-cv-a4.cls @@ -67,26 +67,29 @@ \RequirePackage[quiet]{fontspec} \RequirePackage{unicode-math} +\defaultfontfeatures{Mapping=tex-text} \newfontfamily\bodyfont -[BoldFont=texgyreheros-bold.otf, - ItalicFont=texgyreheros-italic.otf, - BoldItalicFont=texgyreheros-bolditalic.otf] -{texgyreheros-regular.otf} -\newfontfamily\thinfont[]{Lato-Light.ttf} -\newfontfamily\headingfont[]{texgyreheros-bold.otf} - -\defaultfontfeatures{Mapping=tex-text} -\setmainfont -[Mapping=tex-text, Color=textcolor, +[ + Path=fonts/, BoldFont=texgyreheros-bold.otf, ItalicFont=texgyreheros-italic.otf, BoldItalicFont=texgyreheros-bolditalic.otf -] -{texgyreheros-regular.otf} +]{texgyreheros-regular.otf} -\setmathfont{texgyreheros-regular.otf} -%%% +\newfontfamily\thinfont[Path=fonts/]{Lato-Light.ttf} +\newfontfamily\headingfont[Path=fonts/]{texgyreheros-bold.otf} + +\setmainfont +[ + Path=fonts/, + Mapping=tex-text, Color=textcolor, + BoldFont=texgyreheros-bold.otf, + ItalicFont=texgyreheros-italic.otf, + BoldItalicFont=texgyreheros-bolditalic.otf +]{texgyreheros-regular.otf} + +\setmathfont[Path=fonts/]{texgyreheros-regular.otf} %%%%%%%%%% % Header % From fcce69320cb9ea4983f1d7a4857a6695f358f1b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:19:30 +0300 Subject: [PATCH 05/10] Output files into output directory --- .gitignore | 10 +--------- Makefile | 15 ++++++--------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index c5c27ac..2f7896d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ -*.synctex.gz -*.log -*.out -*.aux -*.blg -*.bbl -*.bcf -*.run.xml -*.pdf +target/ diff --git a/Makefile b/Makefile index 4c71503..d798a24 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,10 @@ .PHONY: en fi -all: en fi +LANGUAGES = en fi -en: - xelatex marko_korhonen_cv_en - biber marko_korhonen_cv_en - xelatex marko_korhonen_cv_en +all: $(LANGUAGES) -fi: - xelatex marko_korhonen_cv_fi - biber marko_korhonen_cv_fi - xelatex marko_korhonen_cv_fi +$(LANGUAGES): + xelatex --output-directory ./target marko_korhonen_cv_$@ + biber --output-directory ./target marko_korhonen_cv_$@ + xelatex --output-directory ./target marko_korhonen_cv_$@ From 38b07389ab818789ad21a67e87e978d6b5a41c23 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:22:03 +0300 Subject: [PATCH 06/10] Create output dir if not exists --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d798a24..a331310 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,10 @@ LANGUAGES = en fi all: $(LANGUAGES) -$(LANGUAGES): +outputdir: + mkdir -p ./target + +$(LANGUAGES): outputdir xelatex --output-directory ./target marko_korhonen_cv_$@ biber --output-directory ./target marko_korhonen_cv_$@ xelatex --output-directory ./target marko_korhonen_cv_$@ From 9d5425bf12b476ddcfa1623adf17c2d02b2f0df0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:39:15 +0300 Subject: [PATCH 07/10] Update license --- LICENSE | 9 --------- LICENSE.adoc | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.adoc diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 2991e13..0000000 --- a/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ -Copyright (C) 2023, Marko Korhonen (this fork) -Copyright (C) 2017, Marvin Frommhold (fork) -Copyright (C) 2012, Adrien Friggeri (origin) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/LICENSE.adoc b/LICENSE.adoc new file mode 100644 index 0000000..98a3468 --- /dev/null +++ b/LICENSE.adoc @@ -0,0 +1,24 @@ +== The MIT License (MIT) + +Copyright (C) {localyear}, Marko Korhonen (this fork) + +Copyright (C) 2017, Marvin Frommhold (fork) + +Copyright (C) 2012, Adrien Friggeri (origin) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this +software and associated documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 2f1c8dcaabf60b4c264eba89492e3fb5c0de346c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:41:41 +0300 Subject: [PATCH 08/10] Update README --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index af8e27b..ff69b97 100644 --- a/README.adoc +++ b/README.adoc @@ -1,3 +1,3 @@ -= My CV += Curriculum Vitae of Marko Korhonen Based on the https://github.com/depressiveRobot/friggeri-cv-a4[Friggeri CV template] From 405d4b271fb7f4acdae1fa889615416f2259b6f9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:55:49 +0300 Subject: [PATCH 09/10] Add workflow --- .forgejo/workflows/build.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .forgejo/workflows/build.yaml diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml new file mode 100644 index 0000000..ab6aed4 --- /dev/null +++ b/.forgejo/workflows/build.yaml @@ -0,0 +1,25 @@ +name: Build PDF's + +on: + push: + +jobs: + build_pdf: + name: Build PDF's + runs-on: docker + + steps: + - name: Set up Git repository + uses: actions/checkout@v4 + + - name: Build English PDF + uses: https://github.com/xu-cheng/latex-action@v3 + with: + root_file: marko_korhonen_cv_fi.tex + latexmk_use_xelatex: true + + - name: Build Finnish PDF + uses: https://github.com/xu-cheng/latex-action@v3 + with: + root_file: marko_korhonen_cv_fi.tex + latexmk_use_xelatex: true From 57557a0785d3fc7470c91d8a6c5acc3aea7cc221 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:57:09 +0300 Subject: [PATCH 10/10] CI: Add branches --- .forgejo/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index ab6aed4..bf9b9cc 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -2,6 +2,8 @@ name: Build PDF's on: push: + branches: + - main jobs: build_pdf: