Merge pull request #24 from nanmu42/Before-Release

预发行版可以更新至v1.14

README-English.md

@@ -1,36 +1,36 @@
 # About CQUThesis
+[![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://www.ctan.org/pkg/cquthesis)
+[![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=Github)](https://github.com/nanmu42/CQUThesis/releases/latest)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.14.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+
 CQUThesis stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
 
-# Installing
-* To create the package file, run:
-```
-	latex cquthesis.ins
-```
-* To finish the installation you have to move the following files into a directory searched by TeX:(The recommended directory is TEXMF/tex/latex/cquthesis)
+![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png)
 
-   cquthesis.cls
-   cquthesis.cfg
-   cqunumerical.bst
+# Deployment
+## Download
+Version	|	Link	|	Description
+---	|	---		|	---
+Dev.	|[Click Here](https://github.com/nanmu42/cquthesis/zipball/master)	|	Recommend with new features and bug fixes
+Pre-release | [Github Link](https://github.com/nanmu42/CQUThesis/releases) | Accumulation of commits from Dev.
+Release	|[CTAN Page](https://www.ctan.org/pkg/cquthesis)|	Scheduled updates for CTAN, MikTeX and TeX Live
 
-* To produce the documentation please run these command:
+## Installation
+Unzip all files to a new folder as your future work folder:
+* Windows users may easily double-click on `makewin.bat`;
+* Linux or Mac users may start the terminal:
 ```
-  xelatex cquthesis.dtx
-  makeindex -s gind.ist -o cquthesis.ind cquthesis.idx
-  makeindex -s gglo.ist -o cquthesis.gls cquthesis.glo
-  xelatex cquthesis.dtx
-  xelatex cquthesis.dtx
+cd path/to/cquthesis
+make thesis
 ```
+If everything goes smoothly, CQUThesis is ready for work, with typeseting example named `main.pdf` in your work folder.
 
-* Run these command will get you a typeseting example:
-```
-  xelatex main.tex
-  bibtex main.tex
-  xelatex main.tex
-  xelatex main.tex
-```
-* For further info, please go to: https://github.com/nanmu42/CQUThesis
+# Question, Contribution and Contact
+Feel free to raise any question, and any possible contribution is highly appreciated.
+* [Github Issues](https://github.com/nanmu42/CQUThesis/issues);
+* Join [CQU TeX QQ Group](http://jq.qq.com/?_wv=1027&k=2HvYu95)
 
-Happy TeXing!
+Writing in English or Chinese is needed.
 
 # Acknowledgements
 The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind:
@@ -39,11 +39,6 @@ The author would like to acknowledge these contributors for their efforts and, e
 * [XUE, Ruini](https://github.com/xueruini/thuthesis)
 * [USTC TeX User Group](https://github.com/ustctug/gbt-7714-2015)
 
-# Question, Contribution and Contact
-Feel free to raise any question, and any possible contribution is highly appreciated.
-Submit a issue at [Github](https://github.com/nanmu42/CQUThesis).
-Write in English or Chinese is needed. Thank you.
-
 # About the Author
 Zhennan Li (i at nanmu dot me) proudly presents this work for you.
 

README.md

@@ -1,7 +1,7 @@
 # 嗨，这里是CQUThesis！
 [![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://www.ctan.org/pkg/cquthesis)
 [![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=Github)](https://github.com/nanmu42/CQUThesis/releases/latest)
-[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.10.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.14.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
 
 CQUThesis表示的是**C**hong**Q**ing **U**niversity **Thesis**.
 
@@ -77,7 +77,7 @@ make cls
 
 # 提问和支持
 * [Github Issues](https://github.com/nanmu42/CQUThesis/issues)
-* 造访重庆大学创新实践中心寻求支持
+* 加入[重庆大学TeX用户组](http://jq.qq.com/?_wv=1027&k=2HvYu95)寻求支持
 
 # 用户协议
 1. 本模板按照[LaTeX Project Public License](https://latex-project.org/lppl/lppl-1-3.txt)发布，协议版本号为1.3或以后的任何版本（随你意）。本条款不适用于重庆大学LaTeX模板工具箱（CQUThesis Toolkit）；

cquthesis.cwl

@@ -62,10 +62,12 @@
 \cquauthpage#n
 \cquauthpage[scanedFile]#n
 \cqusetup{key=value,}#n
+\ckeywords#S
 \ctexset{key=value,}#n
 \ding{number}#n
 \eqlist{name}#n
 \eqlist{name}[EnglishName]#n
+\ekeywords#S
 \frontmatter#S
 \fangsong#n
 \figref#S
@@ -99,4 +101,4 @@
 \xuhaoseparator#n
 \xuhaotype[1-6]#n
 \youyuan#n
-\zihao{num}#n
+\zihao{num}#n