diff --git a/tex/Const.tex b/tex/Const.tex index 340c6d3..8cabd68 100644 --- a/tex/Const.tex +++ b/tex/Const.tex @@ -12,9 +12,9 @@ \def\envEn{en} % English literal. \def\envRu{ru} % Russian literal. \def\envEmpty{} % Empty env value. -\getenv[\envPhoto]{RESUME_PHOTO} % Read photo shell variable. -\getenv[\envExtra]{RESUME_EXTRA} % Read extra shell variable. -\getenv[\envLang]{RESUME_LANG} % Read language shell variable. +\GetEnv[\envPhoto]{RESUME_PHOTO} % Read photo shell variable. +\GetEnv[\envExtra]{RESUME_EXTRA} % Read extra shell variable. +\GetEnv[\envLang]{RESUME_LANG} % Read language shell variable. \ifdefequal{\envPhoto}{\envTrue}{\Phototrue}{\Photofalse} % Show photo. \ifdefequal{\envExtra}{\envTrue}{\Extratrue}{\Extrafalse} % Show extra content. \ifdefequal{\envLang}{\envEn}{\Entrue}{} % Use English. diff --git a/tex/Shell.tex b/tex/Shell.tex index 91e1382..306a2ed 100644 --- a/tex/Shell.tex +++ b/tex/Shell.tex @@ -1,5 +1,5 @@ -% \getenv[\HOME]{HOME} % Example: Store $HOME shell var into \HOME cmd. +% \GetEnv[\HOME]{HOME} % Example: Store $HOME shell var into \HOME cmd. \usepackage{catchfile} -\newcommand{\getenv}[2][]{% +\newcommand{\GetEnv}[2][]{% \CatchFileEdef{\Temp}{"|kpsewhich --var-value #2"}{\endlinechar=-1}% \if\relax\detokenize{#1}\relax\Temp\else\let#1\Temp\fi} diff --git a/tex/Style.tex b/tex/Style.tex index 047b25f..efbf75c 100644 --- a/tex/Style.tex +++ b/tex/Style.tex @@ -1,5 +1,5 @@ % Colors. -\getenv[\ColorMain]{RESUME_COLOR} +\GetEnv[\ColorMain]{RESUME_COLOR} \definecolor{ColorBlack}{RGB}{0,0,0} \definecolor{ColorWhite}{RGB}{255,255,255} \definecolor{ColorLink} {RGB}{46,116,181} @@ -8,13 +8,13 @@ \definecolor{ColorLgray}{RGB}{229,229,229} \definecolor{ColorRef} {RGB}{53,82,105} -\definecolor{ColorCodeBackground}{RGB}{40,42,54} -\definecolor{ColorCodeText} {RGB}{248,248,242} -\definecolor{ColorCodeString} {RGB}{80,250,123} -\definecolor{ColorCodeLiteral} {RGB}{139,233,253} -\definecolor{ColorCodeProperty} {RGB}{139,233,253} -\definecolor{ColorCodeKeyword} {RGB}{255,184,108} -\definecolor{ColorCodeComment} {RGB}{98,114,164} +\definecolor{ColorCodeBackground}{RGB}{38,38,38} +\definecolor{ColorCodeText} {RGB}{255,215,175} +\definecolor{ColorCodeString} {RGB}{135,175,135} +\definecolor{ColorCodeLiteral} {RGB}{215,135,175} +\definecolor{ColorCodeProperty} {RGB}{135,95,95} +\definecolor{ColorCodeKeyword} {RGB}{255,95,95} +\definecolor{ColorCodeComment} {RGB}{128,128,128} % code block. \newtcolorbox{CodeBox}[1][]{ @@ -26,40 +26,42 @@ \newenvironment{Code}{\begin{CodeBox}\catcode33=12\obeylines}{\end{CodeBox}} % styles. -\newcommand{\ResetStyle} [1]{\fontsize{12}{12}\selectfont\rm\color{ColorBlack}#1} % Reset font style. -\newcommand{\Par} [0]{\par} % Default paragraph break. -\newcommand{\Parn} [0]{\par\noindent} % Default paragraph break without indent. -\newcommand{\Text} [1]{\ResetStyle{#1}} % Default text. -\newcommand{\Itallic} [1]{\textit{#1}} % Itallic text. -\newcommand{\Bold} [1]{\textbf{#1}} % Bold text. -\newcommand{\Semibold} [1]{\fontseries{sb}{\selectfont{#1}}} % Semi-bold text. -\newcommand{\Underline} [1]{\underline{#1}} % Underline text. -\newcommand{\Link} [2]{\href{#1}{\textcolor{ColorLink}{\Underline{#2}}}} % Link webpage. -\newcommand{\TextName} [1]{\fontsize{21}{21}{\selectfont{\Semibold{#1}}}} % Name style. -\newcommand{\Color} [2]{\textcolor{#1}{#2}} % Text color alias. -\newcommand{\Icon} [1]{\raisebox{-1mm}{\includegraphics[height=5mm]{#1}}} % Icons. -\newcommand{\Href} [1]{\hyperlink{#1}{\textcolor{ColorLink}{\Underline{#1}}}} % Reference section. -\newcommand{\TextRef} [1]{\textcolor{ColorRef}{#1}} % Reference text. -\newcommand{\TextList} [1]{\textcolor{ColorLgray}{#1}} % List numbers. -\newcommand{\Bullet} [0]{\raisebox{0.5mm}{\bullet}\hspace{4mm}} % List bullet symbol. -\newcommand{\Title} [1]{\hypertarget{#1}{}\fontsize{11}{11}% - {\selectfont{\textcolor{ColorMain}{\Semibold{#1}}}}} % Section title. +\newcommand{\ResetStyle}[1]{\fontsize{12}{12}\selectfont\rm\color{ColorBlack}#1} +\newcommand{\Par} [0]{\par} +\newcommand{\Parn} [0]{\par\noindent} +\newcommand{\Text} [1]{\ResetStyle{#1}} +\newcommand{\Itallic} [1]{\textit{#1}} +\newcommand{\Bold} [1]{\textbf{#1}} +\newcommand{\Semibold} [1]{\fontseries{sb}{\selectfont{#1}}} +\newcommand{\Underline} [1]{\underline{#1}} +\newcommand{\Link} [2]{\href{#1}{\textcolor{ColorLink}{\Underline{#2}}}} +\newcommand{\TextName} [1]{\fontsize{21}{21}{\selectfont{\Semibold{#1}}}} +\newcommand{\Color} [2]{\textcolor{#1}{#2}} +\newcommand{\Icon} [1]{\raisebox{-1mm}{\includegraphics[height=5mm]{#1}}} +\newcommand{\Href} [1]{\hyperlink{#1}{\textcolor{ColorLink}{\Underline{#1}}}} +\newcommand{\TextRef} [1]{\textcolor{ColorRef}{#1}} +\newcommand{\TextList} [1]{\textcolor{ColorLgray}{#1}} +\newcommand{\Bullet} [0]{\raisebox{0.5mm}{\bullet}\hspace{4mm}} +\newcommand{\End} [0]{\clearpage} +\newcommand{\Title} [1]{\hypertarget{#1}{}\fontsize{11}{11}{\selectfont{\textcolor{ColorMain}{\Semibold{#1}}}}} -\newcommand{\BlCompact}[0]{\renewcommand{\baselinestretch}{1.0}\normalsize} % Compact baseline size. -\newcommand{\BlDefault}[0]{\renewcommand{\baselinestretch}{1.5}\normalsize} % Default baseline size. +\newcommand{\BlToc} [0]{\renewcommand{\baselinestretch}{0.75}\normalsize} +\newcommand{\BlCompact}[0]{\renewcommand{\baselinestretch}{1.0}\normalsize} +\newcommand{\BlDefault}[0]{\renewcommand{\baselinestretch}{1.5}\normalsize} -\newcommand{\CString} [1]{\textcolor{ColorCodeString}{#1}} -\newcommand{\CLiteral} [1]{\textcolor{ColorCodeLiteral}{#1}} -\newcommand{\CProperty}[1]{\textcolor{ColorCodeProperty}{#1}} -\newcommand{\CKeyword} [1]{\textcolor{ColorCodeKeyword}{#1}} -\newcommand{\CComment} [1]{\textcolor{ColorCodeComment}{#1}} +\newcommand{\CodeText} [1]{\textcolor{CodeText}{#1}} +\newcommand{\CodeString} [1]{\textcolor{ColorCodeString}{#1}} +\newcommand{\CodeLiteral} [1]{\textcolor{ColorCodeLiteral}{#1}} +\newcommand{\CodeProperty} [1]{\textcolor{ColorCodeProperty}{#1}} +\newcommand{\CodeKeyword} [1]{\textcolor{ColorCodeKeyword}{#1}} +\newcommand{\CodeComment} [1]{\textcolor{ColorCodeComment}{#1}} +\newcommand{\CodeEmptyLine}[0]{~} -\newcommand{\JLink} [1]{\Icon{IcLink}\ \href{https://#1}{\Itallic{#1}}} % Job webpage. -\newcommand{\JPlace}[2]{\ResetStyle{\Semibold{#1}}\ResetStyle\hfill\fontsize% - {10}{10}\selectfont\textcolor{ColorGray}{(#2)}} % Job place. +\newcommand{\JLink} [1]{\Icon{IcLink}\ \href{https://#1}{\Itallic{#1}}} +\newcommand{\JPlace}[2]{\ResetStyle{\Semibold{#1}}\ResetStyle\hfill\fontsize{10}{10}\selectfont\textcolor{ColorGray}{(#2)}} % settings. \linespread{1.5} % Height between non-breaking lines. \sloppy % Correct word placement on newline. \pagestyle{empty} % Suppress default styles, i.e. page numbers. -\BlDefault % Default baseline size. +\BlDefault % Default baseline size.