resumecls (17mar13)

git-svn-id: svn://tug.org/texlive/trunk@29417 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 174 insertions, 173 deletions

diff --git a/Master/texmf-dist/doc/xelatex/resumecls/Makefile b/Master/texmf-dist/doc/xelatex/resumecls/Makefile
index 7dc22dcbc7e..ebb0955055e 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/Makefile
+++ b/Master/texmf-dist/doc/xelatex/resumecls/Makefile
@@ -3,25 +3,18 @@
 # | Author: huxuan
 # | E-mail: i(at)huxuan.org
 # | Created: 2012-12-18
-# | Last modified: 2012-12-19
+# | Last modified: 2013-03-17
 # | Description:
 # |     Makefile for resumecls
 # |
-# | Copyrgiht (c) 2012 by huxuan. All rights reserved.
-# | License GPLv3
+# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
 # +-----------------------------------------------------------------------------
 
-include config.mk
-EXAMPLE=example
-EXAMPLEZH=example-zh
-EXAMPLEEN=example-en
-
 PACKAGE=resumecls
 
-.PHONY: all cls doc example example-zh example-en resume resume-zh resume-en
-.PHONY: clean distclean
+.PHONY: all cls doc clean distclean
 
-all: doc example-zh example-en
+all: doc
 
 # cls
 
@@ -41,63 +34,7 @@ $(PACKAGE).pdf: $(PACKAGE).cls
 	xelatex $(PACKAGE).dtx
 	xelatex $(PACKAGE).dtx
 
-# example
-
-example: example-zh example-en
-
-# example-zh
-
-example-zh: $(EXAMPLEZH).pdf
-
-$(EXAMPLEZH).pdf: $(PACKAGE).cls $(EXAMPLEZH).tex $(EXAMPLEZH).bbl
-	xelatex $(EXAMPLEZH).tex
-	xelatex $(EXAMPLEZH).tex
-
-$(EXAMPLEZH).bbl:
-	xelatex $(EXAMPLEZH).tex
-	-bibtex $(EXAMPLEZH)
-
-# example-en
-
-example-en: $(EXAMPLEEN).pdf
-
-$(EXAMPLEEN).pdf: $(PACKAGE).cls $(EXAMPLEEN).tex $(EXAMPLEEN).bbl
-	xelatex $(EXAMPLEEN).tex
-	xelatex $(EXAMPLEEN).tex
-
-$(EXAMPLEEN).bbl:
-	xelatex $(EXAMPLEEN).tex
-	-bibtex $(EXAMPLEEN)
-
-# resume
-
-resume: resume-zh resume-en
-
-# resume-zh
-
-resume-zh: $(RESUMEZH).pdf
-
-$(RESUMEZH).pdf: $(PACKAGE).cls $(RESUMEZH).tex $(RESUMEZH).bbl
-	xelatex $(RESUMEZH).tex
-	xelatex $(RESUMEZH).tex
-
-$(RESUMEZH).bbl:
-	xelatex $(RESUMEZH).tex
-	-bibtex $(RESUMEZH)
-
-# resume-en
-
-resume-en: $(RESUMEEN).pdf
-
-$(RESUMEEN).pdf: $(PACKAGE).cls $(RESUMEEN).tex $(RESUMEEN).bbl
-	xelatex $(RESUMEEN).tex
-	xelatex $(RESUMEEN).tex
-
-$(RESUMEEN).bbl:
-	xelatex $(RESUMEEN).tex
-	-bibtex $(RESUMEEN)
-
-# dist & clean
+# clean & distclean
 
 clean:
 	-@rm -f \
@@ -116,5 +53,4 @@ clean:
 
 distclean: clean
 	-@rm -f \
-		*.cls \
-		*.pdf
+		*.cls
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/README b/Master/texmf-dist/doc/xelatex/resumecls/README
index 5194a040fde..1a38bc3d83a 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/README
+++ b/Master/texmf-dist/doc/xelatex/resumecls/README
@@ -1,28 +1,18 @@
-# resumecls
+# resumecls / [CTAN mirror](http://www.ctan.org/pkg/resumecls)
 
-A LaTeX cls for resume, simply, support English and Chinese natively.
+A LaTeX cls to typeset resume both in English and Chinese
 
-## Workflow
+# Usage / How to get it
 
-```shell
-git clone https://github.com/huxuan/resumecls.git
-cd resumecls
-# Copy sample/example files
-cp config-sample.mk config.mk
-cp example-zh.tex resume-zh.tex
-cp example-en.tex resume-en.tex
-cp example.bib resume.bib
-# Edit resume-zh.tex resume-en.tex and resume.bib
-# Compile via the way (Makefile or LaTeX) listed in the following section
-```
-## Compile
+- [`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.
+
+## Mnaual Compile
+
+To get the cls file and document manually, you can make it either by Makefile or LaTeX command
 
-### Compile via Makefile (Recommended if your os support)
-First you need `cp config-sample.mk config.mk` to make Makefile script work.
-You can change the variable in `config.mk` corresponding to the your file name.
-Default and recommended value is `RESUME=resume`, `RESUMEZH=resume-zh`,
-`RESUMEEN=resume-en` which means you need to name your files as
-`resume-zh.tex`, `resume-en.tex` and `resume.bib` to make `make` work.
+### Compile by Makefile (Recommended if your os supported)
 
 #### Get resumecls.cls
 ```shell
@@ -34,25 +24,6 @@ make cls
 make doc
 ```
 
-#### Get example-zh.pdf & example-en.pdf
-```shell
-make example # Get both below
-make example-zh
-make example-en
-```
-
-#### Get all files above
-```shell
-make all
-```
-
-#### Get resume-zh.pdf & resume-en.pdf
-```shell
-make resume # Get both below
-make resume-zh
-make resume-en
-```
-
 #### Clean
 Clean all generated files except for cls and pdf
 ```shell
@@ -65,7 +36,7 @@ Clean all generated files
 make distclean
 ```
 
-### Compile by raw LaTeX command
+### Compile by LaTeX command
 
 #### Get resumecls.cls
 ```shell
@@ -80,37 +51,3 @@ makeindex -s gglo.ist -o resumecls.gls resumecls.glo
 xelatex resumecls.dtx
 xelatex resumecls.dtx
 ```
-
-#### Get example-zh.pdf & example-en.pdf
-First, you need to get the cls file as described above.
-Then you also need to replace `example` in code snippet
-to `example-en` or `example-zh` as you want.
-
-- if has bib
-```shell
-xelatex example.tex
-bibtex example
-```
-
-- And then or if has no bib
-```shell
-xelatex example.tex
-xelatex example.tex
-```
-
-#### Get resume-zh.pdf & resume-en.pdf
-First, you need to get the cls file as described above.
-Then you also need to replace `resume` in code snippet
-corresponding to your own tex file.
-
-- if has bib
-```shell
-xelatex resume.tex
-bibtex resume
-```
-
-- And then or if has no bib
-```shell
-xelatex resume.tex
-xelatex resume.tex
-```
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile b/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile
new file mode 100644
index 00000000000..110a0491b77
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/Makefile
@@ -0,0 +1,58 @@
+# +-----------------------------------------------------------------------------
+# | File: Makefile
+# | Author: huxuan
+# | E-mail: i(at)huxuan.org
+# | Created: 2012-12-18
+# | Last modified: 2013-03-16
+# | Description:
+# |     Makefile for resumecls examples
+# |
+# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
+# +-----------------------------------------------------------------------------
+
+include config.mk
+
+.PHONY: resume resume-zh resume-en clean depclean
+
+# resume
+
+resume: resume-zh resume-en
+
+# resume-zh
+
+resume-zh: $(RESUMEZH).pdf
+
+$(RESUMEZH).pdf: $(RESUMEZH).tex $(RESUMEZH).bbl
+	xelatex $(RESUMEZH).tex
+	xelatex $(RESUMEZH).tex
+
+$(RESUMEZH).bbl:
+	xelatex $(RESUMEZH).tex
+	-bibtex $(RESUMEZH)
+
+# resume-en
+
+resume-en: $(RESUMEEN).pdf
+
+$(RESUMEEN).pdf: $(RESUMEEN).tex $(RESUMEEN).bbl
+	xelatex $(RESUMEEN).tex
+	xelatex $(RESUMEEN).tex
+
+$(RESUMEEN).bbl:
+	xelatex $(RESUMEEN).tex
+	-bibtex $(RESUMEEN)
+
+# clean & depclean
+
+clean:
+	-@rm -f \
+		*~ \
+		*.aux \
+		*.bbl \
+		*.blg \
+		*.log \
+		*.out
+
+depclean: clean
+	-@rm -f \
+		*.pdf
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/README.md b/Master/texmf-dist/doc/xelatex/resumecls/example/README.md
new file mode 100644
index 00000000000..d5ce36f77d1
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/README.md
@@ -0,0 +1,42 @@
+# resumecls-example
+
+Examples to typeset resume in both Chinese and English by using 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)
+
+## 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)
+```
+
+## Compile
+
+### Makefile
+
+```shell
+make resume # get both resume-en.pdf & resume-zh.pdf
+make resume-en # get resume-en.pdf
+make resume-zh # get resume-zh.pdf
+```
+
+### LaTeX
+
+```shell
+xelatex <resume>.tex
+bibtex  <resume>
+xelatex <resume>.tex
+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
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/config-sample.mk b/Master/texmf-dist/doc/xelatex/resumecls/example/config-sample.mk
index cca0fec636b..4bb2fe3844b 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/config-sample.mk
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/config-sample.mk
@@ -3,12 +3,11 @@
 # | Author: huxuan
 # | E-mail: i(at)huxuan.org
 # | Created: 2012-12-18
-# | Last modified: 2012-12-18
+# | Last modified: 2013-03-16
 # | Description:
 # |     Configuration for Makefile
 # |
-# | Copyrgiht (c) 2012 by huxuan. All rights reserved.
-# | License GPLv3
+# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
 # +-----------------------------------------------------------------------------
 
 RESUME=resume
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example/config.mk b/Master/texmf-dist/doc/xelatex/resumecls/example/config.mk
new file mode 100644
index 00000000000..af50ff6504b
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/config.mk
@@ -0,0 +1,15 @@
+# +-----------------------------------------------------------------------------
+# | 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-en.pdf b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.pdf
new file mode 100644
index 00000000000..c4bc9a473c6
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.pdf
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example-en.tex b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.tex
index 0cf38daa4bf..7cf84171879 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example-en.tex
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-en.tex
@@ -1,15 +1,14 @@
 % !Mode:: "TeX:UTF-8"
 % +-----------------------------------------------------------------------------
-% | File: example-zh
+% | File: resume-en
 % | Author: huxuan
 % | E-mail: i(at)huxuan.org
-% | Created: 2012/12/18
-% | Last modified: 2012/12/19
+% | Created: 2012-12-18
+% | Last modified: 2013-03-16
 % | Description:
 % |     A English Resume Example in LaTeX based on resumecls
 % |
-% | Copyrgiht (c) 2012 by huxuan. All rights reserved.
-% | License GPLv3
+% | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
 % +-----------------------------------------------------------------------------
 
 \documentclass[en,color]{resumecls}
@@ -66,6 +65,7 @@
     Experience 2 & Time Period \\
 }
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{Awards}
 \entry{2em}{Xr}{
     Award 1 & Time \\
@@ -89,8 +89,11 @@
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% If there is no publications, just comment this part.
 \heading{Appendix: Publications}
 \vspace{-6em}
-\bibliography{example}
+\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
new file mode 100644
index 00000000000..5021100af5f
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.pdf
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example-zh.tex b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.tex
index ff2586c286f..f63d5320407 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example-zh.tex
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume-zh.tex
@@ -1,15 +1,14 @@
 % !Mode:: "TeX:UTF-8"
 % +-----------------------------------------------------------------------------
-% | File: example-zh
+% | File: resume-zh
 % | Author: huxuan
 % | E-mail: i(at)huxuan.org
-% | Created: 2012/12/18
-% | Last modified: 2012/12/19
+% | Created: 2012-12-18
+% | Last modified: 2013-03-16
 % | Description:
 % |     A Chinese Resume Example in LaTeX based on resumecls
 % |
-% | Copyrgiht (c) 2012 by huxuan. All rights reserved.
-% | License GPLv3
+% | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
 % +-----------------------------------------------------------------------------
 
 \documentclass[zh,color]{resumecls}
@@ -66,6 +65,7 @@
     经历2 & 起止时间 \\
 }
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \heading{获得荣誉}
 \entry{2em}{Xr}{
     荣誉1 & 颁发时间 \\
@@ -89,8 +89,11 @@
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% 如果不需要发表成果，注释这一段即可
 \heading{附：发表成果}
 \vspace{-6em}
-\bibliography{example}
+\bibliography{resume}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \end{table}
 \end{document}
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/example.bib b/Master/texmf-dist/doc/xelatex/resumecls/example/resume.bib
index 4cce48feef7..4cce48feef7 100644
--- a/Master/texmf-dist/doc/xelatex/resumecls/example.bib
+++ b/Master/texmf-dist/doc/xelatex/resumecls/example/resume.bib
diff --git a/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf b/Master/texmf-dist/doc/xelatex/resumecls/resumecls.pdf
index 98ebcee50a8..5452bedcacf 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 a0853403803..a911d14d9b0 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 2012-2013 by huxuan <i@huxuan.org>
+% Copyright (C) 2012-2013 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
@@ -21,13 +21,19 @@
 % \fi
 
 % \iffalse
-%<cls>\NeedsTeXFormat{LaTeX2e}[2011/06/27]
-%<cls>\ProvidesClass{resumecls}
-%<cls>[2013/03/07 v0.2 First try to upload to CTAN]
+%<*driver>
+\ProvidesFile{\jobname.dtx}
+%</driver>
+%<class>\NeedsTeXFormat{LaTeX2e}[2011/06/27]
+%<class>\ProvidesClass{resumecls}
+%<*class>
+    [2013/03/17 v0.2.1 Celebrate for being included in CTAN]
+%</class>
 %
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage[adobefonts]{ctex}
+\CTEXoptions[today=old]
 
 \usepackage{color}
 \definecolor{dkgreen}{rgb}{0,0.6,0}
@@ -101,6 +107,7 @@
 % \changes{v0.1.3}{2012/12/19}{Add reference settings}
 % \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}
 %
 % \GetFileInfo{\jobname.dtx}
 %
@@ -119,6 +126,7 @@
 % corresponds to \resumecls~\fileversion,
 % dated~\filedate.}}
 % \author{huxuan \\ \texttt{i@huxuan.org}}
+% \date{\filedate}
 %
 % \maketitle
 %
diff --git a/Master/texmf-dist/source/xelatex/resumecls/resumecls.ins b/Master/texmf-dist/source/xelatex/resumecls/resumecls.ins
index 3cdb7c61e10..272a8662946 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 2012-2013 by huxuan <i@huxuan.org>
+%% Copyright (C) 2012-2013 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{tex/latex/resumecls}
+\usedir{xetex/latex/resumecls}
 
 \preamble
 
 This is a generated file.
 
-Copyright 2012-2013 by huxuan <i@huxuan.org>
+Copyright (C) 2012-2013 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
@@ -44,7 +44,7 @@ and the derived file resumecls.cls.
 
 \endpreamble
 
-\generate{\file{\jobname.cls}{\from{\jobname.dtx}{cls}}}
+\generate{\file{\jobname.cls}{\from{\jobname.dtx}{class}}}
 
 \Msg{*********************************************************}
 \Msg{*}
@@ -53,8 +53,8 @@ and the derived file resumecls.cls.
 \Msg{*}
 \Msg{* \space\space resumecls.cls}
 \Msg{*}
-\Msg{* To produce the documentation run the file resumecls.cls}
-\Msg{* through LaTeX.}
+\Msg{* To produce the documentation run the file resumecls.dtx}
+\Msg{* through XeLaTeX.}
 \Msg{*}
 \Msg{* Happy TeXing!}
 \Msg{*********************************************************}
diff --git a/Master/texmf-dist/tex/xelatex/resumecls/resumecls.cls b/Master/texmf-dist/tex/xelatex/resumecls/resumecls.cls
index fad376f8234..25f3b72a895 100644
--- a/Master/texmf-dist/tex/xelatex/resumecls/resumecls.cls
+++ b/Master/texmf-dist/tex/xelatex/resumecls/resumecls.cls
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% resumecls.dtx  (with options: `cls')
+%% resumecls.dtx  (with options: `class')
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 2012-2013 by huxuan <i@huxuan.org>
+%% Copyright (C) 2012-2013 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,7 +28,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \ProvidesClass{resumecls}
-[2013/03/07 v0.2 First try to upload to CTAN]
+    [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