From 8e82251d20e2e042e3140d2b1fb11d0acc5b174e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Jun 2017 23:13:51 +0000 Subject: cquthesis (31may17) git-svn-id: svn://tug.org/texlive/trunk@44476 c570f23f-e606-0410-a88d-b1316a301751 --- .../bibtex/bst/cquthesis/cqunumerical.bst | 7 +- .../texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md | 21 ++ .../doc/latex/cquthesis/README-Chinese.md | 31 ++- Master/texmf-dist/doc/latex/cquthesis/README.md | 2 +- .../doc/latex/cquthesis/contents/ack.tex | 9 +- .../doc/latex/cquthesis/contents/appendix.tex | 25 +- .../doc/latex/cquthesis/contents/cover.tex | 21 +- .../texmf-dist/doc/latex/cquthesis/cquthesis.pdf | Bin 564908 -> 609510 bytes .../texmf-dist/doc/latex/cquthesis/dtx-style.sty | 2 +- .../texmf-dist/doc/latex/cquthesis/figures/README | 8 - Master/texmf-dist/doc/latex/cquthesis/main.tex | 9 +- .../source/latex/cquthesis/cquthesis.dtx | 96 +++++-- .../source/latex/cquthesis/makewin-English.bat | 139 ++++++++++ .../texmf-dist/source/latex/cquthesis/makewin.bat | 300 +++++++++++---------- .../texmf-dist/tex/latex/cquthesis/cquthesis.cfg | 6 +- .../texmf-dist/tex/latex/cquthesis/cquthesis.cls | 45 +++- 16 files changed, 510 insertions(+), 211 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md delete mode 100644 Master/texmf-dist/doc/latex/cquthesis/figures/README create mode 100755 Master/texmf-dist/source/latex/cquthesis/makewin-English.bat (limited to 'Master') diff --git a/Master/texmf-dist/bibtex/bst/cquthesis/cqunumerical.bst b/Master/texmf-dist/bibtex/bst/cquthesis/cqunumerical.bst index d8ab668594f..2b13900c368 100644 --- a/Master/texmf-dist/bibtex/bst/cquthesis/cqunumerical.bst +++ b/Master/texmf-dist/bibtex/bst/cquthesis/cqunumerical.bst @@ -387,7 +387,7 @@ FUNCTION {format.mark} media empty$ { url empty$ 'skip$ - { "/OL" * } + { "" * } if$ } { "/" * media * } @@ -1209,7 +1209,7 @@ FUNCTION {misc} author format.key output new.block format.series.volume.title "title" output.check - "M" format.mark "" output.after + "EB" format.mark "" output.after new.block format.translators output new.block @@ -1264,7 +1264,8 @@ FUNCTION {phdthesis} author format.key output new.block format.series.volume.title "title" output.check - "D" format.mark ": [PhD]" * "" output.after + "D" format.mark "" * "" output.after + %%"D" format.mark ": [PhD]" * "" output.after new.block format.translators output new.block diff --git a/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md b/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md new file mode 100644 index 00000000000..c987a1e8309 --- /dev/null +++ b/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md @@ -0,0 +1,21 @@ +# 贡献者名单 + +CQUThesis是一个绵薄的开源项目，自从2016年5月份上线以来，很多热心人士为项目作出了各种各样的贡献，这里是他们的名单： + +* **BluesCas**（重庆大学TeX用户组成员，他给Beta版本的CQUThesis提出了很多建议，例如[Issue #12](https://github.com/nanmu42/CQUThesis/issues/12)，他为TeX在母校的推广贡献良多） +* **FIVE**（十分热心的CQUThesis博士版本用户，重庆大学TeX用户组成员，他提交了很多Bug，出了很多主意） +* **Be.**（重庆大学TeX用户组成员，为TeX在母校的推广做出了不少身体力行的贡献） +* **IOriens**（重庆大学TeX用户组成员，[PR #29](https://github.com/nanmu42/CQUThesis/pull/29)） +* **rhiswell**（[Issue #28](https://github.com/nanmu42/CQUThesis/issues/28)，一个振奋人心的好消息） +* **fengzipei**（[Issue #30](https://github.com/nanmu42/CQUThesis/issues/30)） +* **craneaow**（[Issue #20](https://github.com/nanmu42/CQUThesis/issues/20)，这带来了一个新功能！） +* **Zousiyu**（重庆大学TeX用户组成员，他贡献了开发思路） +* **Lotus**（重庆大学TeX用户组成员，他在群里各种--瞎--带节奏） + +还有， +* 我的母校，**重庆大学** +* 最后，当然是[重庆大学TeX用户组](http://jq.qq.com/?_wv=1027&k=2HvYu95)的全体同仁 + +在此，向诸位致以最真诚的谢意，因为你们，CQUThesis才能够越走越稳，直到今天！ + +2017年5月30日 —— CQUThesis 一岁整 \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md b/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md index efa7a6aa040..f8b251d8ea0 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md +++ b/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md @@ -1,7 +1,9 @@ # 嗨，这里是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.16.svg)](https://github.com/nanmu42/CQUThesis/commits/master) +[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.20.svg)](https://github.com/nanmu42/CQUThesis/commits/master) +[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503) CQUThesis表示的是**C**hong**Q**ing **U**niversity **Thesis**. @@ -10,6 +12,7 @@ CQUThesis表示的是**C**hong**Q**ing **U**niversity **Thesis**. CQUThesis根据重庆大学《重庆大学本科设计（论文）撰写规范化要求（2007年修订版）》和《重庆大学博士、硕士论文撰写格式标准（2007年修订版）》编写，力求合规，简洁，易于实现，用户友好。 # 模板特色 + * 支持重庆大学本科（文学、理工）、硕士（学术、专业）、博士的毕业论文格式； * 内置封面、目录、索引、授权书等论文部件，可按需自动生成； * 自动侦测文档页数，生成相应的单面打印/双面打印PDF文件； @@ -20,6 +23,7 @@ CQUThesis根据重庆大学《重庆大学本科设计（论文）撰写规范 # 获取CQUThesis ## 下载 + 版本 | 下载地址 | 描述 --- | --- | --- 开发版 |[点我下载](https://github.com/nanmu42/cquthesis/zipball/master) | 推荐，最新的功能，最快的BugFix @@ -29,6 +33,7 @@ CQUThesis根据重庆大学《重庆大学本科设计（论文）撰写规范 排版示例和用户文档随版本发布，如果需要单独下载，请参阅后文。 ## 部署 + CQUThesis的安装十分便利。下载CQUThesis的.zip压缩包后请将整个文件夹解压出来，进入文件夹后： * Windows用户可以直接双击运行`makewin.bat` @@ -40,7 +45,8 @@ make thesis 即可完成 CQUThesis 的安装和示例文档的编译。以上也是CQUThesis推荐的论文编译方式。 -## 编译方式 +## 高级编译 + CQUThesis提供了支持全平台的Makefile来完成论文编译，大部分编译工作基于`latexmk`，能够有效利用中间文件提高编译效率，实现一键编译。 * Windows用户请在文件夹空白处按住Shift键再点击书鼠标右键，选择“在此处打开命令窗口”，运行下列命令： @@ -52,6 +58,7 @@ makewin help * Linux用户和Mac用户可打开 Makefile 文件查看相关用法。 ## 更新 + CQUThesis的升级很方便，下载最新的开发版，将zip文件中的`cquthesis.dtx`和`cquthesis.ins`覆盖掉工作文件夹中的相应文件后： * Windows用户请在文件夹空白处按住Shift键再点击书鼠标右键，选择“在此处打开命令窗口”，运行下列命令： @@ -68,29 +75,36 @@ make cls # 文档 + 文档涵盖了CQUThesis的使用方法、注意事项、实现方式，推荐阅读以快速上手： - 文档 | 描述 - --- | --- - 排版示例 | 请编译`main.tex`获得 - 用户文档 | 随模板发布，也可[点我下载](https://github.com/nanmu42/CQUThesis/raw/master/cquthesis.pdf) +文档 | 描述 +--- | --- +排版示例 | 请编译`main.tex`获得 +用户文档 | 随模板发布，也可[点我下载](https://github.com/nanmu42/CQUThesis/raw/master/cquthesis.pdf) 此外，如果您需要向导师或学院征求使用TeX进行论文排版的理解和肯定，[重庆大学TeX用户组](http://jq.qq.com/?_wv=1027&k=2HvYu95)为您提供[《关于推荐重庆大学开设TeX相关课程并推广其运用的提议》](https://github.com/CQUtug/TeXProposal)，希望这份文档能帮到您。目前，我们正在学校范围内推动这一提案。 # 提问和支持 + * [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）； 1. 截止本文档编译时，重庆大学教务处和研究生院只提供了毕业论文写作指南，没有提供官方模板，也没有授权或认证任何第三方模板为官方模板。本模板是按照写作指南的参考实现，模板作者自当尽力，但不保证审查老师不提意见。在开始使用前，您同意，任何由于本模板而引起的论文格式审查问题与本模板作者无关。 # About CQUThesis + 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-2015)。向你们致以真诚的问候和感激！ +特别感谢参与CQUThesis的开发和维护的诸位[**直接贡献者**](https://github.com/nanmu42/CQUThesis/blob/master/CONTRIBUTORS.md)，向你们致以真诚的敬意和感激！ + 世界因你们更美好。 The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind: @@ -98,12 +112,17 @@ 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-2015) +* [Chongqing University Opensource Mirror](https://github.com/cqumirror) +* [CQU Mirror Site Dev. Task Force](https://github.com/cqumirror) +* [Chongqing University Lan-Union for Computer and Network](http://lanunion.cqu.edu.cn/) # 论文写作规范 + - [重庆大学本科毕业设计（论文）撰写规范化要求（2007修订）.pdf](https://github.com/nanmu42/CQUThesis/files/644308/2007.pdf) - [重庆大学博士、硕士学位论文撰写格式标准（2007修订）.pdf](https://github.com/nanmu42/CQUThesis/files/644309/2007.pdf) # 关于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 d01dd8d197a..f90ece32994 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/README.md +++ b/Master/texmf-dist/doc/latex/cquthesis/README.md @@ -1,7 +1,7 @@ # 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.16.svg)](https://github.com/nanmu42/CQUThesis/commits/master) +[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.20.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. diff --git a/Master/texmf-dist/doc/latex/cquthesis/contents/ack.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/ack.tex index 25b11b9c7e9..e4dfcd67804 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/contents/ack.tex +++ b/Master/texmf-dist/doc/latex/cquthesis/contents/ack.tex @@ -1,5 +1,8 @@ \chapter{致\hskip\ccwd{}谢} -% \chapterstar{}命令用于生成不编号的\chapter，这个命令提供目录和页眉内容的支持 -这个模板是站在巨人肩膀上的成果，感谢\LaTeXe{}计划，感谢CTeX开发组提供的中文解决方案，感谢薛瑞尼副教授(Github: xueruini/ThuThesis)，感谢WeiJianWen同学(Github: weijianwen/SJTUThesis)，感谢中国科学技术大学TeX用户组(Github: ustctug/gbt-7714-2015)。向你们致以真诚的问候和感激！ -世界因你们更美好。 +% 这里用盲审环境包裹致谢，在开启盲审开关时，环境内部的内容不予渲染。 +\begin{secretizeEnv} + 这个模板是站在巨人肩膀上的成果，感谢\LaTeXe{}计划，感谢CTeX开发组提供的中文解决方案，感谢薛瑞尼副教授(Github: xueruini/ThuThesis)，感谢WeiJianWen同学(Github: weijianwen/SJTUThesis)，感谢中国科学技术大学TeX用户组(Github: ustctug/gbt-7714-2015)。向你们致以真诚的问候和感激！ + + 世界因你们更美好。 +\end{secretizeEnv} diff --git a/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex index a73b099d2cd..da658ae61ec 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex +++ b/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex @@ -1,14 +1,17 @@ \chapter{附\hskip\ccwd{}录} \section{作者在攻读博士学位期间发表和拟发表论文目录} -\subsection{测试第三级目录2} -\subsubsection{四级目录1} -水陆草木之花，可爱者甚蕃。晋陶渊明独爱菊。自李唐来，世人盛爱牡丹。予独爱莲之出淤泥而不染，濯清涟而不妖，中通外直，不蔓不枝，香远益清，亭亭净植，可远观而不可亵玩焉。 -\subsubsection{四级目录2} -予谓菊，花之隐逸者也；牡丹，花之富贵者也；莲，花之君子者也。噫！菊之爱，陶后鲜有闻。莲之爱，同予者何人?牡丹之爱，宜乎众矣！ -\subsubsection{四级目录3} -予谓菊，花之隐逸者也；牡丹，花之富贵者也；莲，花之君子者也。噫！菊之爱，陶后鲜有闻。莲之爱，同予者何人?牡丹之爱，宜乎众矣！ + +下面是盲审标记\cs{secretize}的用法，记得去\textsf{main.tex}开启盲审开关看效果： + +\begin{enumerate} + \item 这是科研项目的名字 科研人员1，科研人员2，指导老师1，指导老师2，2017年5月30日 + \item 这一条与上一条内容相同，但进行了盲审标记 \secretize{科研人员1}，\secretize{科研人员2}，\secretize{指导老师1}，\secretize{指导老师2}，2017年5月30日 +\end{enumerate} \section{作者在攻读博士学位期间参加的科研项目} + +下面是工具函数\cs{xuhao}的用例： + \xuhaotype[1] \xuhao[1] \xuhao \xuhao \xuhao \xuhao \xuhao[1] \xuhao \xuhao \xuhao \xuhao @@ -27,6 +30,14 @@ \setxuhao[6] \xuhao[1] \xuhao \xuhao \xuhao \xuhao \xuhao[1] \xuhao \xuhao \xuhao \xuhao +\subsection{测试第三级目录2} +\subsubsection{四级目录1} +水陆草木之花，可爱者甚蕃。晋陶渊明独爱菊。自李唐来，世人盛爱牡丹。予独爱莲之出淤泥而不染，濯清涟而不妖，中通外直，不蔓不枝，香远益清，亭亭净植，可远观而不可亵玩焉。 +\subsubsection{四级目录2} +予谓菊，花之隐逸者也；牡丹，花之富贵者也；莲，花之君子者也。噫！菊之爱，陶后鲜有闻。莲之爱，同予者何人?牡丹之爱，宜乎众矣！ +\subsubsection{四级目录3} +予谓菊，花之隐逸者也；牡丹，花之富贵者也；莲，花之君子者也。噫！菊之爱，陶后鲜有闻。莲之爱，同予者何人?牡丹之爱，宜乎众矣！ + \section{关于声明书和授权书} 声明和授权部分支持扫描页替换，请在\pkg{main.tex}中设置。 diff --git a/Master/texmf-dist/doc/latex/cquthesis/contents/cover.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/cover.tex index 4a04551c451..601df70bb35 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/contents/cover.tex +++ b/Master/texmf-dist/doc/latex/cquthesis/contents/cover.tex @@ -11,17 +11,18 @@ etitle = {To Use \LaTeX{} in the Typeseting of\\Graduating Work for CQU}, % =================== % 作者部分的信息 +% \secretize{}为盲审标记点，在打开盲审开关时内容会自动被替换为***输出，盲审开关默认关闭 % =================== - cauthor = 李振楠, % 你的姓名，以下每项都以英文逗号结束 - eauthor = Zhennan~Li, % 姓名拼音，~代表不会断行的空格 - studentid = 20128888, % 仅本科生，学号 - csupervisor = 孙麟~~教授, % 导师的姓名 - esupervisor = {Prof.~Lin Sun}, % 导师的姓名拼音 - cassistsupervisor = {}, % 本科生可选，助理指导教师姓名，不用时请留空为{} - cextrasupervisor = {}, % 本科生可选，校外指导教师姓名，不用时请留空为{} - eassistsupervisor = {}, % 本科生可选，助理指导教师或/和校外指导教师姓名拼音，不用时请留空为{} - cpsupervisor = 丁小明~~工程师, % 仅专硕，兼职导师姓名 - epsupervisor = Eng.~Xiaoming~Ding, % 仅专硕，兼职导师姓名拼音 + cauthor = \secretize{李振楠}, % 你的姓名，以下每项都以英文逗号结束 + eauthor = \secretize{Zhennan~Li}, % 姓名拼音，~代表不会断行的空格 + studentid = \secretize{20128888}, % 仅本科生，学号 + csupervisor = \secretize{孙麟~~教授}, % 导师的姓名 + esupervisor = \secretize{{Prof.~Lin Sun}}, % 导师的姓名拼音 + cassistsupervisor = \secretize{}, % 本科生可选，助理指导教师姓名，不用时请留空为{} + cextrasupervisor = \secretize{}, % 本科生可选，校外指导教师姓名，不用时请留空为{} + eassistsupervisor = \secretize{}, % 本科生可选，助理指导教师或/和校外指导教师姓名拼音，不用时请留空为{} + cpsupervisor = \secretize{丁小明~~工程师}, % 仅专硕，兼职导师姓名 + epsupervisor = \secretize{Eng.~Xiaoming~Ding}, % 仅专硕，兼职导师姓名拼音 cclass = 工学, % 博士生和学硕填学科门类，学硕填学科类型 edgree = {Degree of Master of Enginnering}, % 专硕填Professional Degree，其他按实情填写 % 提示：如果内容太长，可以用\zihao{}命令控制字号，作用范围：{}内 diff --git a/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf index 2111b7ea8b6..615b15630c4 100644 Binary files a/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf and b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf differ diff --git a/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty b/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty index 8116672b1c1..a085f566184 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty +++ b/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2016-2016 by Zhennan Li +%% Copyright (C) 2016-2017 by Zhennan Li %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3 of this license or (at your option) any later diff --git a/Master/texmf-dist/doc/latex/cquthesis/figures/README b/Master/texmf-dist/doc/latex/cquthesis/figures/README deleted file mode 100644 index e9ddd0ca282..00000000000 --- a/Master/texmf-dist/doc/latex/cquthesis/figures/README +++ /dev/null @@ -1,8 +0,0 @@ -Notice For CTAN - -The file "CQUbadge.pdf" is a vector graph in PDF format, which can be transformed loselessly to .eps file. Thus, it should be regarded as "Source File". - -The .eps version is deprecated due to its unreasonable file size(~1.2 MB). - -Zhennan Li -Author of CQUThesis, LATEX Thesis Template for Chongqing University. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/cquthesis/main.tex b/Master/texmf-dist/doc/latex/cquthesis/main.tex index 191e99bfdd9..cd8840fb534 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/main.tex +++ b/Master/texmf-dist/doc/latex/cquthesis/main.tex @@ -3,16 +3,15 @@ %%% 使用前请先阅读使用文档和用户协议，内有详细介绍。Happy Texing! :) %% ======================================================= \documentclass% - [type=master, bilinguallist=apart,]{cquthesis}% + [type=doctor, 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, % 可选，目录和索引不会自动新开一页，适用于索引内容较少时 +% openany,|openright, % 可选，双面打印时每章的第一页仅右页开启，默认右页开启(openright) +% bilinguallist=[off|combined|apart], % 可选，图录表录等分别按双语题注混编(combined)，分开编录(apart)，默认关(off) +% blindtrail, % 可选，盲审模式，开启后封面姓名和致谢部分会隐藏，详情请参阅用户文档，默认关 % draft, % 写作期间可选，不渲染图片，关闭外围功能，加快预览速度，默认未开启 % 请在cquthesis.sty文件中定义其他会用到的宏包和自己的变量 diff --git a/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx b/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx index 1136b11b8b0..142e36b5e06 100644 --- a/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx +++ b/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx @@ -16,7 +16,7 @@ % % \iffalse %<*driver> -\ProvidesFile{cquthesis.dtx}[2016/12/07 v1.16 Chongqing University Thesis Template] +\ProvidesFile{cquthesis.dtx}[2017/05/30 v1.20 Chongqing University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -30,7 +30,7 @@ % % \fi % -% \CheckSum{1852} +% \CheckSum{1893} % % \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 @@ -84,7 +84,11 @@ % \changes{v1.00}{2016/06/17}{最后一些小修补，今年的毕设工作完全结束了。目前本科方面的格式审查没有问题，研究生和博士生哪边还没有数据。} % \changes{v1.00}{2016/06/17}{版本号格式从vX.Y.Z改为vX.YZ，更简洁一些。} % \changes{v1.10}{2016/06/21}{增加了CQUThesis的开发工具Makefile和makewin.bat，现在它对\LaTeX 中高阶用户和开发者更加友好，文档也相应更新了。} -% \changes{v1.14}{2016/08/18}{改进了makewin.bat，默认的thesis选项加入了自动判定，如果dtx没有解包，程序会自动解包。这也就是说，新手可以在几乎所有情况下放心地通过双击makewin.bat来完成编译了。} +% \changes{v1.14}{2016/08/18}{改进了\file{makewin.bat}，默认的thesis选项加入了自动判定，如果dtx没有解包，程序会自动解包。这也就是说，新手可以在几乎所有情况下放心地通过双击makewin.bat来完成编译了。} +% \changes{v1.20}{2017/05/30}{新增选项blankleft，可选目录和章节右开时空白的左页是否让页眉页脚空白。} +% \changes{v1.20}{2017/05/30}{调整了几个可选项的默认值，现在，openright默认开启。} +% \changes{v1.20}{2017/05/30}{新功能：盲审模式，由开关blindtrail和\cs{secretize}宏以及\env{secretizeEnv}环境构成。} +% \changes{v1.20}{2017/05/30}{再次改进了\file{makewin.bat}，现在，Windows用户以管理员身份运行\file{makewin.bat}时不再会遭遇路径错误了。此外，\file{makewin.bat}有中英文两个版本了。} % % \def\indexname{代码索引} % \def\glossaryname{更新记录} @@ -350,7 +354,10 @@ % % \DescribeOption{openany} % \DescribeOption{openright} -% 正规出版物的章节出现在奇数页，也就是右手边的页面，这就是 \option{openright}，在这种情况下，如果前一章的最后一页也是奇数，那么模板会自动生成一个纯粹的空白页以保证新章节右开。这个选项适合页数较多的论文，您可根据实际情况和个人喜好选择是否开启。默认值\option{openany}，本选项在单页打印时自动失效。 +% 正规出版物的章节出现在奇数页，也就是右手边的页面，这就是 \option{openright}，在这种情况下，如果前一章的最后一页也是奇数，那么模板会自动生成一个空白页以保证新章节右开。这个选项适合页数较多的论文，您可根据实际情况和个人喜好选择是否开启。默认值\option{openright}，本选项在单页打印时自动失效。 +% +% \DescribeOption{blankleft} +% 开启此项，并且在 \option{openright}开启的情况下，模板生成的空白页纯粹空白，不含页眉页脚，本选项默认关闭。 % % \DescribeOption{seriftoc} % 开启此项，目录中的不同级别会采用不同的字号和字体，这是按照学校word样例的实现。但是，蹊跷的是，样例里的这些做法在官方文件里却没有体现，而且一二级标题字号差别太大，个人观点有碍美观，所以这里列为可选项，适用于三级标题很多的情况。本选项默认关闭。 @@ -361,6 +368,14 @@ % \DescribeOption{abstractopenright} % 开启此项，双页打印模式时中英文摘要右开，这算是开发中的一个彩蛋。本选项默认关闭。 % +% \DescribeOption{blindtrail} +% 盲审模式开关，盲审模式由宏\cs{secretize}和环境\env{secretizeEnv}构成，在盲审模式开启时： +% \begin{itemize} +% \item 宏\cs{secretize}内的内容会被三个星号***替代； +% \item 环境\env{secretizeEnv}的内容会输出为一片空白。 +% \end{itemize} +% \cquthesis 默认为封面作者及导师姓名配置宏\cs{secretize}，为致谢的内容部分配置环境\env{secretize}，如果您有更多需求，可以自行配置。 +% % \DescribeOption{draft} % 草稿模式，推荐在写作时开启。这个模式下，\LaTeX 不会加载图片，不会渲染文档内超链接，部分宏包会跳过一些工作以降低编译难度，结合\cs{includeonly}命令可以大大提高预览速度，例如： % @@ -760,14 +775,14 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{cquthesis} %\ProvidesFile{cquthesis.cfg} -%[2016/12/07 v1.16 Chongqing University Thesis Template] +%[2017/05/30 v1.20 Chongqing University Thesis Template] % \end{macrocode} % 定义一些开发常量： % \begin{macrocode} %<*cls> \hyphenation{Cqu-Thesis} \newcommand{\cquthesis}{\textsc{CquThesis}} -\def\version{1.16} +\def\version{1.20} % % \end{macrocode} % \file{cquthesis.cfg}中，涉及文档部件的部分常量： @@ -819,13 +834,21 @@ % \end{macrocode} % 每个章首页是否右开 % \begin{macrocode} -\DeclareBoolOption[true]{openany} +\DeclareBoolOption[false]{openany} \DeclareComplementaryOption{openright}{openany} % \end{macrocode} +% 右开时空白的左页是否让页眉页脚空白 +% \begin{macrocode} +\DeclareBoolOption[false]{blankleft} +% \end{macrocode} % 双页模式下英文摘要页右开 % \begin{macrocode} \DeclareBoolOption[false]{abstractopenright} % \end{macrocode} +% 盲审模式开关 +% \begin{macrocode} +\DeclareBoolOption[false]{blindtrail} +% \end{macrocode} % 论文是单面打印还是双面打印（默认：自动，手动模式一般不用） % \begin{macrocode} \newif\if@onesideprint @@ -1025,20 +1048,20 @@ % \subsection{页面类设置} % \subsubsection{页面功能} % \begin{macro}{\cleardoublepage} -% 首页右开的时候，全空的左页不留页眉页脚 +% 首页右开的时候，全空的左页不留页眉页脚，这个功能受blankleft开关影响 % \begin{macrocode} \let\cqu@cleardoublepage\cleardoublepage \renewcommand{\cleardoublepage}{% - \clearpage{\pagestyle{style@empty}\cqu@cleardoublepage} + \clearpage{\ifcqu@blankleft\pagestyle{style@empty}\fi\cqu@cleardoublepage} }%\cleardoublepage % \end{macrocode} % \end{macro} % \begin{macro}{\cqu@addblankpage} -% 用来在强制完成空页工作，注意这里的pagestyle调整范围在花括号之内 +% 用来在强制完成空页工作，注意这里的pagestyle调整范围在花括号之内，这个功能受blankleft开关影响 % \begin{macrocode} \newcommand\cqu@addblankpage{% \afterpage{% - {\null\pagestyle{style@empty}\clearpage}}} + {\null\ifcqu@blankleft\pagestyle{style@empty}\fi\clearpage}}} % \end{macrocode} % \end{macro} % @@ -1080,12 +1103,13 @@ % % \subsubsection{页面设置} % 定义页面，页眉页脚，先建立页面环境，完成分页再决定单双面打印 +% \changes{v1.20}{2017/05/30}{页眉页脚高度以及垂直间距向Word版本靠拢。} % \begin{macrocode} \RequirePackage{geometry} \geometry{ a4paper, ignoreall, nomarginpar, - inner=25mm, outer=25mm, top=30mm, bottom=25mm, - bindingoffset=10mm, head=16mm, headsep=5mm, foot=15mm, footnotesep=5mm} + inner=25mm, outer=25mm, top=30mm, bottom=28mm, + bindingoffset=10mm, head=16mm, headsep=11mm, foot=12mm, footnotesep=5mm} % \end{macrocode} % % \subsubsection{单双页打印的自动判定} @@ -1497,11 +1521,13 @@ % 定制表格和插图的题注样式，这里注意\pkg{caption}宏包在设置表格的\option{position}为\option{top}时，\option{aboveskip}和\option{belowskip}的定义会相互调换，即\option{top}时反义，\option{bottom}时字面义。 % \changes{v1.12}{2016/07/06}{题注的字体设置对中英文都进行了适配。} % \changes{v1.16}{2016/12/07}{正文中的题注的名称和序号不再加粗，同时优化了题注和插图（插表）的垂直距离。} +% \changes{v1.20}{2017/05/30}{现在，题注有多行时，最后一行会进行居中处理。} % \begin{macrocode} \def\cqu@tabular{\zihao{5}\@tabular} \DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti #1~#2}} -\DeclareCaptionLabelSeparator{cqu}{\hspace{\ccwd}} +\DeclareCaptionLabelSeparator{cqu}{\hspace{0.5\ccwd}} \DeclareCaptionFont{cqu}{\zihao{5}\rmfamily\songti} +\captionsetup{justification=centerlast} \captionsetup{labelformat=cqu,labelsep=cqu,font=cqu} \captionsetup[table]{position=top,belowskip=6bp,aboveskip=0bp} \captionsetup[figure]{position=bottom,belowskip=0bp,aboveskip=6bp} @@ -1700,6 +1726,35 @@ % \end{macro} % \end{macro} % +% \subsection{盲审模式} +% +% \begin{macro}{\secretize} +% 定义盲审模式工具宏\cs{secretize}： +% \begin{macrocode} +\newcommand{\secretize}[1]{% + \ifcqu@blindtrail + {***} + \else + {#1} + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{environment}{secretizeEnv} +% 定义盲审模式工具环境\env{secretizeEnv}： +% \begin{macrocode} +\newcommand{\cqu@@secretizeenv}[1]{\long\gdef\cqu@secretizeenv{#1}} +\newenvironment{secretizeEnv}{\Collect@Body\cqu@@secretizeenv}{% + \ifcqu@blindtrail + \relax + \else + \cqu@secretizeenv + \fi +} +% \end{macrocode} +% \end{environment} +% % \subsection{封面绘制} % \subsubsection{信息录入} % \begin{macro}{\cqu@def@term} @@ -2095,7 +2150,7 @@ \def\cqu@studentEN{Ph.D. Candidate} \def\cqu@supervisorCN{指导教师} \def\cqu@supervisorEN{Supervised by{ }} - \def\cqu@majorCN{学科专业} + \def\cqu@majorCN{专业} \def\cqu@majorclassCN{学科门类} \def\cqu@majorEN{Specialty} \def\cqu@universitynameCN{重庆大学} @@ -2220,6 +2275,7 @@ % 目录和索引标题居中，包含\cs{fixhead} % \changes{v0.9.0}{2016/05/16}{把目录加到了PDF书签中。} % \changes{v1.12}{2016/07/06}{现在，目录、图录、表录、公式表的英文字体也采用了无衬线字。} +% \changes{v1.20}{2017/05/30}{现在，目录中的章节层级也有了尾随圆点，并且，圆点的间距更近了。} % \begin{macrocode} %<*cls> \renewcommand{\cfttoctitlefont}{% @@ -2233,13 +2289,19 @@ \renewcommand{\cftafterlottitle}{\hfill} \renewcommand{\cftafterequtitle}{\hfill} \renewcommand{\cftafterequENtitle}{\hfill} +\renewcommand{\cftdot}{…} +\renewcommand{\cftdotsep}{0} +\renewcommand{\cftchapdotsep}{\cftdotsep} +\renewcommand{\cftchapleader}{\cftdotfill{\cftchapdotsep}} +\renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}} % \end{macrocode} % % 重写使用tocloft宏包情况下的目录和索引生成，每次生成新开一页 % \begin{macrocode} +% \changes{v1.20}{2017/05/30}{除非openany选项打开，否则目录和索引现在会在双页模式进行右开。} \ifcqu@continuoustoc\relax\else - \renewcommand{\@cfttocstart}{\clearpage} - \renewcommand{\@cfttocfinish}{\clearpage} + \renewcommand{\@cfttocstart}{\cleardoublepage} + \renewcommand{\@cfttocfinish}{\cleardoublepage} \fi % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/cquthesis/makewin-English.bat b/Master/texmf-dist/source/latex/cquthesis/makewin-English.bat new file mode 100755 index 00000000000..f9950c6eb2a --- /dev/null +++ b/Master/texmf-dist/source/latex/cquthesis/makewin-English.bat @@ -0,0 +1,139 @@ +@echo off +cd /d %~dp0 + +title CQUThesis Build Helper + +set flag=%1 +if %flag%x == x ( + set flag=thesis +) + +if %flag%x == thesisx ( + call:thesis + goto :EOF +) +if %flag%x == thesisxx ( + call:thesisx + goto :EOF +) +if %flag%x == docx ( + call:extract + call:document + goto :EOF +) +if %flag%x == cleanx ( + call:cleanaux + goto :EOF +) +if %flag%x == cleanpdfx ( + call:cleanpdf + goto :EOF +) +if %flag%x == cleanallx ( + call:cleanaux + call:cleanpdf + goto :EOF +) +if %flag%x == extractx ( + call:extract + goto :EOF +) +if %flag%x == allx ( + call:thesis + call:document + goto :EOF +) +if %flag%x == buildx ( + call:extract + call:thesis + goto :EOF +) +if %flag%x == buildxx ( + call:extract + call:thesis + call:document + goto :EOF +) + +:help + echo ************************************************************* + echo This is the Makefile script for CQUThesis on Windows. + echo For CQUThesis: https://github.com/nanmu42/CQUThesis + echo by Zhennan Li (C) 2016 under LPPL 1.3 + echo The idea comes from Github Liam0205/sduthesis, Many thanks! + echo ************************************************************* + echo * + echo USAGE: + echo makewin [param] + echo param: + echo help Display this help text + echo thesis (default)Compile the thesis via latexmk + echo thesisx Compile the thesis via XeLaTeX(only if latexmk is not installed.) + echo doc Compile the documentation of CQUThesis + echo clean Clean all aux files + echo cleanpdf Clean all PDFs + echo cleanall Clean all aux files and all PDFs + echo extract Extract the Thesis Template from .dtx files. + echo all thesis + doc + echo build extract + thesis + echo buildx extract + thesis + doc + echo * + echo ***********************Happy TeXing************************** +goto :EOF + +:checkfiles + IF NOT EXIST cquthesis.cls call:extract + IF NOT EXIST cquthesis.cfg call:extract +goto :EOF + +:thesis + call:checkfiles + latexmk -xelatex main.tex +goto :EOF + +:thesisx + call:checkfiles + xelatex main.tex + bibtex main.tex + xelatex main.tex + xelatex main.tex + xelatex main.tex +goto :EOF + +:cleanaux + echo cleaning aux... + for %%i in (*.aux *.bbl *.equ *.glo *.gls *.hd *.idx *.ilg *.ind *.lof *.lot *.out *.blg *.log *.thm *.toc *.synctex.gz *.lofEN *.lotEN *.equEN) do ( + del %%i + ) + echo Done. +goto :EOF + +:cleanpdf + echo cleaning pdf... + for %%i in (*.pdf) do ( + del %%i + ) + echo Done. +goto :EOF + +:clean_all + call:cleanaux + call:cleanpdf +goto :EOF + +:extract + echo extracting... + latex cquthesis.ins + echo *******CQUThesis has been extracted.******** +goto :EOF + +:document + echo building documents... + set cmode=-interaction=batchmode + 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 + xelatex cquthesis.dtx +goto :EOF diff --git a/Master/texmf-dist/source/latex/cquthesis/makewin.bat b/Master/texmf-dist/source/latex/cquthesis/makewin.bat index b7a547cb29c..67b06a7212c 100755 --- a/Master/texmf-dist/source/latex/cquthesis/makewin.bat +++ b/Master/texmf-dist/source/latex/cquthesis/makewin.bat @@ -1,136 +1,164 @@ -@echo off - -set flag=%1 -if %flag%x == x ( - set flag=thesis -) - -if %flag%x == thesisx ( - call:thesis - goto:EOF -) -if %flag%x == thesisxx ( - call:thesisx - goto:EOF -) -if %flag%x == docx ( - call:extract - call:document - goto:EOF -) -if %flag%x == cleanx ( - call:cleanaux - goto:EOF -) -if %flag%x == cleanpdfx ( - call:cleanpdf - goto:EOF -) -if %flag%x == cleanallx ( - call:cleanaux - call:cleanpdf - goto:EOF -) -if %flag%x == extractx ( - call:extract - goto:EOF -) -if %flag%x == allx ( - call:thesis - call:document - goto:EOF -) -if %flag%x == buildx ( - call:extract - call:thesis - goto:EOF -) -if %flag%x == buildxx ( - call:extract - call:thesis - call:document - goto:EOF -) - -:help - echo ************************************************************* - echo This is the Makefile script for CQUThesis on Windows. - echo For CQUThesis: https://github.com/nanmu42/CQUThesis - echo by Zhennan Li (C) 2016 under LPPL 1.3 - echo The idea comes from Github Liam0205/sduthesis, Many thanks! - echo ************************************************************* - echo * - echo USAGE: - echo makewin [param] - echo param: - echo help Display this help text - echo thesis (default)Compile the thesis via latexmk - echo thesisx Compile the thesis via XeLaTeX(only if latexmk is not installed.) - echo doc Compile the documentation of CQUThesis - echo clean Clean all aux files - echo cleanpdf Clean all PDFs - echo cleanall Clean all aux files and all PDFs - echo extract Extract the Thesis Template from .dtx files. - echo all thesis + doc - echo build extract + thesis - echo buildx extract + thesis + doc - echo * - echo ***********************Happy TeXing************************** -goto:EOF - -:checkfiles - IF NOT EXIST cquthesis.cls call:extract - IF NOT EXIST cquthesis.cfg call:extract -goto:EOF - -:thesis - call:checkfiles - latexmk -xelatex main.tex -goto:EOF - -:thesisx - call:checkfiles - xelatex main.tex - bibtex main.tex - xelatex main.tex - xelatex main.tex - xelatex main.tex -goto:EOF - -:cleanaux - echo clean aux... - for %%i in (*.aux *.bbl *.equ *.glo *.gls *.hd *.idx *.ilg *.ind *.lof *.lot *.out *.blg *.log *.thm *.toc *.synctex.gz *.lofEN *.lotEN *.equEN) do ( - del %%i - ) - echo Done. -goto:EOF - -:cleanpdf - echo clean pdf... - for %%i in (*.pdf) do ( - del %%i - ) - echo Done. -goto:EOF - -:clean_all - call:cleanaux - call:cleanpdf -goto:EOF - -:extract - echo extracting... - latex cquthesis.ins - echo *******CQUThesis has been extracted.******** -goto:EOF - -:document - echo building documents... - set cmode=-interaction=batchmode - 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 - xelatex cquthesis.dtx -goto:EOF +@echo off + +rem ڹԱµ· +cd /d %~dp0 + +title CQUThesisԶ + +set flag=%1 +if %flag%x == x ( + set flag=thesis +) + +if %flag%x == thesisx ( + call:thesis + goto :EOF +) +if %flag%x == thesisxx ( + call:thesisx + goto :EOF +) +if %flag%x == docx ( + call:extract + call:document + goto :EOF +) +if %flag%x == cleanx ( + call:cleanaux + goto :EOF +) +if %flag%x == cleanpdfx ( + call:cleanpdf + goto :EOF +) +if %flag%x == cleanallx ( + call:cleanaux + call:cleanpdf + goto :EOF +) +if %flag%x == extractx ( + call:extract + goto :EOF +) +if %flag%x == allx ( + call:thesis + call:document + goto :EOF +) +if %flag%x == buildx ( + call:extract + call:thesis + goto :EOF +) +if %flag%x == buildxx ( + call:extract + call:thesis + call:document + goto :EOF +) + +:help + echo ************************************************************* + echo CQUThesisԶWindows + echo ѧҵLaTeXģ壺 https://github.com/nanmu42/CQUThesis + echo (C) 2016-2017 LPPL 1.3Э鿪Դ + echo ԴGithubLiam0205/sduthesisڴл + echo ************************************************************* + echo * + echo ÷ + echo makewin [] + echo + echo help չʾϢ + echo thesis ͨlatexmkܣٵرģ˫޲ʱĬУ + echo thesisx һı루ϵͳûװlatexmkһƼģ + echo doc CQUThesisûĵ + echo clean .auxļ + echo cleanpdf .pdfļ + echo cleanall .auxļԼ.pdfļ + echo extract .dtxļȡģ + echo all thesis + doc + echo build extract + thesis + echo buildx extract + thesis + doc + echo * + echo ***********************Happy TeXing************************** + echo ************************д죡*************************** +goto :EOF + +:checkfiles + IF NOT EXIST cquthesis.cls call:extract + IF NOT EXIST cquthesis.cfg call:extract +goto :EOF + +:thesis + call:checkfiles + echo ȷϵͳȷlatexmk... + echo ʹlatexmkܱ... + latexmk -xelatex main.tex + echo * * + echo *********̫ˣıɣ********** + echo * * + goto pauseIfDoubleClicked + +:thesisx + call:checkfiles + echo ı...... + xelatex main.tex + bibtex main.tex + xelatex main.tex + xelatex main.tex + xelatex main.tex + echo * * + echo ***************̫ˣıɣ***************** + echo ʾٶȽƼʹmakewin thesisб롣 + echo * * +goto :EOF + +:cleanaux + echo .auxļ... + for %%i in (*.aux *.bbl *.equ *.glo *.gls *.hd *.idx *.ilg *.ind *.lof *.lot *.out *.blg *.log *.thm *.toc *.synctex.gz *.lofEN *.lotEN *.equEN) do ( + del %%i + ) + echo .auxļɡ +goto :EOF + +:cleanpdf + echo .pdfļ... + for %%i in (*.pdf) do ( + del %%i + ) + echo .pdfļɡ +goto :EOF + +:clean_all + call:cleanaux + call:cleanpdf +goto :EOF + +:extract + echo ȡCQUThesisģļ... + latex cquthesis.ins + echo * * + echo *******ģļȡ******** + echo * * +goto :EOF + +:document + echo CQUThesisûĵ... + set cmode=-interaction=batchmode + 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 + xelatex cquthesis.dtx + echo * * + echo *******ûĵ******** + echo * * +goto :EOF + +:pauseIfDoubleClicked + setlocal enabledelayedexpansion + set testl=%cmdcmdline:"=% + set testr=!testl:%~nx0=! + if not "%testl%" == "%testr%" pause * +goto :EOF diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg index 38f2a8e55a7..214030683c7 100644 --- a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg +++ b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2016-2016 by Zhennan Li +%% Copyright (C) 2016-2017 by Zhennan Li %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3 of this license or (at your option) any later @@ -22,7 +22,7 @@ %% This is the configuration file of the cquthesis package with LaTeX2e. %% \ProvidesFile{cquthesis.cfg} -[2016/12/07 v1.16 Chongqing University Thesis Template] +[2017/05/30 v1.20 Chongqing University Thesis Template] \def\cqueqshortname {式} \def\cqu@denotation@name {主要符号对照表} \def\shorttablename {表} @@ -246,7 +246,7 @@ in Partial Fulfillment of the Requirement for the\\\cqu@edgree} \def\cqu@studentEN{Ph.D. Candidate} \def\cqu@supervisorCN{指导教师} \def\cqu@supervisorEN{Supervised by{ }} -\def\cqu@majorCN{学科专业} +\def\cqu@majorCN{专业} \def\cqu@majorclassCN{学科门类} \def\cqu@majorEN{Specialty} \def\cqu@universitynameCN{重庆大学} diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls index 73b71cc8c00..1874fee805f 100644 --- a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls +++ b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2016-2016 by Zhennan Li +%% Copyright (C) 2016-2017 by Zhennan Li %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3 of this license or (at your option) any later @@ -21,10 +21,10 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{cquthesis} -[2016/12/07 v1.16 Chongqing University Thesis Template] +[2017/05/30 v1.20 Chongqing University Thesis Template] \hyphenation{Cqu-Thesis} \newcommand{\cquthesis}{\textsc{CquThesis}} -\def\version{1.16} +\def\version{1.20} \RequirePackage{kvoptions} \SetupKeyvalOptions{ family=cqu, @@ -39,9 +39,11 @@ setkeys=\kvsetkeys} \DeclareBoolOption{liberalformat} \DeclareBoolOption[true]{academic} \DeclareComplementaryOption{proffesionalmaster}{academic} -\DeclareBoolOption[true]{openany} +\DeclareBoolOption[false]{openany} \DeclareComplementaryOption{openright}{openany} +\DeclareBoolOption[false]{blankleft} \DeclareBoolOption[false]{abstractopenright} +\DeclareBoolOption[false]{blindtrail} \newif\if@onesideprint \newif\if@twosideprint \newif\if@autoprint @@ -160,11 +162,11 @@ CJKbookmarks=false} \fi \let\cqu@cleardoublepage\cleardoublepage \renewcommand{\cleardoublepage}{% -\clearpage{\pagestyle{style@empty}\cqu@cleardoublepage} +\clearpage{\ifcqu@blankleft\pagestyle{style@empty}\fi\cqu@cleardoublepage} }%\cleardoublepage \newcommand\cqu@addblankpage{% \afterpage{% -{\null\pagestyle{style@empty}\clearpage}}} +{\null\ifcqu@blankleft\pagestyle{style@empty}\fi\clearpage}}} \newif\if@backmatter \renewcommand{\frontmatter}{% \@backmatterfalse @@ -192,8 +194,8 @@ subsection/number = \CTEXthesection{}\arabic{subsection},}% \RequirePackage{geometry} \geometry{ a4paper, ignoreall, nomarginpar, -inner=25mm, outer=25mm, top=30mm, bottom=25mm, -bindingoffset=10mm, head=16mm, headsep=5mm, foot=15mm, footnotesep=5mm} +inner=25mm, outer=25mm, top=30mm, bottom=28mm, +bindingoffset=10mm, head=16mm, headsep=11mm, foot=12mm, footnotesep=5mm} \RequirePackage{totcount} \regtotcounter[auxfile=maxpage.aux]{page} \if@autoprint @@ -326,8 +328,9 @@ text-micro = {\textmu}, } \def\cqu@tabular{\zihao{5}\@tabular} \DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti #1~#2}} -\DeclareCaptionLabelSeparator{cqu}{\hspace{\ccwd}} +\DeclareCaptionLabelSeparator{cqu}{\hspace{0.5\ccwd}} \DeclareCaptionFont{cqu}{\zihao{5}\rmfamily\songti} +\captionsetup{justification=centerlast} \captionsetup{labelformat=cqu,labelsep=cqu,font=cqu} \captionsetup[table]{position=top,belowskip=6bp,aboveskip=0bp} \captionsetup[figure]{position=bottom,belowskip=0bp,aboveskip=6bp} @@ -452,6 +455,21 @@ language=Python} \let\rownumtype\xuhaotype \let\setxuhao\xuhaotype \let\rownumseparator\xuhaoseparator +\newcommand{\secretize}[1]{% +\ifcqu@blindtrail +{***} +\else +{#1} +\fi +} +\newcommand{\cqu@@secretizeenv}[1]{\long\gdef\cqu@secretizeenv{#1}} +\newenvironment{secretizeEnv}{\Collect@Body\cqu@@secretizeenv}{% +\ifcqu@blindtrail +\relax +\else +\cqu@secretizeenv +\fi +} \def\cqu@def@term #1{% \define@key{cqu}{#1}{\csname #1\endcsname{##1}} \expandafter\gdef\csname #1\endcsname##1{% @@ -751,9 +769,14 @@ itemindent = 0mm, \renewcommand{\cftafterlottitle}{\hfill} \renewcommand{\cftafterequtitle}{\hfill} \renewcommand{\cftafterequENtitle}{\hfill} +\renewcommand{\cftdot}{…} +\renewcommand{\cftdotsep}{0} +\renewcommand{\cftchapdotsep}{\cftdotsep} +\renewcommand{\cftchapleader}{\cftdotfill{\cftchapdotsep}} +\renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}} \ifcqu@continuoustoc\relax\else -\renewcommand{\@cfttocstart}{\clearpage} -\renewcommand{\@cfttocfinish}{\clearpage} +\renewcommand{\@cfttocstart}{\cleardoublepage} +\renewcommand{\@cfttocfinish}{\cleardoublepage} \fi \newcommand{\chapterstar}[1]{% \chapter*{#1}% -- cgit v1.2.3