12 files changed, 116 insertions, 201 deletions
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/Makefile b/Master/texmf-dist/doc/xelatex/resumecls/Makefile
deleted file mode 100644
index ebb0955055e..00000000000
--- a/Master/texmf-dist/doc/xelatex/resumecls/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# +-----------------------------------------------------------------------------
-# | File: Makefile
-# | Author: huxuan
-# | E-mail: i(at)huxuan.org
-# | Created: 2012-12-18
-# | Last modified: 2013-03-17
-# | Description:
-# |     Makefile for resumecls
-# |
-# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
-# +-----------------------------------------------------------------------------
-
-PACKAGE=resumecls
-
-.PHONY: all cls doc clean distclean
-
-all: doc
-
-# cls
-
-cls: $(PACKAGE).cls
-
-$(PACKAGE).cls: $(PACKAGE).ins $(PACKAGE).dtx
-	latex $(PACKAGE).ins
-
-# doc
-
-doc: $(PACKAGE).pdf
-
-$(PACKAGE).pdf: $(PACKAGE).cls
-	xelatex $(PACKAGE).dtx
-	makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
-	makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
-	xelatex $(PACKAGE).dtx
-	xelatex $(PACKAGE).dtx
-
-# clean & distclean
-
-clean:
-	-@rm -f \
-		*~ \
-		*.aux \
-		*.bbl \
-		*.blg \
-		*.dvi \
-		*.glo \
-		*.gls \
-		*.idx \
-		*.ilg \
-		*.ind \
-		*.log \
-		*.out
-
-distclean: clean
-	-@rm -f \
-		*.cls
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/README.md b/Master/texmf-dist/doc/xelatex/resumecls/README.md
index f9f39c8da4e..16be555bfb5 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/README.md
+++ b/Master/texmf-dist/doc/xelatex/resumecls/README.md
@@ -1,18 +1,27 @@
-# resumecls / [CTAN mirror](http://www.ctan.org/pkg/resumecls)
+# resumecls
 
-A LaTeX cls to typeset resume both in English and Chinese
+A LaTeX document class to typeset a resume or cv both in English and Chinese with more ease and flexibility.
 
-# Usage / How to get it
+## Installation
 
-- [`resumecls`](http://www.ctan.org/pkg/resumecls) has already been included in [CTAN](http://www.ctan.org/) Mirror.
-- 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.
+Since [`resumecls`](http://www.ctan.org/pkg/resumecls) is included in the CTAN.
+You can install it by any package managers.
 
-## Manual Compile
+Take `tlgmr` as example,
 
-To get the cls file and document manually, you can make it either by Makefile or LaTeX command
+```shell
+tlmgr install resumecls
+```
+
+## Usage / Examples
+
+please refer to [`resumecls-example`](https://github.com/huxuan/resumecls-example).
+
+## Compile manually
+
+To get the document class file and document manually, you can compile via Makefile or LaTeX commands.
 
-### Compile by Makefile (Recommended if your os supported)
+### Compile by Makefile
 
 #### Get resumecls.cls
 ```shell
@@ -24,19 +33,17 @@ make cls
 make doc
 ```
 
-#### Clean
-Clean all generated files except for cls and pdf
+#### Clean intermediate generated files
 ```shell
 make clean
 ```
 
-#### DistClean
-Clean all generated files
+#### Clean for distribution
 ```shell
 make distclean
 ```
 
-### Compile by LaTeX command
+### Compile by LaTeX commands
 
 #### Get resumecls.cls
 ```shell
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile b/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile
index d64ce858012..01be9090da4 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile
@@ -3,17 +3,19 @@
 # | Author: huxuan
 # | E-mail: i(at)huxuan.org
 # | Created: 2012-12-18
-# | Last modified: 2013-03-16
+# | Last modified: 2020-04-16
 # | Description:
 # |     Makefile for resumecls examples
 # |
-# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
+# | Copyrgiht (c) 2012-2020 by huxuan. All rights reserved.
 # +-----------------------------------------------------------------------------
 
-include config.mk
-
 .PHONY: resume resume-zh resume-en clean depclean
 
+RESUME=resume
+RESUMEZH=resume-zh
+RESUMEEN=resume-en
+
 # resume
 
 resume: resume-zh resume-en
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/README.md b/Master/texmf-dist/doc/xelatex/resumecls/example/README.md
index d5ce36f77d1..07c17e5b173 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/README.md
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/README.md
@@ -1,19 +1,18 @@
 # resumecls-example
 
-Examples to typeset resume in both Chinese and English by using resumecls
+Examples to typeset resume both in Chinese and English with resumecls.
 
 ## Preview
 
-- [resume-en.pdf](https://github.com/huxuan/resumecls-example/blob/master/resume-en.pdf?raw=true)
-- [resume-zh.pdf](https://github.com/huxuan/resumecls-example/blob/master/resume-zh.pdf?raw=true)
+An online version for preview is available on [overleaf](https://www.overleaf.com/read/yrtmzwhtzwtz).
 
 ## Workflow
 
 ```shell
 git clone git://github.com/huxuan/resumecls-example.git
 cd resumecls-example
-# Modify resume-en.tex resume-en.tex resume.bib (bib is optional)
-# Compile via Makefile or LaTeX command (More info below)
+# Modify resume-en.tex resume-en.tex resume.bib (bib is optional).
+# Compile via Makefile or LaTeX command (More info below).
 ```
 
 ## Compile
@@ -37,6 +36,6 @@ xelatex <resume>.tex
 
 Notes:
 
-- To get English version, replace <resume> with 'resume-en'
-- To get Chinese version, replace <resume> with 'resume-zh'
-- If no bib info is needed, the first two steps can be passed
+- To get the English version, replace `<resume>` with 'resume-en'.
+- To get the Chinese version, replace `<resume>` with 'resume-zh'.
+- If no bib info is needed, the first two steps can be skipped.
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/config-sample.mk b/Master/texmf-dist/doc/xelatex/resumecls/example/config-sample.mk
deleted file mode 100644
index 4bb2fe3844b..00000000000
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/config-sample.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# +-----------------------------------------------------------------------------
-# | File: config
-# | Author: huxuan
-# | E-mail: i(at)huxuan.org
-# | Created: 2012-12-18
-# | Last modified: 2013-03-16
-# | Description:
-# |     Configuration for Makefile
-# |
-# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
-# +-----------------------------------------------------------------------------
-
-RESUME=resume
-RESUMEZH=resume-zh
-RESUMEEN=resume-en
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/config.mk b/Master/texmf-dist/doc/xelatex/resumecls/example/config.mk
deleted file mode 100644
index af50ff6504b..00000000000
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# +-----------------------------------------------------------------------------
-# | File: config
-# | Author: huxuan
-# | E-mail: i(at)huxuan.org
-# | Created: 2012-12-18
-# | Last modified: 2013-03-11
-# | Description:
-# |     Configuration for Makefile
-# |
-# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
-# +-----------------------------------------------------------------------------
-
-RESUME=resume
-RESUMEZH=resume-zh
-RESUMEEN=resume-en
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-common.tex b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-common.tex
new file mode 100644
index 00000000000..1d4e2a2e643
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-common.tex
@@ -0,0 +1,15 @@
+% !Mode:: "TeX:UTF-8"
+% +-----------------------------------------------------------------------------
+% | File: resume-common.tex
+% | Author: huxuan
+% | E-mail: i(at)huxuan.org
+% | Created: 2020-04-16
+% | Last modified: 2020-04-16
+% | Description:
+% |     Common information to typeset resume with resumecls
+% |
+% | Copyright (c) 2020-2020 by huxuan. All rights reserved.
+% +-----------------------------------------------------------------------------
+\mobile{+XX XXX XXXX XXXX}
+\mail{i@example.com}
+\homepage{http://example.com}
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 fd5db322b88..6df6d32a8a9 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 c19d9fde294..899fa8cb0cd 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.tex
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.tex
@@ -4,99 +4,88 @@
 % | Author: huxuan
 % | E-mail: i(at)huxuan.org
 % | Created: 2012-12-18
-% | Last modified: 2013-03-16
+% | Last modified: 2020-04-16
 % | Description:
 % |     A English Resume Example in LaTeX based on resumecls
 % |
-% | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
+% | Copyright (c) 2012-2020 by huxuan. All rights reserved.
 % +-----------------------------------------------------------------------------
 
 \documentclass[color]{resumecls}
 
-\ctexset{today=old}
+\include{resume-common}
 
 \name{Name}
-\organization{unit, school or organization}
-\address{address, zip code}
-\mobile{+1 XXX XXXX XXXX}
-\mail{i@example.com}
-\homepage{http://example.com}
+\organization{School or Organization}
+\address{Address, Zip Code}
 \leftfooter{Last Modified: \today}
 \rightfooter{\url{http://example.com/resume-en.pdf}}
 
-\begin{document}
+\ctexset{today=old}
 
+\begin{document}
 \begin{table}
-
 \maketitle
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\heading{Education}
-\entry{2em}{Xrp{8em}}{%
-    \heiti{School} & City & Time Period \\
+\heading{Experience (Compacted version)}
+\entry{0em}{Xlr}{{\bfseries Organization} \quad Department & Position & Time Period}
+\entry{2em}{X}{%
+    Description1 \\
+    Description2 \\
 }
-\entry{4em}{lXX}{%
-    Degree & College of XXX & Major in XX \\
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\heading{Education}
+\entry{0em}{Xrr}{{\bfseries School} & City & Time Period}
+\entry{2em}{lXX}{%
+    Degree1 & College1 & Major1 \\
+    Degree2 & College2 & Major2 \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Research Experience}
-\entry{2em}{Xp{8em}}{%
-    \heiti{Insitute} & Time Period \\
+\entry{0em}{Xr}{{\bfseries Insitute} & Time Period}
+\entry{2em}{X}{Lab \quad Position}
+\entry{4em}{X}{%
+    Description \\
+    bibtex can be used here, like \cite{label} \\
 }
-\entry{4em}{X}{Lab \quad Position}
-\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}}{%
-    \heiti{Unit} & Time Period \\
-}
-\entry{4em}{X}{Department \quad Position}
-\entry{6em}{X}{%
-    Specific Issues Responsible for \\
-    Specific Content of Your Work \\
+\entry{0em}{Xr}{{\bfseries Organization} & Time Period}
+\entry{2em}{X}{Department \quad Position}
+\entry{4em}{X}{%
+    Description \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{School Experience}
-\entry{2em}{Xp{8em}}{%
-    Experience 1 & Time Period \\
-    Experience 2 & Time Period \\
+\entry{0em}{Xr}{%
+    Experience1 & Time Period \\
+    Experience2 & Time Period \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Awards}
-\entry{2em}{Xr}{%
-    Award 1 & Time \\
-    Award 2 & Time \\
+\entry{0em}{Xr}{%
+    Award1 & Time \\
+    Award2 & Time \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Professional Skill}
-\entry{2em}{lX}{%
+\entry{0em}{lX}{%
     Proficient in  & XXX \\
     Experienced in & XXX \\
     Familiar with  & XXX \\
     Use            & XXX \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Other listings, such as hobby, network profile and so on}
-\entry{2em}{lX}{%
-    Label 1 & Content 1 \\
-    Label 2 & Content 2 \\
+\entry{0em}{lX}{%
+    Label1 & Content1 \\
+    Label2 & Content2 \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % If there is no publications, just comment this part.
 \heading{Appendix: Publications}
 \vspace{-6em}
 \bibliography{resume}
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \end{table}
 \end{document}
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 e8f45501cd1..d492d9efaa1 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 533ac7d125a..b778648bc31 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.tex
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.tex
@@ -1,102 +1,91 @@
 % !Mode:: "TeX:UTF-8"
 % +-----------------------------------------------------------------------------
-% | File: resume-zh
+% | File: resume-zh.tex
 % | Author: huxuan
 % | E-mail: i(at)huxuan.org
 % | Created: 2012-12-18
-% | Last modified: 2013-03-16
+% | Last modified: 2020-04-16
 % | Description:
 % |     A Chinese Resume Example in LaTeX based on resumecls
 % |
-% | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
+% | Copyright (c) 2012-2020 by huxuan. All rights reserved.
 % +-----------------------------------------------------------------------------
 
 \documentclass[color]{resumecls}
 
-\ctexset{today=small}
+\include{resume-common}
 
 \name{姓名}
 \organization{单位、学校或组织}
 \address{地址，邮编}
-\mobile{+86 XXX XXXX XXXX}
-\mail{i@example.com}
-\homepage{http://example.com}
 \leftfooter{最后更新: \today}
 \rightfooter{\url{http://example.com/resume-zh.pdf}}
 
-\begin{document}
+\ctexset{today=small}
 
+\begin{document}
 \begin{table}
-
 \maketitle
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\heading{教育经历}
-\entry{2em}{Xrp{8em}}{%
-    \heiti{学校} & 城市 & 起止时间 \\
+\heading{经历(紧凑版)}
+\entry{0em}{Xlr}{{\bfseries 组织} \quad 部门 & 职位 & 起止时间}
+\entry{2em}{X}{%
+    描述1 \\
+    描述2 \\
 }
-\entry{4em}{lXX}{%
-    学位 & XX学院 & XX专业 \\
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\heading{教育经历}
+\entry{0em}{Xrr}{{\bfseries 学校} & 城市 & 起止时间}
+\entry{2em}{lXX}{%
+    学位1 & 学院1 & 专业1 \\
+    学位2 & 学院2 & 专业2 \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{科研经历}
-\entry{2em}{Xp{8em}}{%
-    \heiti{地点} & 起止时间 \\
+\entry{0em}{Xr}{{\bfseries 地点} & 起止时间}
+\entry{2em}{X}{实验室 \quad 职位}
+\entry{4em}{X}{%
+    描述 \\
+    这里可以使用bibtex，如\cite{label} \\
 }
-\entry{4em}{X}{实验室名称 \quad 职位}
-\entry{6em}{X}{%
-    研究方向和具体内容 \\
-    发表成果（亦可使用bibtex，像这样\cite{label}，见文档最后注释内容） \\
-}
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{工作经历}
-\entry{2em}{Xp{8em}}{%
-    \heiti{单位名称} & 起止时间 \\
-}
-\entry{4em}{X}{部门 \quad 职位}
-\entry{6em}{X}{%
-    负责的具体事项 \\
-    工作的具体内容 \\
+\entry{0em}{Xr}{{\bfseries 组织} & 起止时间}
+\entry{2em}{X}{部门 \quad 职位}
+\entry{4em}{X}{%
+    描述 \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{校园经历}
-\entry{2em}{Xp{8em}}{%
+\entry{0em}{Xr}{%
     经历1 & 起止时间 \\
     经历2 & 起止时间 \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{获得荣誉}
-\entry{2em}{Xr}{%
+\entry{0em}{Xr}{%
     荣誉1 & 颁发时间 \\
     荣誉2 & 颁发时间 \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{专业技能}
-\entry{2em}{lX}{%
+\entry{0em}{lX}{%
     精通 & XXX \\
     熟悉 & XXX \\
     掌握 & XXX \\
     使用 & XXX \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{其他列举事项-如个人爱好，网络资料等}
-\entry{2em}{lX}{%
+\entry{0em}{lX}{%
     标签1 & 标签对应内容 \\
     标签2 & 标签对应内容 \\
 }
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % 如果不需要发表成果，注释这一段即可
 \heading{附：发表成果}
 \vspace{-6em}
 \bibliography{resume}
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \end{table}
 \end{document}
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf b/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf
index f02898d6c7c..6d9adc5753d 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf
+++ b/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf