10 files changed, 131 insertions, 132 deletions
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/README b/Master/texmf-dist/doc/xelatex/resumecls/README.md
index 1a38bc3d83a..f9f39c8da4e 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/README
+++ b/Master/texmf-dist/doc/xelatex/resumecls/README.md
@@ -8,7 +8,7 @@ A LaTeX cls to typeset resume both in English and Chinese
 - To get the cls file you only need to update local CTAN Packages.
 - For how to use it you can refer to [`resumecls-example`](https://github.com/huxuan/resumecls-example) repo.
 
-## Mnaual Compile
+## Manual Compile
 
 To get the cls file and document manually, you can make it either by Makefile or LaTeX command
 
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile b/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile
index 110a0491b77..d64ce858012 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile
@@ -26,7 +26,7 @@ $(RESUMEZH).pdf: $(RESUMEZH).tex $(RESUMEZH).bbl
 	xelatex $(RESUMEZH).tex
 	xelatex $(RESUMEZH).tex
 
-$(RESUMEZH).bbl:
+$(RESUMEZH).bbl: $(RESUME).bib
 	xelatex $(RESUMEZH).tex
 	-bibtex $(RESUMEZH)
 
@@ -38,7 +38,7 @@ $(RESUMEEN).pdf: $(RESUMEEN).tex $(RESUMEEN).bbl
 	xelatex $(RESUMEEN).tex
 	xelatex $(RESUMEEN).tex
 
-$(RESUMEEN).bbl:
+$(RESUMEEN).bbl: $(RESUME).bib
 	xelatex $(RESUMEEN).tex
 	-bibtex $(RESUMEEN)
 
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.pdf b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.pdf
index c4bc9a473c6..e8ff0ad83d6 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.pdf
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.pdf
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.tex b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.tex
index 7cf84171879..d370f3e2a39 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.tex
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.tex
@@ -13,13 +13,16 @@
 
 \documentclass[en,color]{resumecls}
 
+\CTEXoptions[today=old]
+
 \name{Name}
 \organization{unit, school or organization}
 \address{address, zip code}
 \mobile{+1 XXX XXXX XXXX}
 \mail{i@example.com}
 \homepage{http://example.com}
-\resumeurl{http://example.com/resume-en.pdf}
+\leftfooter{Last Modified: \today}
+\rightfooter{\url{http://example.com/resume-en.pdf}}
 
 \begin{document}
 
@@ -29,52 +32,52 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Education}
-\entry{2em}{Xrp{8em}}{
+\entry{2em}{Xrp{8em}}{%
     \heiti{School} & City & Time Period \\
 }
-\entry{4em}{lXX}{
+\entry{4em}{lXX}{%
     Degree & College of XXX & Major in XX \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Research Experience}
-\entry{2em}{Xp{8em}}{
+\entry{2em}{Xp{8em}}{%
     \heiti{Insitute} & Time Period \\
 }
 \entry{4em}{X}{Lab \quad Position}
-\entry{6em}{X}{
+\entry{6em}{X}{%
     Research Fields and Specific Content \\
     Publication (You can also use bibtex, like \cite{label}, see end of doc） \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Working Experience}
-\entry{2em}{Xp{8em}}{
+\entry{2em}{Xp{8em}}{%
     \heiti{Unit} & Time Period \\
 }
 \entry{4em}{X}{Department \quad Position}
-\entry{6em}{X}{
+\entry{6em}{X}{%
     Specific Issues Responsible for \\
     Specific Content of Your Work \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{School Experience}
-\entry{2em}{Xp{8em}}{
+\entry{2em}{Xp{8em}}{%
     Experience 1 & Time Period \\
     Experience 2 & Time Period \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Awards}
-\entry{2em}{Xr}{
+\entry{2em}{Xr}{%
     Award 1 & Time \\
     Award 2 & Time \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Professional Skill}
-\entry{2em}{lX}{
+\entry{2em}{lX}{%
     Proficient in  & XXX \\
     Experienced in & XXX \\
     Familiar with  & XXX \\
@@ -83,7 +86,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Other listings, such as hobby, network profile and so on}
-\entry{2em}{lX}{
+\entry{2em}{lX}{%
     Label 1 & Content 1 \\
     Label 2 & Content 2 \\
 }
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.pdf b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.pdf
index 5021100af5f..e34db07be02 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.pdf
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.pdf
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.tex b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.tex
index f63d5320407..194d48b76c6 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.tex
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.tex
@@ -13,13 +13,16 @@
 
 \documentclass[zh,color]{resumecls}
 
+\CTEXoptions[today=small]
+
 \name{姓名}
 \organization{单位、学校或组织}
 \address{地址，邮编}
 \mobile{+86 XXX XXXX XXXX}
 \mail{i@example.com}
 \homepage{http://example.com}
-\resumeurl{http://example.com/resume-zh.pdf}
+\leftfooter{最后更新: \today}
+\rightfooter{\url{http://example.com/resume-zh.pdf}}
 
 \begin{document}
 
@@ -29,52 +32,52 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{教育经历}
-\entry{2em}{Xrp{8em}}{
+\entry{2em}{Xrp{8em}}{%
     \heiti{学校} & 城市 & 起止时间 \\
 }
-\entry{4em}{lXX}{
+\entry{4em}{lXX}{%
     学位 & XX学院 & XX专业 \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{科研经历}
-\entry{2em}{Xp{8em}}{
+\entry{2em}{Xp{8em}}{%
     \heiti{地点} & 起止时间 \\
 }
 \entry{4em}{X}{实验室名称 \quad 职位}
-\entry{6em}{X}{
+\entry{6em}{X}{%
     研究方向和具体内容 \\
     发表成果（亦可使用bibtex，像这样\cite{label}，见文档最后注释内容） \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{工作经历}
-\entry{2em}{Xp{8em}}{
+\entry{2em}{Xp{8em}}{%
     \heiti{单位名称} & 起止时间 \\
 }
 \entry{4em}{X}{部门 \quad 职位}
-\entry{6em}{X}{
+\entry{6em}{X}{%
     负责的具体事项 \\
     工作的具体内容 \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{校园经历}
-\entry{2em}{Xp{8em}}{
+\entry{2em}{Xp{8em}}{%
     经历1 & 起止时间 \\
     经历2 & 起止时间 \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{获得荣誉}
-\entry{2em}{Xr}{
+\entry{2em}{Xr}{%
     荣誉1 & 颁发时间 \\
     荣誉2 & 颁发时间 \\
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{专业技能}
-\entry{2em}{lX}{
+\entry{2em}{lX}{%
     精通 & XXX \\
     熟悉 & XXX \\
     掌握 & XXX \\
@@ -83,7 +86,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{其他列举事项-如个人爱好，网络资料等}
-\entry{2em}{lX}{
+\entry{2em}{lX}{%
     标签1 & 标签对应内容 \\
     标签2 & 标签对应内容 \\
 }
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf b/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf
index 5452bedcacf..5415ac9e0fc 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf
+++ b/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf
diff --git a/Master/texmf-dist/source/xelatex/resumecls/resumecls.dtx b/Master/texmf-dist/source/xelatex/resumecls/resumecls.dtx
index a911d14d9b0..7caa8c695ec 100644
--- a/Master/texmf-dist/source/xelatex/resumecls/resumecls.dtx
+++ b/Master/texmf-dist/source/xelatex/resumecls/resumecls.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % resumecls.dtx
-% Copyright (C) 2012-2013 by huxuan <i@huxuan.org>
+% Copyright (C) 2012-2015 by huxuan <i@huxuan.org>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -27,13 +27,12 @@
 %<class>\NeedsTeXFormat{LaTeX2e}[2011/06/27]
 %<class>\ProvidesClass{resumecls}
 %<*class>
-    [2013/03/17 v0.2.1 Celebrate for being included in CTAN]
+    [2015/06/17 v0.3 Long time no see, resumecls]
 %</class>
 %
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage[adobefonts]{ctex}
-\CTEXoptions[today=old]
 
 \usepackage{color}
 \definecolor{dkgreen}{rgb}{0,0.6,0}
@@ -83,7 +82,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{139}
+% \CheckSum{124}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -108,22 +107,26 @@
 % \changes{v0.1.4}{2012/12/20}{Use bfseries for better English support}
 % \changes{v0.2}{2013/03/07}{First try to upload to CTAN}
 % \changes{v0.2.1}{2013/03/17}{Celebrate for being included in CTAN}
+% \changes{v0.3}{2013/06/17}{Long time no see, resumecls}
 %
 % \GetFileInfo{\jobname.dtx}
 %
-% \DoNotIndex{\\,\begin,\colorbox,\CTEXoptions,\CurrentOptionn,\def}
-% \DoNotIndex{\definecolor,\else,\end,\fancyfoot,\fancyhf,\fi,\footnotesize}
-% \DoNotIndex{\footrulewidth,\headrulewidth,\heiti,\href,\hspace,\hypersetup}
-% \DoNotIndex{\ifrcls@color,\ifrcls@en,\ifrcls@zh,\LoadClass,\maketitle}
-% \DoNotIndex{\newcommand,\newif,\pagestyle,\parbox,\PassOptionsToClass}
-% \DoNotIndex{\ProcessOptions,\refname,\relax,\renewcommand,\RequirePackage}
-% \DoNotIndex{\textwidth,\today,\url,\zihao}
+% \DoNotIndex{\\,\begin,\bfseries,\bibliographystyle,\bibsep,\colorbox}
+% \DoNotIndex{\CurrentOption,\DeclareOption,\def,\definecolor,\else,\end}
+% \DoNotIndex{\fancyfoot,\fancyhf,\fi,\footnotesize,\footrulewidth}
+% \DoNotIndex{\headrulewidth,\heiti,\href,\hspace,\hypersetup,\ifrclscolor}
+% \DoNotIndex{\LoadClass,\maketitle,\newcommand,\newif,\pagestyle,\parbox}
+% \DoNotIndex{\PassOptionsToClass,\ProcessOptions,\rclsaddress,\rclscolorfalse}
+% \DoNotIndex{\rclscolortrue,\rclshomepage,\rclsleftfooter,\rclsmail}
+% \DoNotIndex{\rclsmobile,\rclsname,\rclsorganization,\rclsrightfooter}
+% \DoNotIndex{\rightfooter,\refname,\relax,\renewcommand,\RequirePackage}
+% \DoNotIndex{\setlength,\textwidth,\url,\zihao}
 % \DoNotIndex{}
 %
 % \def\resumecls{\textsf{resumecls}\ }
 %
 % \title{The \resumecls package\thanks{This document
-% corresponds to \resumecls~\fileversion,
+% corresponds to \resumecls\fileversion,
 % dated~\filedate.}}
 % \author{huxuan \\ \texttt{i@huxuan.org}}
 % \date{\filedate}
@@ -131,22 +134,22 @@
 % \maketitle
 %
 % \begin{abstract}
-% \resumecls is a latex cls to create a resume or cv more easily.
-% Especially it supports Chinese as well as English at the same time.
+% \resumecls is a \LaTeX cls making typeseting a resume or cv in both English
+% and Chinese more easily.
 % \end{abstract}
 %
 % \section{Introduction}
 %
-% There do exist many resume cls files already. But from my experience,
-% most of them are too complicated or lack of flexibility.
+% There do exist many resume cls already. But from my experience, most of them
+% are too complicated or lack of flexibility.
 %
 % \resumecls make all contents consists of heading/entry based on tabularx.
 % You can easily design the style and many recommended ones are also listed
 % in example files.
 %
-% What's more, \resumecls already has ctex package imported which make it
+% What's more, \resumecls already has ctex package imported which means it
 % support Chinese natively. The example-zh.tex and example-en.tex is almost
-% the same (in \LaTeX{} Code, not the content). You need no more work
+% the same (in \LaTeX{} code, not the content). You need no more work
 % to make your resume both in English and Chinese.
 %
 % \section{Usage}
@@ -175,10 +178,11 @@
 % \DescribeMacro{\homepage}
 % Your homepage.
 %
-% \DescribeMacro{\resumeurl}
-% The url for the resume.
-% It will locate at the right of footer.
-% If you don't want it, just leave it blank.
+% \DescribeMacro{\leftfooter}
+% The content you want to put at left footer. Feel free to leave it blank.
+%
+% \DescribeMacro{\rightrfooter}
+% The content you want to put at right footer. Feel free to leave it blank.
 %
 % \StopEventually{\PrintChanges\PrintIndex}
 %
@@ -186,12 +190,8 @@
 %
 % \subsection{Options}
 %    \begin{macrocode}
-\newif\ifrcls@zh\rcls@zhtrue
-\newif\ifrcls@en\rcls@enfalse
-\newif\ifrcls@color\rcls@colorfalse
-\DeclareOption{zh}{\rcls@zhtrue\rcls@enfalse}
-\DeclareOption{en}{\rcls@entrue\rcls@zhfalse}
-\DeclareOption{color}{\rcls@colortrue}
+\newif\ifrclscolor\rclscolorfalse
+\DeclareOption{color}{\rclscolortrue}
 %    \end{macrocode}
 %
 % \subsection{Import article class}
@@ -220,7 +220,7 @@
 %
 % \subsubsection{Color for hyperlink}
 %    \begin{macrocode}
-\ifrcls@color
+\ifrclscolor
     \hypersetup{colorlinks}
 \else
     \hypersetup{hidelinks}
@@ -239,50 +239,57 @@
 %
 % \begin{macro}{\name}
 %    \begin{macrocode}
-\def\rcls@name{}
-\newcommand\name[1]{\def\rcls@name{#1}}
+\def\rclsname{}
+\newcommand\name[1]{\def\rclsname{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\organization}
 %    \begin{macrocode}
-\def\rcls@organization{}
-\newcommand\organization[1]{\def\rcls@organization{#1}}
+\def\rclsorganization{}
+\newcommand\organization[1]{\def\rclsorganization{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\address}
 %    \begin{macrocode}
-\def\rcls@address{}
-\newcommand\address[1]{\def\rcls@address{#1}}
+\def\rclsaddress{}
+\newcommand\address[1]{\def\rclsaddress{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\mobile}
 %    \begin{macrocode}
-\def\rcls@mobile{}
-\newcommand\mobile[1]{\def\rcls@mobile{#1}}
+\def\rclsmobile{}
+\newcommand\mobile[1]{\def\rclsmobile{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\mail}
 %    \begin{macrocode}
-\def\rcls@mail{}
-\newcommand\mail[1]{\def\rcls@mail{#1}}
+\def\rclsmail{}
+\newcommand\mail[1]{\def\rclsmail{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\homepage}
 %    \begin{macrocode}
-\def\rcls@homepage{}
-\newcommand\homepage[1]{\def\rcls@homepage{#1}}
+\def\rclshomepage{}
+\newcommand\homepage[1]{\def\rclshomepage{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\resumeurl}
+% \begin{macro}{\leftfooter}
 %    \begin{macrocode}
-\def\rcls@resumeurl{}
-\newcommand\resumeurl[1]{\def\rcls@resumeurl{#1}}
+\def\rclsleftfooter{}
+\newcommand\leftfooter[1]{\def\rclsleftfooter{#1}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\rightfooter}
+%    \begin{macrocode}
+\def\rclsrightfooter{}
+\newcommand\rightfooter[1]{\def\rclsrightfooter{#1}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -290,9 +297,9 @@
 %
 % \begin{macro}{\heading}
 %    \begin{macrocode}
-\newcommand{\heading}[1]{
-    \colorbox{heading}{
-        \parbox{.96\textwidth}{
+\newcommand{\heading}[1]{%
+    \colorbox{heading}{%
+        \parbox{.98\textwidth}{%
             \bfseries\zihao{4}#1
         }
     } \\
@@ -302,7 +309,7 @@
 %
 % \begin{macro}{\entry}
 %    \begin{macrocode}
-\newcommand{\entry}[3]{
+\newcommand{\entry}[3]{%
     \begin{tabularx}{\textwidth}{@{\hspace{#1}}#2}
         #3
     \end{tabularx}
@@ -314,11 +321,11 @@
 %
 % \subsubsection{Redefine maketitle}
 %    \begin{macrocode}
-\renewcommand{\maketitle}{
-    \entry{0em}{Xr}{
-        \bfseries\zihao{4}\rcls@name  & \rcls@mobile \\
-        \rcls@organization            & \href{mailto:\rcls@mail}{\rcls@mail} \\
-        \rcls@address                 & \url{\rcls@homepage} \\
+\renewcommand{\maketitle}{%
+    \entry{0em}{Xr}{%
+        \bfseries\zihao{4}\rclsname  & \rclsmobile \\
+        \rclsorganization            & \href{mailto:\rclsmail}{\rclsmail} \\
+        \rclsaddress                 & \url{\rclshomepage} \\
     }
 }
 %    \end{macrocode}
@@ -329,14 +336,8 @@
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}
-\ifrcls@zh
-    \CTEXoptions[today=small]
-    \fancyfoot[L]{\footnotesize 最后更新：\today}
-\else
-    \CTEXoptions[today=old]
-    \fancyfoot[L]{\footnotesize Last Modified: \today}
-\fi
-\fancyfoot[R]{\footnotesize \url{\rcls@resumeurl}}
+\fancyfoot[L]{\footnotesize \rclsleftfooter}
+\fancyfoot[R]{\footnotesize \rclsrightfooter}
 %    \end{macrocode}
 %
 % \subsubsection{Empty refname}
@@ -371,7 +372,7 @@
 % for resume is enough. \resumecls use |\begin{table}| and |\end{table}| to
 % enclose all contents so that the whole resume will be limited in one page.
 % But if you really want to have multiple pages, you can set multiple table
-% environments in your tex fhile and judge the place for new page yourself.
+% environments in your tex file and judge the place for new page yourself.
 % the code within document environment for two pages resume will looks like:
 %
 % \iffalse
diff --git a/Master/texmf-dist/source/xelatex/resumecls/resumecls.ins b/Master/texmf-dist/source/xelatex/resumecls/resumecls.ins
index 272a8662946..a6ee21f0681 100644
--- a/Master/texmf-dist/source/xelatex/resumecls/resumecls.ins
+++ b/Master/texmf-dist/source/xelatex/resumecls/resumecls.ins
@@ -1,5 +1,5 @@
 %% resumecls.ins
-%% Copyright (C) 2012-2013 by huxuan <i@huxuan.org>
+%% Copyright (C) 2012-2015 by huxuan <i@huxuan.org>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -19,13 +19,13 @@
 \input docstrip.tex
 \keepsilent
 
-\usedir{xetex/latex/resumecls}
+\usedir{xetex/latex/\jobname}
 
 \preamble
 
 This is a generated file.
 
-Copyright (C) 2012-2013 by huxuan <i@huxuan.org>
+Copyright (C) 2012-2015 by huxuan <i@huxuan.org>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -51,9 +51,9 @@ and the derived file resumecls.cls.
 \Msg{* To finish the installation you have to move the}
 \Msg{* following file into a directory searched by TeX:}
 \Msg{*}
-\Msg{* \space\space resumecls.cls}
+\Msg{* \space\space \jobname.cls}
 \Msg{*}
-\Msg{* To produce the documentation run the file resumecls.dtx}
+\Msg{* To produce the documentation run the file \jobname.dtx}
 \Msg{* through XeLaTeX.}
 \Msg{*}
 \Msg{* Happy TeXing!}
diff --git a/Master/texmf-dist/tex/xelatex/resumecls/resumecls.cls b/Master/texmf-dist/tex/xelatex/resumecls/resumecls.cls
index 25f3b72a895..8cdada2693f 100644
--- a/Master/texmf-dist/tex/xelatex/resumecls/resumecls.cls
+++ b/Master/texmf-dist/tex/xelatex/resumecls/resumecls.cls
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2012-2013 by huxuan <i@huxuan.org>
+%% Copyright (C) 2012-2015 by huxuan <i@huxuan.org>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -28,13 +28,9 @@
 
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \ProvidesClass{resumecls}
-    [2013/03/17 v0.2.1 Celebrate for being included in CTAN]
-\newif\ifrcls@zh\rcls@zhtrue
-\newif\ifrcls@en\rcls@enfalse
-\newif\ifrcls@color\rcls@colorfalse
-\DeclareOption{zh}{\rcls@zhtrue\rcls@enfalse}
-\DeclareOption{en}{\rcls@entrue\rcls@zhfalse}
-\DeclareOption{color}{\rcls@colortrue}
+    [2015/06/17 v0.3 Long time no see, resumecls]
+\newif\ifrclscolor\rclscolorfalse
+\DeclareOption{color}{\rclscolortrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 \ProcessOptions\relax
 \LoadClass[a4paper,12pt]{article}
@@ -45,7 +41,7 @@
 \RequirePackage{color}
 \RequirePackage{fancyhdr}
 \definecolor{heading}{gray}{0.85}
-\ifrcls@color
+\ifrclscolor
     \hypersetup{colorlinks}
 \else
     \hypersetup{hidelinks}
@@ -53,51 +49,47 @@
 \RequirePackage[sort&compress]{natbib}
 \bibliographystyle{unsrt}
 \setlength{\bibsep}{0pt}
-\def\rcls@name{}
-\newcommand\name[1]{\def\rcls@name{#1}}
-\def\rcls@organization{}
-\newcommand\organization[1]{\def\rcls@organization{#1}}
-\def\rcls@address{}
-\newcommand\address[1]{\def\rcls@address{#1}}
-\def\rcls@mobile{}
-\newcommand\mobile[1]{\def\rcls@mobile{#1}}
-\def\rcls@mail{}
-\newcommand\mail[1]{\def\rcls@mail{#1}}
-\def\rcls@homepage{}
-\newcommand\homepage[1]{\def\rcls@homepage{#1}}
-\def\rcls@resumeurl{}
-\newcommand\resumeurl[1]{\def\rcls@resumeurl{#1}}
-\newcommand{\heading}[1]{
-    \colorbox{heading}{
-        \parbox{.96\textwidth}{
+\def\rclsname{}
+\newcommand\name[1]{\def\rclsname{#1}}
+\def\rclsorganization{}
+\newcommand\organization[1]{\def\rclsorganization{#1}}
+\def\rclsaddress{}
+\newcommand\address[1]{\def\rclsaddress{#1}}
+\def\rclsmobile{}
+\newcommand\mobile[1]{\def\rclsmobile{#1}}
+\def\rclsmail{}
+\newcommand\mail[1]{\def\rclsmail{#1}}
+\def\rclshomepage{}
+\newcommand\homepage[1]{\def\rclshomepage{#1}}
+\def\rclsleftfooter{}
+\newcommand\leftfooter[1]{\def\rclsleftfooter{#1}}
+\def\rclsrightfooter{}
+\newcommand\rightfooter[1]{\def\rclsrightfooter{#1}}
+\newcommand{\heading}[1]{%
+    \colorbox{heading}{%
+        \parbox{.98\textwidth}{%
             \bfseries\zihao{4}#1
         }
     } \\
 }
-\newcommand{\entry}[3]{
+\newcommand{\entry}[3]{%
     \begin{tabularx}{\textwidth}{@{\hspace{#1}}#2}
         #3
     \end{tabularx}
 }
-\renewcommand{\maketitle}{
-    \entry{0em}{Xr}{
-        \bfseries\zihao{4}\rcls@name  & \rcls@mobile \\
-        \rcls@organization            & \href{mailto:\rcls@mail}{\rcls@mail} \\
-        \rcls@address                 & \url{\rcls@homepage} \\
+\renewcommand{\maketitle}{%
+    \entry{0em}{Xr}{%
+        \bfseries\zihao{4}\rclsname  & \rclsmobile \\
+        \rclsorganization            & \href{mailto:\rclsmail}{\rclsmail} \\
+        \rclsaddress                 & \url{\rclshomepage} \\
     }
 }
 \pagestyle{fancy}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}
-\ifrcls@zh
-    \CTEXoptions[today=small]
-    \fancyfoot[L]{\footnotesize 最后更新：\today}
-\else
-    \CTEXoptions[today=old]
-    \fancyfoot[L]{\footnotesize Last Modified: \today}
-\fi
-\fancyfoot[R]{\footnotesize \url{\rcls@resumeurl}}
+\fancyfoot[L]{\footnotesize \rclsleftfooter}
+\fancyfoot[R]{\footnotesize \rclsrightfooter}
 \renewcommand{\refname}{}
 \endinput
 %%