diff --git a/Makefile b/Makefile index 95f5bea..69e35e4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -color = 3EB489 +color = 000000 photo = true extra = true build = $(CURDIR)/build diff --git a/image/icon/ic_bullet.png b/image/icon/ic_bullet.png new file mode 100644 index 0000000..bfac9be Binary files /dev/null and b/image/icon/ic_bullet.png differ diff --git a/tex/main.tex b/tex/main.tex index 83e2ceb..d6fed79 100644 --- a/tex/main.tex +++ b/tex/main.tex @@ -53,6 +53,7 @@ \input{page} % import pages info. \input{i18n/month} % import month values. \input{view/radio} % import radio view. -\input{view/place} % import place view. +\input{view/list} % import list view. +\input{page/example} % example page. \end{document} diff --git a/tex/page/example.tex b/tex/page/example.tex index 4e68b57..75725da 100644 --- a/tex/page/example.tex +++ b/tex/page/example.tex @@ -1 +1,16 @@ -\stitle{\pexample}\spar\vspace{-4mm}\noindent +\noindent\stitle{\pexample}\spar\vspace{0mm}\noindent +\vlist{% + \en{sample list}% + \ru{пример списка}% +}{% + \en{sample text}% + \ru{пример текста}% +}{% + \en{sample text}% + \ru{пример текста}\newline% + \vradio{3}% +}{% + example.com% +}{% + a;b;c% +} diff --git a/tex/style.tex b/tex/style.tex index 5b59628..27f862e 100644 --- a/tex/style.tex +++ b/tex/style.tex @@ -40,7 +40,7 @@ \newcommand{\shref} [1]{\hyperlink{#1}{\textcolor{link}{\sunderline{#1}}}} % reference section. \newcommand{\sref} [1]{\textcolor{ref}{#1}} % reference text. \newcommand{\slist} [1]{\textcolor{lgray}{#1}} % list numbers. -\newcommand{\sbullet} [0]{\raisebox{0.5mm}{\bullet}\hspace{4mm}} % list bullet symbol. +\newcommand{\sbullet} [0]{\sicon{ic_bullet}\hspace{4mm}} % list bullet symbol. \newcommand{\stitle} [1]{\hypertarget{#1}{}\fontsize{11}{11}% {\selectfont{\textcolor{main}{\ssemibold{#1}}}}} % section title. diff --git a/tex/view/list.tex b/tex/view/list.tex new file mode 100644 index 0000000..71de2ac --- /dev/null +++ b/tex/view/list.tex @@ -0,0 +1,15 @@ +% args: company's name, period, position, url, elements (separated by ;). +\newcommand{\slistlink}[1]{\sicon{ic_link}\ \href{https://#1}{\sitallic{#1}}} % job webpage. +\newcommand{\slisttitle}[2]{\sreset{\ssemibold{#1}}\sreset\hfill\fontsize% + {10}{10}\selectfont\textcolor{gray}{#2}} % job place. + +\newcommand{\vlist}[5]{% + \noindent + \slisttitle{#1}{#2}\newline + \stext{#3}\newline + \setsepchar{;}% + \ignoreemptyitems% + \readlist\elements{#5}% + \foreachitem\element\in\elements{\stext{\slist{\sbullet}\ \element}\newline} + \def\plink{#4}\ifx\plink\empty{}\else{\slistlink{#4}\spar}\fi +} diff --git a/tex/view/place.tex b/tex/view/place.tex deleted file mode 100644 index 502daed..0000000 --- a/tex/view/place.tex +++ /dev/null @@ -1,11 +0,0 @@ -% args: company's name, period, position, url, tasks (separated by ;). -\newcommand{\place}[5]{% - \noindent - \sjplace{#1}{#2}\newline - \stext{#3}\newline - \setsepchar{;}% - \ignoreemptyitems% - \readlist\tasks{#5}% - \foreachitem\task\in\tasks{\stext{\slist{\sbullet}\ \task}\newline} - \def\plink{#4}\ifx\plink\empty{}\else{\sjlink{#4}\spar}\fi -} diff --git a/tex/view/radio.tex b/tex/view/radio.tex index 686fecf..be995cd 100644 --- a/tex/view/radio.tex +++ b/tex/view/radio.tex @@ -1,4 +1,4 @@ -\newcommand{\radio}[1]{% +\newcommand{\vradio}[1]{% \ifnum#1>0{\sicon{ic_radio_checked}}\else{\sicon{ic_radio_unchecked}}\fi \ifnum#1>1{\sicon{ic_radio_checked}}\else{\sicon{ic_radio_unchecked}}\fi \ifnum#1>2{\sicon{ic_radio_checked}}\else{\sicon{ic_radio_unchecked}}\fi