diff --git a/en/Lato-Hairline.ttf b/Lato-Hairline.ttf similarity index 100% rename from en/Lato-Hairline.ttf rename to Lato-Hairline.ttf diff --git a/en/Lato-Light.ttf b/Lato-Light.ttf similarity index 100% rename from en/Lato-Light.ttf rename to Lato-Light.ttf diff --git a/Makefile b/Makefile index b1437be..9d8e534 100644 --- a/Makefile +++ b/Makefile @@ -5,13 +5,13 @@ outputdir: mkdir -p output en: outputdir - cd en && xelatex -output-directory=../output marko_korhonen_cv_en - cd en && biber marko_korhonen_cv - cd en && xelatex -output-directory=../output marko_korhonen_cv_en + xelatex -output-directory=./output marko_korhonen_cv_en + biber marko_korhonen_cv_en + xelatex -output-directory=./output marko_korhonen_cv_en fi: outputdir - cd fi && xelatex -output-directory=../output marko_korhonen_cv_fi - cd fi && biber marko_korhonen_cv - cd fi && xelatex -output-directory=../output marko_korhonen_cv_fi + xelatex -output-directory=./output marko_korhonen_cv_fi + biber marko_korhonen_cv_fi + xelatex -output-directory=./output marko_korhonen_cv_fi all: en fi diff --git a/en.tex b/en.tex deleted file mode 120000 index 07ecfae..0000000 --- a/en.tex +++ /dev/null @@ -1 +0,0 @@ -en/marko_korhonen_cv_en.tex \ No newline at end of file diff --git a/fi.tex b/fi.tex deleted file mode 120000 index ffb9e0f..0000000 --- a/fi.tex +++ /dev/null @@ -1 +0,0 @@ -fi/marko_korhonen_cv_fi.tex \ No newline at end of file diff --git a/fi/Lato-Hairline.ttf b/fi/Lato-Hairline.ttf deleted file mode 100644 index 288be29..0000000 Binary files a/fi/Lato-Hairline.ttf and /dev/null differ diff --git a/fi/Lato-Light.ttf b/fi/Lato-Light.ttf deleted file mode 100644 index a958067..0000000 Binary files a/fi/Lato-Light.ttf and /dev/null differ diff --git a/fi/friggeri-cv-a4.cls b/fi/friggeri-cv-a4.cls deleted file mode 100644 index 82cdb3d..0000000 --- a/fi/friggeri-cv-a4.cls +++ /dev/null @@ -1,361 +0,0 @@ -\ProvidesClass{friggeri-cv-a4}[2015/10/22 CV class] -\NeedsTeXFormat{LaTeX2e} - -\DeclareOption{nocolors}{\def\@cv@nocolors{}} -\DeclareOption{print}{\def\@cv@print{}} -\DeclareOption*{% - \PassOptionsToClass{\CurrentOption}{article}% -} -\ProcessOptions\relax -\LoadClass{article} - -% set A4 paper format -\setlength\paperheight {297mm} -\setlength\paperwidth {210mm} - -\ProcessOptions - -%%%%%%%%%% -% Colors % -%%%%%%%%%% - -\RequirePackage{xcolor} - -\definecolor{white}{RGB}{255,255,255} - -\definecolor{darkgray}{HTML}{333333} -\definecolor{gray}{HTML}{4D4D4D} -\definecolor{lightgray}{HTML}{999999} - -\definecolor{green}{HTML}{C2E15F} -\definecolor{orange}{HTML}{FDA333} -\definecolor{purple}{HTML}{D3A4F9} -\definecolor{red}{HTML}{FB4485} -\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} -\else - \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} -\fi - -%%%%%%%%% -% Fonts % -%%%%%%%%% - -\RequirePackage[quiet]{fontspec} -\RequirePackage{unicode-math} - -\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, -BoldFont=texgyreheros-bold.otf, -ItalicFont=texgyreheros-italic.otf, -BoldItalicFont=texgyreheros-bolditalic.otf -] -{texgyreheros-regular.otf} - -\setmathfont{texgyreheros-regular.otf} -%%% - -%%%%%%%%%% -% Header % -%%%%%%%%%% - -\RequirePackage{tikz} - -\newcommand{\rolefont}{% - \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} -} - - -%%%%%%%%%%%%% -% Structure % -%%%%%%%%%%%%% -\RequirePackage{parskip} - -\newcounter{colorCounter} -\def\@sectioncolor#1{% - {% - \color{% - \ifcase\value{colorCounter}% - red\or% - orange\or% - green\or% - blue\or% - purple\or% - brown\else% - headercolor\fi% - } #1% - }% - \stepcounter{colorCounter}% -} - -\renewcommand{\section}[1]{ - \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}% -} - -\renewcommand{\subsubsection}[2]{ - \par\vspace{.5\parskip}% - {\Large\headingfont\color{headercolor} #2} - \par\vspace{.25\parskip}% -} - -\pagestyle{empty} - - -%%%%%%%%%%%%%%%%%%%% -% List environment % -%%%%%%%%%%%%%%%%%%%% - -\setlength{\tabcolsep}{0pt} -\newenvironment{entrylist}{% - \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}% - }\\} - - -%%%%%%%%%%%%%% -% Side block % -%%%%%%%%%%%%%% - -\RequirePackage[absolute,overlay]{textpos} -\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 -} - -%%%%%%%%%%%%%%%% -% Bibliography % -%%%%%%%%%%%%%%%% - -\RequirePackage[backend=biber, style=verbose, maxnames=99, sorting=ydnt]{biblatex} - -\DeclareFieldFormat[article]{title}{#1\par} -\DeclareFieldFormat[book]{title}{#1\par} -\DeclareFieldFormat[inproceedings]{title}{#1\par} -\DeclareFieldFormat[misc]{title}{#1\par} -\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} -} - -\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} -} - - -\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} -} - -\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} -} - -\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} -} - -\DeclareNameFormat{author}{% - \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} -} - -\newcommand{\printbibsection}[2]{ - \begin{refsection} - \newrefcontext[sorting=chronological]% - \nocite{*} - \printbibliography[type={#1}, title={#2}, heading=bibheading] - \end{refsection} -} - -\DeclareSortingScheme{chronological}{ - \sort[direction=descending]{\field{year}} - \sort[direction=descending]{\field{month}} -} - - - -%%%%%%%%%%%%%%%% -% Other tweaks % -%%%%%%%%%%%%%%%% - -\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} - -% A fix for \href{}{} colors not working with fontspec -\makeatletter -\def\HyColor@@@@UseColor#1\@nil{\addfontfeatures{Color=#1}} -\makeatother diff --git a/fi/texgyreheros-bold.otf b/fi/texgyreheros-bold.otf deleted file mode 100644 index 4c94009..0000000 Binary files a/fi/texgyreheros-bold.otf and /dev/null differ diff --git a/fi/texgyreheros-bolditalic.otf b/fi/texgyreheros-bolditalic.otf deleted file mode 100644 index 2f4e007..0000000 Binary files a/fi/texgyreheros-bolditalic.otf and /dev/null differ diff --git a/fi/texgyreheros-italic.otf b/fi/texgyreheros-italic.otf deleted file mode 100644 index bd5bdfe..0000000 Binary files a/fi/texgyreheros-italic.otf and /dev/null differ diff --git a/fi/texgyreheros-regular.otf b/fi/texgyreheros-regular.otf deleted file mode 100644 index cf83f01..0000000 Binary files a/fi/texgyreheros-regular.otf and /dev/null differ diff --git a/en/friggeri-cv-a4.cls b/friggeri-cv-a4.cls similarity index 100% rename from en/friggeri-cv-a4.cls rename to friggeri-cv-a4.cls diff --git a/en/marko_korhonen_cv_en.tex b/marko_korhonen_cv_en.tex similarity index 100% rename from en/marko_korhonen_cv_en.tex rename to marko_korhonen_cv_en.tex diff --git a/fi/marko_korhonen_cv_fi.tex b/marko_korhonen_cv_fi.tex similarity index 99% rename from fi/marko_korhonen_cv_fi.tex rename to marko_korhonen_cv_fi.tex index 3e7a132..625b354 100644 --- a/fi/marko_korhonen_cv_fi.tex +++ b/marko_korhonen_cv_fi.tex @@ -24,7 +24,7 @@ % Options % 'print': remove colors from this template for printing % 'nocolors' to disable colors in section headers -\documentclass[]{friggeri-cv-a4} +\documentclass[]{../friggeri-cv-a4} \begin{document} diff --git a/en/texgyreheros-bold.otf b/texgyreheros-bold.otf similarity index 100% rename from en/texgyreheros-bold.otf rename to texgyreheros-bold.otf diff --git a/en/texgyreheros-bolditalic.otf b/texgyreheros-bolditalic.otf similarity index 100% rename from en/texgyreheros-bolditalic.otf rename to texgyreheros-bolditalic.otf diff --git a/en/texgyreheros-italic.otf b/texgyreheros-italic.otf similarity index 100% rename from en/texgyreheros-italic.otf rename to texgyreheros-italic.otf diff --git a/en/texgyreheros-regular.otf b/texgyreheros-regular.otf similarity index 100% rename from en/texgyreheros-regular.otf rename to texgyreheros-regular.otf