Merge branch 'master' into zh_CN

billryan · May 31, 2015 · 590feb0 · 590feb0
2 parents 4dd187e + f401d27
commit 590feb0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,9 @@
 # Résumé
 
+Hit branch [zh_CN](https://github.com/billryan/resume/tree/zh_CN) if you wanna an Simplified Chinese résumé.
+
+中文用户请前往 [zh_CN](https://github.com/billryan/resume/tree/zh_CN) 分支。
+
 An elegant \LaTeX\ résumé template, compiled with \XeLaTeX. Inspired by 
 
 - [zachscrivena/simple-resume-cv](https://github.com/zachscrivena/simple-resume-cv)
@@ -20,7 +24,7 @@ An elegant \LaTeX\ résumé template, compiled with \XeLaTeX. Inspired by
 1. ShareLaTeX online editor
 2. Compile tex on your Computer
 
-If you only need résumé in English or have installed Adobe Simplified Chinese in your OS, you'd better clone only master branch, since the Chinese fonts files are too large.
+If you only need résumé in English or have installed Adobe Simplified Chinese in your OS, **you'd better clone only master branch,** since the Chinese fonts files are too large.
 
 ```
 git clone https://github.com/billryan/resume.git --branch master --depth 1 --single-branch <folder>

diff --git a/fontawesome.sty b/fontawesome.sty
@@ -26,7 +26,11 @@
 %-------------------------------------------------------------------------------
 
 % definition of \FA as a shortcut to load the Font Awesome font
-\newfontfamily{\FA}[Path=fonts/, Scale=0.85]{FontAwesome.otf}
+\newfontfamily{\FA}[
+Path=fonts/,
+Scale=0.85,
+SmallCapsFont=FontAwesome.otf
+]{FontAwesome.otf}
 
 % generic command to display an icon by its name
 \newcommand*{\faicon}[1]{%

diff --git a/resume.cls b/resume.cls
@@ -54,10 +54,14 @@
   \centerline{\Huge{#1}}
   \vspace{1.25ex}
 }
-\newcommand{\contact}[3]{
+\newcommand{\contactInfo}[3]{
   \centerline{\large{\faEnvelopeO\ {#1} \textperiodcentered {{\Large\faMobile}\ {#2}} \textperiodcentered \faLink\ {#3}}}
   \vspace{1.5ex}
 }
+\newcommand{\basicContactInfo}[3]{
+  \centerline{\large{\faEnvelopeO\ {#1} \textperiodcentered {{\Large\faMobile}\ {#2}}}}
+  \vspace{1.5ex}
+}
 \newcommand{\role}[2]{
   {\par \textit{#1} ~ #2 \par}
 }
diff --git a/resume.pdf b/resume.pdf
diff --git a/resume.tex b/resume.tex
@@ -7,13 +7,16 @@
 
 \name{Bin Yuan}
 
-\contact{[email protected]}{(+86) 131-221-87xxx}{http://www.yuanbin.me}
+% {E-mail}{mobilephone}{homepage}
+\contactInfo{[email protected]}{(+86) 131-221-87xxx}{http://www.yuanbin.me}
+% {E-mail}{mobilephone}
+%\basicContactInfo{[email protected]}{(+86) 131-221-87xxx}
 
 \section{\faGraduationCap\ Education}
 \datedsubsection{\textbf{Shanghai Jiao Tong University (SJTU)}, Shanghai, China}{2013 -- Present}
-\textit{Master student} in Electronics Engineering, expected March 2016
+\textit{Master student} in Electronics Engineering (EE), expected March 2016
 \datedsubsection{\textbf{Xidian University}, Shaanxi, China}{2009 -- 2013}
-\textit{B.S.} in Electronics Engineering
+\textit{B.S.} in Electronics Engineering (EE)
 
 \section{\faUsers\ Experience}
 \datedsubsection{\textbf{FLAG Inc.} California, America}{2012 -- Present}

diff --git a/scripts/fontawesome_preamble.sty b/scripts/fontawesome_preamble.sty
@@ -26,7 +26,11 @@
 %-------------------------------------------------------------------------------
 
 % definition of \FA as a shortcut to load the Font Awesome font
-\newfontfamily{\FA}[Path=fonts/, Scale=0.85]{FontAwesome.otf}
+\newfontfamily{\FA}[
+Path=fonts/,
+Scale=0.85,
+SmallCapsFont=FontAwesome.otf
+]{FontAwesome.otf}
 
 % generic command to display an icon by its name
 \newcommand*{\faicon}[1]{%