diff --git a/.gitignore b/.gitignore index f569c0d51139da45cea21ccc7cf2e8563e7722c3..3e3768d8ffb01515b5433ee00ce57583c564a5cb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,4 @@ *.vrb *.rej *.orig -*.tmp +*.tmp \ No newline at end of file diff --git a/article/Makefile b/article/Makefile index 689f68122e9b694891f07e8bc4380d5d6ac88702..d7e960a1433485a7fc64e18c9f906ef0898f5407 100644 --- a/article/Makefile +++ b/article/Makefile @@ -4,6 +4,9 @@ PDFS=$(SRC:.md=.pdf) LATEX_TEMPLATE=./templates/default.latex LATEX_HEADER=./templates/header.tex +# link-color +LINK_COLOR = Cyan + pdf: clean $(PDFS) all: clean $(PDFS) @@ -13,6 +16,7 @@ all: clean $(PDFS) --latex-engine=xelatex \ --template=$(LATEX_TEMPLATE) \ -H $(LATEX_HEADER) \ + -V colorlinks -V urlcolor=$(LINK_COLOR) \ -f markdown $< -o $@ read: $(PDFS) diff --git a/article/templates/header.tex b/article/templates/header.tex index cefd8a7b57edf25ac4598401b7805b41d49a4a18..8a0e3abb9e9bf9a7c31c986abceda872bcd0ebb1 100644 --- a/article/templates/header.tex +++ b/article/templates/header.tex @@ -3,6 +3,11 @@ \usepackage{xeCJK} \setCJKmainfont{AR PL KaitiM GB} % 中文字体 \setmainfont[Mapping=tex-text]{AR PL SungtiL GB} % 英文字体 + + \usepackage[dvipsnames,svgnames*,x11names*]{xcolor} + \definecolors{Navy} + \definecolors{Ivory3} + % \setromanfont{Latin Modern Roman} % \setmonofont{Ubuntu Mono} \renewcommand\contentsname{目 录} diff --git a/resume/Makefile b/resume/Makefile index eca2156d9e2ec2fc94f6508d40fd68f1b99d26a6..ba4024146349e0c49d8fef44406ca6ff86371a1c 100755 --- a/resume/Makefile +++ b/resume/Makefile @@ -8,6 +8,8 @@ LATEX_TEMPLATE=./templates/default.latex LATEX_HEADER=./templates/header.tex HTML_CSS=./templates/resume.css +LINK_COLOR = Ivory3 + all: clean $(PDFS) $(HTML) pdf: clean $(PDFS) @@ -21,6 +23,7 @@ html: clean $(HTML) python resume.py tex < $< \ | pandoc --latex-engine=xelatex \ --template=$(LATEX_TEMPLATE) \ + -V colorlinks -V urlcolor=$(LINK_COLOR)\ -H $(LATEX_HEADER) -o $@ ifeq ($(OS),Windows_NT) diff --git a/resume/templates/header.tex b/resume/templates/header.tex index 33401f76a5973d88a67b54ee67a8d83c6254a5ea..9b021b498a92e8b1c326208852df6f5a27c76cf6 100644 --- a/resume/templates/header.tex +++ b/resume/templates/header.tex @@ -13,6 +13,11 @@ \titlespacing{\section}{0pt}{-2em}{1em} \titleformat{\subsection}{\large\bfseries\MakeUppercase}{\thesubsection}{1em}{} +\usepackage[dvipsnames,svgnames*,x11names*]{xcolor} +\definecolors{Navy} +\definecolors{Ivory3} + + %\usepackage{multicol} \pagestyle{empty} \hyphenation{Media-Wiki} diff --git a/slides/Makefile b/slides/Makefile index f76f6400c62b4c01991abb256d9382ea48a0ed75..d5ee9a8b8ed44862b3a5a6d8db9ebe827b70f444 100644 --- a/slides/Makefile +++ b/slides/Makefile @@ -22,6 +22,10 @@ toc_number_fg=violet toc_section_bg=white toc_section_fg=orange +# link-color +LINK_COLOR = Cyan + + latex_fontsize=9pt latex_template=./templates/zh_template.tex @@ -51,6 +55,7 @@ html: $(HTML) -V colortheme:$(latex_colortheme) \ -V theme:$(latex_theme) \ -V fontsize:$(latex_fontsize) \ + -V colorlinks -V urlcolor=$(LINK_COLOR) \ $<.tmp -o $@ rm $<.tmp diff --git a/slides/templates/zh_template.tex b/slides/templates/zh_template.tex index fbc0e69301340dd8e4c89a089f02063600d2e70f..0131d958bdde3fae82afe2f70ed2f0165323dfb9 100644 --- a/slides/templates/zh_template.tex +++ b/slides/templates/zh_template.tex @@ -6,6 +6,9 @@ $if(colortheme)$ \usecolortheme{$colortheme$} $endif$ +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} + % Hide navigation bar \setbeamertemplate{navigation symbols}{} \useoutertheme{shadow} @@ -26,6 +29,7 @@ $endif$ \vskip0pt% } + % Customize tableofcontent $if(toc_number_bg)$ \setbeamercolor{section number projected}{bg=$toc_number_bg$,fg=$toc_number_fg$} @@ -59,6 +63,9 @@ $endif$ \usepackage[utf8]{inputenc} \fi \fi + + + $if(natbib)$ \usepackage{natbib} \bibliographystyle{plainnat}