summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-08-27 22:15:55 +0000
committerKarl Berry <karl@freefriends.org>2016-08-27 22:15:55 +0000
commit11c9c4d9505fbae8b108824303315d6203a2a655 (patch)
tree0d6139f60080d4acfe0f1eaa4af6b6808b9fc037 /Master/texmf-dist/doc/latex
parent5fd39aa8867152c78c0dd8676a185880b9a797b6 (diff)
cquthesis (27aug16)
git-svn-id: svn://tug.org/texlive/trunk@41938 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex')
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/Makefile92
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md74
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/README.md57
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex53
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex6
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/contents/cover.tex17
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/cquthesis.cwl13
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdfbin519644 -> 558393 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/main.tex6
9 files changed, 228 insertions, 90 deletions
diff --git a/Master/texmf-dist/doc/latex/cquthesis/Makefile b/Master/texmf-dist/doc/latex/cquthesis/Makefile
new file mode 100644
index 00000000000..57f1c90cb4d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cquthesis/Makefile
@@ -0,0 +1,92 @@
+# Makefile for CQUThesis
+# Adapted from Thuthesis Makefile
+
+# Compiling method: latexmk/xelatex/pdflatex
+METHOD = latexmk
+# Set opts for latexmk if you use it
+LATEXMKOPTS = -xelatex
+# Basename of thesis
+THESISMAIN = main
+
+
+PACKAGE=cquthesis
+SOURCES=$(PACKAGE).ins $(PACKAGE).dtx
+THESISCONTENTS=$(THESISMAIN).tex contents/*.tex $(FIGURES)
+# NOTE: update this to reflect your local file types.
+# 注意:下列内容可能需要根据你的实际情况调整
+FIGURES=$(wildcard figures/*.eps figures/*.pdf figures/*.jpg figures/*.jpeg figures/*.png)
+BIBFILE=ref/refs.bib
+SHUJICONTENTS=$(SHUJIMAIN).tex
+CLSFILES=dtx-style.sty $(PACKAGE).cls $(PACKAGE).cfg
+
+# make deletion work on Windows
+ifdef SystemRoot
+ RM = del /Q
+ OPEN = start
+else
+ RM = rm -f
+ OPEN = open
+endif
+
+.PHONY: all clean cls check doc distclean thesis viewthesis viewdoc FORCE_MAKE
+
+all: doc thesis
+
+cls: $(CLSFILES)
+
+doc: $(PACKAGE).pdf
+
+$(CLSFILES): $(SOURCES)
+ latex $(PACKAGE).ins
+
+viewdoc: doc
+ $(OPEN) $(PACKAGE).pdf
+
+viewthesis: thesis
+ $(OPEN) $(THESISMAIN).pdf
+
+thesis: $(THESISMAIN).pdf
+
+ifeq ($(METHOD),latexmk)
+
+$(PACKAGE).pdf: $(CLSFILES)
+ 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
+ xelatex $(PACKAGE).dtx
+
+$(THESISMAIN).pdf: $(CLSFILES)
+ $(METHOD) $(LATEXMKOPTS) $(THESISMAIN)
+
+else ifneq (,$(filter $(METHOD),xelatex pdflatex))
+
+$(PACKAGE).pdf: $(CLSFILES)
+ $(METHOD) $(PACKAGE).dtx
+ makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
+ makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
+ $(METHOD) $(PACKAGE).dtx
+ $(METHOD) $(PACKAGE).dtx
+ $(METHOD) $(PACKAGE).dtx
+
+$(THESISMAIN).pdf: $(CLSFILES) $(THESISCONTENTS) $(THESISMAIN).bbl
+ $(METHOD) $(THESISMAIN)
+ $(METHOD) $(THESISMAIN)
+
+$(THESISMAIN).bbl: $(BIBFILE)
+ $(METHOD) $(THESISMAIN)
+ -bibtex $(THESISMAIN)
+ $(RM) $(THESISMAIN).pdf
+
+else
+$(error Unknown METHOD: $(METHOD))
+
+endif
+
+clean:
+ latexmk -c $(PACKAGE).dtx $(THESISMAIN)
+ -@$(RM) *~
+
+cleanall: clean
+ -@$(RM) $(PACKAGE).pdf $(THESISMAIN).pdf
diff --git a/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md b/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md
index a9527b2e870..285d7493974 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md
+++ b/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md
@@ -1,4 +1,8 @@
# 嗨,这里是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表示的是**C**hong**Q**ing **U**niversity **Thesis**.
本宏包是重庆大学毕业论文的`\LaTeX{}`模板,支持学士、硕士、博士论文的排版。合理使用本宏包可以大大减轻重庆大学毕业生在毕业论文撰写过程中的排版工作量。
@@ -9,7 +13,8 @@ CQUThesis根据重庆大学《重庆大学本科设计(论文)撰写规范
* 支持重庆大学本科(文学、理工)、硕士(学术、专业)、博士的毕业论文格式;
* 内置封面、目录、索引、授权书等论文部件,可按需自动生成;
* 自动侦测文档页数,生成相应的单面打印/双面打印PDF文件;
-* 预置一批按毕业论文环境优化过的宏包和小功能,包含国际标准单位、化学式支持、三线表等,可按需开启。
+* 预置一批优化过的宏包和小功能,包含中英双语题注及配套图录、表录,国际标准单位、化学式支持、三线表等,可按需开启;
+* 支持基于cwl文件的代码着色和补全,makefile功能能够在Linux, Mac, Windows三平台通用。
![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png)
@@ -17,49 +22,73 @@ CQUThesis根据重庆大学《重庆大学本科设计(论文)撰写规范
## 下载
版本 | 下载地址 | 描述
--- | --- | ---
-开发版 |[点我下载](https://github.com/nanmu42/cquthesis/zipball/master) | 最新的功能,最快的BugFix
-发行版 |[CTAN下载页面](https://www.ctan.org/pkg/cquthesis)| 定期更新,和TeX Live等发行版一同发行
+开发版 |[点我下载](https://github.com/nanmu42/cquthesis/zipball/master) | 推荐,最新的功能,最快的BugFix
+预发行版 | [Github下载页面](https://github.com/nanmu42/CQUThesis/releases) | 累计有较大更改时更新
+发行版 |[CTAN下载页面](https://www.ctan.org/pkg/cquthesis)| 定期从预发行版更新,和TeX Live等发行版一同发行
排版示例和用户文档随版本发布,如果需要单独下载,请参阅后文。
## 部署
-为了降低新手使用模板的难度,默认情况下,模板文件`cquthesis.cls`, `cquthesis.cfg`已经先行从`cquthesis.dtx`中提取出来,您无需再执行任何操作。但如果您确实需要(如更新或自己编译用户文档)或者对`cquthesis.dtx`文件感兴趣,您可参阅和本文件同目录的`README-English.md`,内有详情。
+CQUThesis的安装十分便利。下载CQUThesis的.zip压缩包后请将整个文件夹解压出来,进入文件夹后:
+
+* Windows用户可以直接双击运行`makewin.bat`
+* Linux 和 Mac 用户请在Bash窗口中进行如下操作:
+```
+cd path/to/cquthesis
+make thesis
+```
+
+即可完成 CQUThesis 的安装和示例文档的编译。以上也是CQUThesis推荐的论文编译方式。
-请编译`main.tex`获得排版示例,如果您对LaTeX比较熟悉,请直接参照排版示例进行部署。其中`图1.1`为CQUThesis文件结构。下面是一些相对详细的提示。
+## 编译方式
+CQUThesis提供了支持全平台的Makefile来完成论文编译,大部分编译工作基于`latexmk`,能够有效利用中间文件提高编译效率,实现一键编译。
-请创建一个新的文件夹作为根目录。
+* Windows用户请在文件夹空白处按住Shift键再点击书鼠标右键,选择“在此处打开命令窗口”,运行下列命令:
+```
+makewin help
+```
+可查询makewin.bat的详细用法(推荐熟悉,事半功倍)。
-必要文件列举如下:
-* 模板文件:`cquthesis.cls`, `cquthesis.cfg`, `cquthesis.sty`以及`cqunumberical.bst`,位于根目录;
-* 内容文件夹:`contents`, `figures`, `ref`(推荐),都位于根目录;
-* `contents`内的必要文件:`ack.tex`, `appendix.tex`, `cover.tex`, `denotation.tex`,将这些文件按文件结构安排至根目录中;
-* 最后请将`main.tex`置于根目录,工作即可开始。
+* Linux用户和Mac用户可打开 Makefile 文件查看相关用法。
## 更新
-需要更新时,请从Github下载zip文档后解压,覆盖掉原始的模板文件,使用命令行定位到文件夹,运行:
-`latex cquthesis.ins`
-即可完成更新。
+CQUThesis的升级很方便,下载最新的开发版,将zip文件中的`cquthesis.dtx`和`cquthesis.ins`覆盖掉工作文件夹中的相应文件后:
+
+* Windows用户请在文件夹空白处按住Shift键再点击书鼠标右键,选择“在此处打开命令窗口”,运行下列命令:
+```
+makewin extract
+```
+
+* Linux 和 Mac 用户请在 Bash 窗口中进行如下操作:
+```
+cd cquthesis
+make cls
+```
+即可完成 CQUThesis 的升级。
+
# 文档
+文档涵盖了CQUThesis的使用方法、注意事项、实现方式,推荐阅读以快速上手:
+
文档 | 描述
--- | ---
排版示例 | 请编译`main.tex`获得
- 用户文档 | 随模板发布,也可[点我下载](https://github.com/nanmu42/CQUThesis/files/308798/cquthesis.pdf)
+ 用户文档 | 随模板发布,也可[点我下载](https://github.com/nanmu42/CQUThesis/raw/master/cquthesis.pdf)
# 提问和支持
* [Github Issues](https://github.com/nanmu42/CQUThesis/issues)
-* 造访重庆大学7117工作室寻求支持
+* 加入[重庆大学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或以后的任何版本(随你意);
+1. 本模板按照[LaTeX Project Public License](https://latex-project.org/lppl/lppl-1-3.txt)发布,协议版本号为1.3或以后的任何版本(随你意)。本条款不适用于重庆大学LaTeX模板工具箱(CQUThesis Toolkit);
1. 重庆大学教务处和研究生院只提供毕业论文写作指南,不提供官方模板,也不会授权或认证第三方模板为官方模板。
这个模板是按照写作指南的参考实现,模板作者自当尽力,但不保证审查老师不提意见。任何由于本模板而引起的论文格式审查问题与本模板作者无关。
# About CQUThesis
-CQUThesis stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations.
+CQUThesis stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
# 致谢 / Acknowledgements
-这个模板是站在巨人肩膀上的成果,感谢LaTeX 2e计划,感谢[CTeX社区](https://github.com/CTeX-org/ctex-kit)提供的中文解决方案,感谢薛瑞尼副教授的[先驱之作](https://github.com/xueruini/thuthesis),感谢[中国科学技术大学TeX用户组](https://github.com/ustctug/gbt-7714-20155)。向你们致以真诚的问候和感激!
+这个模板是站在巨人肩膀上的成果,感谢LaTeX 2e计划,感谢[CTeX社区](https://github.com/CTeX-org/ctex-kit)提供的中文解决方案,感谢薛瑞尼副教授的[先驱之作](https://github.com/xueruini/thuthesis),感谢[中国科学技术大学TeX用户组](https://github.com/ustctug/gbt-7714-2015)。向你们致以真诚的问候和感激!
世界因你们更美好。
@@ -67,4 +96,9 @@ The author would like to acknowledge these contributors for their efforts and, e
* [The CTeX Community](https://github.com/CTeX-org/ctex-kit)
* [XUE, Ruini](https://github.com/xueruini/thuthesis)
-* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-20155)
+* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-2015)
+
+# 关于CQUThesis Toolkit
+重庆大学LaTeX模板工具箱(CQUThesis Toolkit)是为了增强CQUThesis而提供的额外文件和程序,这些内容往往是对CQUThesis易用性或功能的增强,没有它们,CQUThesis仍然可以良好地独立运行。
+
+这些内容有着自己的授权方式和简单的用户协议,不会随本模板的CTAN版本发布,CQUThesis的Github源是这些内容唯一的官方源,程序的更新和修正都会在这里进行。
diff --git a/Master/texmf-dist/doc/latex/cquthesis/README.md b/Master/texmf-dist/doc/latex/cquthesis/README.md
index 32637c86b89..b2ae28ce96f 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/README.md
+++ b/Master/texmf-dist/doc/latex/cquthesis/README.md
@@ -1,48 +1,43 @@
# 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:
* [The CTeX Community](https://github.com/CTeX-org/ctex-kit)
* [XUE, Ruini](https://github.com/xueruini/thuthesis)
-* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-20155)
-
-# 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.
+* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-2015)
# About the Author
Zhennan Li (i at nanmu dot me) proudly presents this work for you.
@@ -52,4 +47,4 @@ This whole project may be distributed and/or modified under the conditions of th
http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. \ No newline at end of file
+and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
diff --git a/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex
index 8f3b6f11a18..ceb3bef2994 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex
+++ b/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex
@@ -31,27 +31,28 @@ The \textbf{words} in this sentences are \textit{processed} with three different
\caption[模板文件]{模板文件。如果表格的标题很长,那么在表格索引中就会很不美观,所以要像 chapter 那样在前面用中括号写一个简短的标题。这个标题会出现在索引中。}
\label{tab:template-files}
\begin{tabularx}{\linewidth}{lX}
- \toprule[1.5pt]
+ \toprule
{\heiti 文件名} & {\heiti 描述} \\
- \midrule[1pt]
+ \midrule
cquthesis.cls & 模板类文件\footnote{这是一个脚注}\\
cquthesis.cfg & 模板配置文件\footnote{这是又一个脚注}\\
cqunumberical.bst & 参考文献 BIB\TeX\ 样式文件。\\
cquthesis.sty & 常用的包和命令写在这里,减轻主文件的负担。\footnote{同一页上的脚注最多支持到10个}\\
- \bottomrule[1.5pt]
+ \bottomrule
\end{tabularx}
\end{minipage}
\end{table}
首先来看一个最简单的表格。\autoref{tab:template-files} 列举了本模板主要文件及其功能。请大家注意三线表中各条线对应的命令。这个例子还展示了如何在表格中正确使用脚注。由于 \LaTeX{} 本身不支持在表格中使用\cs{footnote},所以我们不得不将表格放在小页中,而且最好将表格的宽度设置为小页的宽度,这样脚注看起来才更美观。
-\subsection{复杂表格}
+\subsection{双语题注和复杂表格}
\label{sec:complicatedtable}
+使用\cs{bicaption}\marg{中文}\marg{英文}可以对图或者表的浮动体添加双语题注,对方程式进行双语题注,请使用\cs{eqlist}\marg{中文}\oarg{英文},注意括号。
我们经常会在表格下方标注数据来源,或者对表格里面的条目进行解释。前面的脚注是一种不错的方法,如果不喜欢脚注,可以在表格后面写注释,比如\autoref{tab:tabexamp1}。
\begin{table}[htbp]
\centering
- \caption{复杂表格示例 1}
+ \bicaption{复杂表格示例}{A more structured table}
\label{tab:tabexamp1}
\begin{minipage}[t]{0.8\textwidth}
\begin{tabularx}{\linewidth}{|l|X|X|X|X|}
@@ -75,26 +76,26 @@ The \textbf{words} in this sentences are \textit{processed} with three different
\caption{第一个并排子表格}
\label{tab:parallel1}
\begin{tabular}{p{2cm}p{2cm}}
- \toprule[1.5pt]
- No. & Name \\\midrule[1pt]
+ \toprule
+ No. & Name \\\midrule
\xuhao[1] & Fox \\
\xuhao & Panda \\
\xuhao & Dog \\
- \bottomrule[1.5pt]
+ \bottomrule
\end{tabular}
\end{minipage}%
\setxuhao[2]
\begin{minipage}{0.5\textwidth}
\centering
- \caption{第二个并排子表格}
+ \bicaption{第二个并排子表格}{The second subtable in one row}
\label{tab:parallel2}
\begin{tabular}{p{2cm}p{2cm}}
- \toprule[1.5pt]
- No. & Name \\\midrule[1pt]
+ \toprule
+ No. & Name \\\midrule
\xuhao[1] & Charlie \\
\xuhao & Jack \\
\xuhao & Tom \\
- \bottomrule[1.5pt]
+ \bottomrule
\end{tabular}
\end{minipage}
\end{table}
@@ -106,18 +107,18 @@ The \textbf{words} in this sentences are \textit{processed} with three different
\subcaptionbox{第一个子表格}
{
\begin{tabular}{p{2cm}p{2cm}}
- \toprule[1.5pt]
- 111 & 222 \\\midrule[1pt]
- 222 & 333 \\\bottomrule[1.5pt]
+ \toprule
+ 111 & 222 \\\midrule
+ 222 & 333 \\\bottomrule
\end{tabular}
}
\hskip2cm
\subcaptionbox{第二个子表格}
{
\begin{tabular}{p{2cm}p{2cm}}
- \toprule[1.5pt]
- 111 & 222 \\\midrule[1pt]
- 222 & 333 \\\bottomrule[1.5pt]
+ \toprule
+ 111 & 222 \\\midrule
+ 222 & 333 \\\bottomrule
\end{tabular}
}
\end{table}
@@ -127,21 +128,21 @@ The \textbf{words} in this sentences are \textit{processed} with three different
\tabref{tab:parallel1}和\tabref{tab:parallel2}展示了\cs{xuhao}和\cs{xuhao}\texttt{[1]}的使用,可以达到自动编号的效果。不过要记得在每次使用之前使用\cs{resetxuhao},或者\cs{xuhao}\texttt{[1]}。使用\cs{setxuhao}\oarg{1-6}可以更改序号的标记方式,如\tabref{tab:parallel2}所示。详细用法请参阅用户手册。
\begin{longtable}[c]{c*{6}{r}}
- \caption{实验数据}\label{tab:performance}\\
- \toprule[1.5pt]
+ \bicaption[实验数据]{实验数据,这个题注是双语的,而且十分的长,注意这在索引中的处理方式}[Data in experiment]{Data in experiment, and this is a really long long long long long long long long long long text.}\label{tab:performance}\\
+ \toprule
测试程序 & \multicolumn{1}{c}{正常运行} & \multicolumn{1}{c}{同步} & \multicolumn{1}{c}{检查点} & \multicolumn{1}{c}{卷回恢复}
& \multicolumn{1}{c}{进程迁移} & \multicolumn{1}{c}{检查点} \\
& \multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{时间 (s)}&
\multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{
- 时间 (s)}& 文件(KB)\\\midrule[1pt]
+ 时间 (s)}& 文件(KB)\\\midrule
\endfirsthead
\multicolumn{7}{c}{续表~\thetable\hskip1em 实验数据}\\
- \toprule[1.5pt]
+ \toprule
测试程序 & \multicolumn{1}{c}{正常运行} & \multicolumn{1}{c}{同步} & \multicolumn{1}{c}{检查点} & \multicolumn{1}{c}{卷回恢复}
& \multicolumn{1}{c}{进程迁移} & \multicolumn{1}{c}{检查点} \\
& \multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{时间 (s)}&
\multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{
- 时间 (s)}& 文件(KB)\\\midrule[1pt]
+ 时间 (s)}& 文件(KB)\\\midrule
\endhead
\hline
\multicolumn{7}{r}{续下页}
@@ -186,7 +187,7 @@ The \textbf{words} in this sentences are \textit{processed} with three different
EP.B.2 & 495.49 & 0.001 & 0.009 & 0.003 & 0.196 & 2011 \\
EP.B.4 & 247.69 & 0.002 & 0.012 & 0.004 & 0.122 & 1663 \\
EP.B.8 & 126.74 & 0.003 & 0.017 & 0.005 & 0.083 & 1656 \\
- \bottomrule[1.5pt]
+ \bottomrule
\end{longtable}
如果你要排版的表格长度超过一页,那么推荐使用 \pkg{longtable} 或者 \pkg{supertabular}宏包,模板对 \pkg{longtable} 进行了相应的设置,所以用起来可能简单一些。表~\ref{tab:performance} 就是 \pkg{longtable} 的简单示例。
@@ -415,7 +416,7 @@ p(y|\mathbf{x}) = \frac{p(\mathbf{x},y)}{p(\mathbf{x})}=
$\underset{\text{amphoteres Hydroxid}}{\ce{Zn(OH)2 v}}$ <=>[+ 2OH-][+ 2H+]
$\underset{\text{Hydroxozikat}}{\ce{[Zn(OH)4]^2-}}$
}
-\end{equation}\eqlist{复杂的化学方程式}
+\end{equation}\eqlist{复杂的化学方程式}[A sophisticated chemical equation]
这个方程式嵌套在了\pkg{equation}环境中,可用\cs{eqlist}(\cs{listeq}的别名,作用相同)来编排到索引中。
@@ -451,7 +452,7 @@ p(y|\mathbf{x}) = \frac{p(\mathbf{x},y)}{p(\mathbf{x})}=
\begin{figure}[htb] % use float package if you want it here
\centering
\includegraphics[height=4cm]{CQUbadge.pdf}
- \caption{重庆大学校徽}
+ \bicaption{重庆大学校徽}{Chongqing University badage}
\label{fig:xfig1}
\end{figure}
diff --git a/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex
index 95bd81cab29..ba542bc4e45 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex
+++ b/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex
@@ -85,6 +85,10 @@ lengthSummary.to_csv('lengthSummary.csv')
\begin{equation}
\alpha\beta\gamma\delta\epsilon\varepsilon\zeta\eta = AB\Gamma\varGamma Z
-\end{equation}\eqlist{附录中的公式编号}
+\end{equation}\eqlist{附录中的公式编号1,双语}[Equation name in English A]
+
+\begin{equation}
+\alpha\beta\gamma\delta\epsilon\varepsilon\zeta\eta = CD\Gamma\varGamma Z
+\end{equation}\eqlist{附录中的公式编号2,双语}[Equation name in English B]
测试用途:theequation值为:\theequation ,thefigure值为:\thefigure ,thetable值为:\thetable
diff --git a/Master/texmf-dist/doc/latex/cquthesis/contents/cover.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/cover.tex
index 96a01a3eec1..4a04551c451 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/contents/cover.tex
+++ b/Master/texmf-dist/doc/latex/cquthesis/contents/cover.tex
@@ -17,6 +17,9 @@
studentid = 20128888, % 仅本科生,学号
csupervisor = 孙麟~~教授, % 导师的姓名
esupervisor = {Prof.~Lin Sun}, % 导师的姓名拼音
+ cassistsupervisor = {}, % 本科生可选,助理指导教师姓名,不用时请留空为{}
+ cextrasupervisor = {}, % 本科生可选,校外指导教师姓名,不用时请留空为{}
+ eassistsupervisor = {}, % 本科生可选,助理指导教师或/和校外指导教师姓名拼音,不用时请留空为{}
cpsupervisor = 丁小明~~工程师, % 仅专硕,兼职导师姓名
epsupervisor = Eng.~Xiaoming~Ding, % 仅专硕,兼职导师姓名拼音
cclass = 工学, % 博士生和学硕填学科门类,学硕填学科类型
@@ -34,12 +37,7 @@
% ===================
% mycdate = {中文日期},
% myedate = {Date in English},
-% ===================
-% 论文的关键词,使用英文逗号分隔
-% ===================
- ckeywords = {重庆大学,\LaTeX,\LaTeXe,论文,模板},
- ekeywords = {bachelor, master, doctor, all support, white space is okay here,doctor, all support, white space is okay here}
- }% End of \cqusetup
+}% End of \cqusetup
% ===================
%
% 论文的摘要
@@ -60,8 +58,8 @@
\item 预置一批优化过的宏包和小功能,包含国际标准单位、化学式支持、三线表等,可按需开启。
\end{itemize}
\end{cabstract}
-% 如果习惯关键字跟在摘要文字后面,可以用直接命令来设置,如下:
-% \ckeywords{重庆大学,\LaTeX,\LaTeXe,论文,模板}
+% 中文关键词,请使用英文逗号分隔:
+\ckeywords{重庆大学,\LaTeX,\LaTeXe,论文,模板}
\begin{eabstract} % 英文摘要
LaTeX is a document preparation system for high-quality typesetting. It is most often used for medium-to-large technical or scientific documents but it can be used for almost any form of publishing.
@@ -79,6 +77,7 @@
\end{enumerate}
(Quote from \textit{https://latex-project.org/intro.html})
\end{eabstract}
+% 英文关键词,请使用英文逗号分隔,关键词内可以空格:
+\ekeywords{bachelor, master, doctor, all support, white space is okay here}
-% \ekeywords{bachelor, master, doctor, all support, white space is okay here}
% 封面和摘要配置完成
diff --git a/Master/texmf-dist/doc/latex/cquthesis/cquthesis.cwl b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.cwl
index a5675907e2c..59f378abfec 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/cquthesis.cwl
+++ b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.cwl
@@ -17,6 +17,8 @@
#include:upgreek
#include:subcaption
\backmatter#S
+\bicaption{Chinese}{English}#n
+\bicaption[shortC]{Chinese}[shortE]{English}#n
\bigcell{content}#t
\begin{cabstract}#S
\begin{denotation}#S
@@ -60,9 +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
@@ -72,7 +77,11 @@
\onlinecite{bibid}#c
\kaishu#n
\listeq{name}#n
-\listofequations#S
+\listeq{name}[EnglishName]#n
+\listofequations#n
+\listofequationsEN#n
+\listoffiguresEN#n
+\listoftablesEN#n
\lishu#n
\mainmatter#S
\makeabstract#S
@@ -92,4 +101,4 @@
\xuhaoseparator#n
\xuhaotype[1-6]#n
\youyuan#n
-\zihao{num}#n \ No newline at end of file
+\zihao{num}#n
diff --git a/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf
index 84a9f3e3908..16cf1b9cbb0 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf
+++ b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cquthesis/main.tex b/Master/texmf-dist/doc/latex/cquthesis/main.tex
index d51b68c3c77..871c40c93b8 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/main.tex
+++ b/Master/texmf-dist/doc/latex/cquthesis/main.tex
@@ -3,13 +3,14 @@
%%% 使用前请先阅读使用文档和用户协议,内有详细介绍。Happy Texing! :)
%% =======================================================
\documentclass%
- [type=bachelor, ]{cquthesis}%
+ [type=master, bilinguallist=apart,]{cquthesis}%
% 可用选项:
% type=[bachelor|master|doctor], % 必选,毕业论文类型,以下项目不填时为默认
% liberalformat, % 可选,仅适用本科生,使用文学类论文标题格式,默认未打开
% proffesionalmaster=[true|false], % 可选,仅适用研究生,是(true)否(false)专业硕士,默认为否
% printmode=[oneside|twoside|auto], % 可选,论文打印方式,默认采用auto按页数要求自动判定
% openany,|openright, % 可选,双面打印时每章的第一页仅右页开启,默认左右页开启(openany)
+% bilinguallist=[off|combined|apart] % 可选,图录表录等分别按双语题注混编(combined),分开编录(apart),默认关(off)
% seriftoc, % 可选,目录中的不同级别采用不同的字号和字体,适用于三级标题很多的情况
% continuoustoc, % 可选,目录和索引不会自动新开一页,适用于索引内容较少时
% draft, % 写作期间可选,不渲染图片,关闭外围功能,加快预览速度,默认未开启
@@ -37,10 +38,13 @@
\tableofcontents
%% 插图索引,可选,如不用可注释掉
\listoffigures
+\listoffiguresEN
%% 表格索引,可选
\listoftables
+\listoftablesEN
%% 公式索引,可选
\listofequations
+\listofequationsEN
%% 符号对照表,可选
\input{contents/denotation}