From 3fc55d31398a12623459818f4d45ccd2ec82ca92 Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Tue, 17 Apr 2018 23:20:30 +0800
Subject: Update to use the new fontawesome5.sty

---
 Makefile   |  9 ++++++---
 resume.cls | 28 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index dbb5825..aec18b4 100644
--- a/Makefile
+++ b/Makefile
@@ -5,20 +5,23 @@
 # 2018-04-12
 #
 
-DEPS:= resume.cls fontawesome.sty
+DEPS:= resume.cls fontawesome5/fontawesome5.sty
 SRCS:= resume-zh.tex resume-en.tex
 PDFS:= $(SRCS:%.tex=%.pdf)
 
 DATE= $(shell date +%Y%m%d)
 DISTDIR= resume.$(DATE)
 
+# Environment variables
+TEXINPUTS:= .:fontawesome5:$(TEXINPUTS)
+
 all: $(PDFS)
 
 resume-zh.pdf: resume-zh.tex $(DEPS)
-	latexmk -xelatex $<
+	env TEXINPUTS=$(TEXINPUTS) latexmk -xelatex $<
 
 resume-en.pdf: resume-en.tex $(DEPS)
-	latexmk -xelatex $<
+	env TEXINPUTS=$(TEXINPUTS) latexmk -xelatex $<
 
 dist: all
 	mkdir $(DISTDIR)
diff --git a/resume.cls b/resume.cls
index 9ab786f..4a2b89d 100644
--- a/resume.cls
+++ b/resume.cls
@@ -36,7 +36,7 @@
 \RequirePackage{xparse}
 \RequirePackage{etoolbox}
 \RequirePackage{fontspec}
-\RequirePackage{fontawesome}
+\RequirePackage[regular]{fontawesome5}
 \RequirePackage{parskip}  % auto adjust parskip and items skip
 \RequirePackage{titlesec}
 \RequirePackage{enumitem}
@@ -100,18 +100,7 @@
   \setCJKmonofont{Noto Sans Mono CJK SC}
 }{}
 
-% Color setup
-\ifdef{\@monochrome}%
-  {\definecolor{basecolor}{HTML}{000000}}%
-  {\definecolor{basecolor}{HTML}{000066}}  % blue
-%
-\definecolor{darkGrey}{HTML}{989898}
-%
-\colorlet{linkcolor}{basecolor}
-\colorlet{accentcolor}{linkcolor!90}
-\colorlet{symbolcolor}{linkcolor!85}
-
-% Font Awesome icons aliases
+% Font Awesome icon aliases
 \newcommand*{\birthdaySymbol}{\faBirthdayCake}
 \newcommand*{\degreeSymbol}{\faGraduationCap}
 \newcommand*{\githubSymbol}{\faGithub}
@@ -124,6 +113,17 @@
 \newcommand*{\phoneSymbol}{\faPhone}
 \newcommand*{\universitySymbol}{\faUniversity}
 
+% Color setup
+\ifdef{\@monochrome}%
+  {\definecolor{basecolor}{HTML}{000000}}%
+  {\definecolor{basecolor}{HTML}{000066}}  % blue
+%
+\definecolor{darkGrey}{HTML}{989898}
+%
+\colorlet{linkcolor}{basecolor}
+\colorlet{accentcolor}{linkcolor!90}
+\colorlet{symbolcolor}{linkcolor!85}
+
 % Date format: yyyy.mm.dd
 \newcommand*{\twodigits}[1]{\ifnum#1<10 0\fi\the#1}
 \renewcommand*{\today}{%
@@ -505,7 +505,7 @@
   \textbf{#1} &
     \foreach \x in {1,...,5}{%
       \color{accentcolor!80}{%
-        \ifnumgreater{\x}{#2}{\faCircleThin}{\faCircle}
+        \ifnumgreater{\x}{#2}{\faCircleNotched}{\faCircle}
       }
     } \enspace \\
 }
-- 
cgit v1.2.2