diff --git a/CHANGELOG b/CHANGELOG index c6dd1ac..3726bf0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +version 1.5.1 (29 Apr 2013) + - made sure that XeLaTeX or LuaLaTeX is in use before loading the awesome icon + set and if not, revert to the marvosym icon set. + version 1.5.0 (23 Apr 2013) - added a command to showcase social accounts in one's personal information: \social. The command currently handles automatically LinkedIn, Twitter and diff --git a/examples/template-es.pdf b/examples/template-es.pdf index 93506ce..54af78b 100644 Binary files a/examples/template-es.pdf and b/examples/template-es.pdf differ diff --git a/examples/template-es.tex b/examples/template-es.tex index 4f7b7bf..e2dae86 100644 --- a/examples/template-es.tex +++ b/examples/template-es.tex @@ -23,13 +23,12 @@ %\setlength{\hintscolumnwidth}{3cm} % si desea cambiar el ando de la columna para las fechas % datos personales -\firstname{John} -\familyname{Doe} +\name{John}{Doe} \title{T\'itulo del CV (opcional)} % dato opcional, elimine la linea si no desea el dato \address{calle y n\'umero}{c\'odigo postal y ciudad} % dato opcional, elimine la linea si no desea el dato -\mobile{+1~(234)~567~890} % dato opcional, elimine la linea si no desea el dato -\phone{+2~(345)~678~901} % dato opcional, elimine la linea si no desea el dato -\fax{+3~(456)~789~012} % dato opcional, elimine la linea si no desea el dato +\phone[mobile]{+1~(234)~567~890} % dato opcional, elimine la linea si no desea el dato +\phone[fixed]{+2~(345)~678~901} % dato opcional, elimine la linea si no desea el dato +\phone[fax]{+3~(456)~789~012} % dato opcional, elimine la linea si no desea el dato \email{john@doe.org} % dato opcional, elimine la linea si no desea el dato \homepage{www.johndoe.com} % dato opcional, elimine la linea si no desea el dato \extrainfo{informacion adicional} % dato opcional, elimine la linea si no desea el dato diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf index 27ff68d..a3315b7 100644 Binary files a/examples/template-zh.pdf and b/examples/template-zh.pdf differ diff --git a/examples/template-zh.tex b/examples/template-zh.tex index bdef670..6d29b82 100644 --- a/examples/template-zh.tex +++ b/examples/template-zh.tex @@ -22,18 +22,17 @@ %\setlength{\hintscolumnwidth}{3cm} % 如果你希望改变日期栏的宽度 % 个人信息 -\firstname{小龙} -\familyname{李} -\title{简历题目 (可选项)} % 可选项、如不需要可删除本行 -\address{街道及门牌号}{邮编及城市} % 可选项、如不需要可删除本行 -\mobile{+1~(234)~567~890} % 可选项、如不需要可删除本行 -\phone{+2~(345)~678~901} % 可选项、如不需要可删除本行 -\fax{+3~(456)~789~012} % 可选项、如不需要可删除本行 +\name{小龙}{李} +\title{简历题目 (可选项)} % 可选项、如不需要可删除本行 +\address{街道及门牌号}{邮编及城市} % 可选项、如不需要可删除本行 +\phone[mobile]{+1~(234)~567~890} % 可选项、如不需要可删除本行 +\phone[fixed]{+2~(345)~678~901} % 可选项、如不需要可删除本行 +\phone[fax]{+3~(456)~789~012} % 可选项、如不需要可删除本行 \email{xiaolong@li.com.cn} % 可选项、如不需要可删除本行 \homepage{www.xialongli.com} % 可选项、如不需要可删除本行 -\extrainfo{附加信息 (可选项)} % 可选项、如不需要可删除本行 +\extrainfo{附加信息 (可选项)} % 可选项、如不需要可删除本行 \photo[64pt][0.4pt]{picture} % ‘64pt’是图片必须压缩至的高度、‘0.4pt‘是图片边框的宽度 (如不需要可调节至0pt)、’picture‘ 是图片文件的名字;可选项、如不需要可删除本行 -\quote{引言(可选项)} % 可选项、如不需要可删除本行 +\quote{引言(可选项)} % 可选项、如不需要可删除本行 % 显示索引号;仅用于在简历中使用了引言 %\makeatletter @@ -128,4 +127,4 @@ \end{document} -%% 文件结尾 `template-zh.tex'. \ No newline at end of file +%% 文件结尾 `template-zh.tex'. diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf index 60327f3..b7a57e2 100644 Binary files a/examples/template_banking_red.pdf and b/examples/template_banking_red.pdf differ diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf index b500f90..3b2b0ec 100644 Binary files a/examples/template_casual_orange.pdf and b/examples/template_casual_orange.pdf differ diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf index 62b7a98..5a2aab8 100644 Binary files a/examples/template_classic_green.pdf and b/examples/template_classic_green.pdf differ diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf index 1c2aa81..72d781a 100644 Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf index a65e5f6..23a5dff 100644 Binary files a/examples/template_oldstyle_grey.pdf and b/examples/template_oldstyle_grey.pdf differ diff --git a/moderncv.cls b/moderncv.cls index a5cb93d..a14227c 100644 --- a/moderncv.cls +++ b/moderncv.cls @@ -84,17 +84,17 @@ \RequirePackage{xcolor} % font loading -%\RequirePackage{ifxetex,ifluatex} -%\newif\ifxetexorluatex -%\ifxetex -% \xetexorluatextrue -%\else -% \ifluatex -% \xetexorluatextrue -% \else -% \xetexorluatexfalse -% \fi -%\fi +\RequirePackage{ifxetex,ifluatex} +\newif\ifxetexorluatex +\ifxetex + \xetexorluatextrue +\else + \ifluatex + \xetexorluatextrue + \else + \xetexorluatexfalse + \fi +\fi % automatic loading of latin modern fonts %\ifxetexorluatex % \RequirePackage{fontspec} diff --git a/moderncviconsawesome.sty b/moderncviconsawesome.sty index 1b883e5..826a67d 100644 --- a/moderncviconsawesome.sty +++ b/moderncviconsawesome.sty @@ -11,7 +11,8 @@ %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{moderncviconsawesome}[2013/04/23 v1.5.0 modern curriculum vitae and letter icons: awesome] - +% XeTeX or LuaTeX is needed to be able to use fontspec and fontawesome +\ifxetexorluatex %------------------------------------------------------------------------------- % required packages @@ -39,6 +40,11 @@ \renewcommand*{\githubsocialsymbol} {\faGithub~} +% if XeTeX or LuaTeX is not used, load the marvosym icon set instead +\else + \typeout{WARNING: to use the awesome icon set, please use XeTeX or LuaTeX to compile your document; switching to the marvosym icon set.} + \RequirePackage{moderncviconsmarvosym} +\fi \endinput