From d37c6883e597645a04f685a5e473402cd4ff9944 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Dec 2016 22:29:13 +0000 Subject: cquthesis (11dec16) git-svn-id: svn://tug.org/texlive/trunk@42676 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/cquthesis/README-Chinese.md | 11 ++- Master/texmf-dist/doc/latex/cquthesis/README.md | 4 +- .../doc/latex/cquthesis/contents/appendix.tex | 20 ++++ .../doc/latex/cquthesis/contents/conclusion.tex | 17 ++-- .../doc/latex/cquthesis/contents/introduction.tex | 10 +- .../texmf-dist/doc/latex/cquthesis/cquthesis.pdf | Bin 558393 -> 564908 bytes .../texmf-dist/doc/latex/cquthesis/dtx-style.sty | 12 +++ Master/texmf-dist/doc/latex/cquthesis/main.tex | 18 ++-- .../source/latex/cquthesis/cquthesis.dtx | 101 +++++++++++++-------- .../source/latex/cquthesis/cquthesis.ins | 6 +- .../texmf-dist/tex/latex/cquthesis/cquthesis.cfg | 24 ++--- .../texmf-dist/tex/latex/cquthesis/cquthesis.cls | 33 +++---- 12 files changed, 166 insertions(+), 90 deletions(-) diff --git a/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md b/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md index 285d7493974..efa7a6aa040 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md +++ b/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.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.14.svg)](https://github.com/nanmu42/CQUThesis/commits/master) +[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.16.svg)](https://github.com/nanmu42/CQUThesis/commits/master) CQUThesis表示的是**C**hong**Q**ing **U**niversity **Thesis**. @@ -74,6 +74,8 @@ make cls --- | --- 排版示例 | 请编译`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) @@ -81,8 +83,7 @@ make cls # 用户协议 1. 本模板按照[LaTeX Project Public License](https://latex-project.org/lppl/lppl-1-3.txt)发布,协议版本号为1.3或以后的任何版本(随你意)。本条款不适用于重庆大学LaTeX模板工具箱(CQUThesis Toolkit); -1. 重庆大学教务处和研究生院只提供毕业论文写作指南,不提供官方模板,也不会授权或认证第三方模板为官方模板。 -这个模板是按照写作指南的参考实现,模板作者自当尽力,但不保证审查老师不提意见。任何由于本模板而引起的论文格式审查问题与本模板作者无关。 +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. @@ -98,6 +99,10 @@ 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) +# 论文写作规范 +- [重庆大学本科毕业设计(论文)撰写规范化要求(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仍然可以良好地独立运行。 diff --git a/Master/texmf-dist/doc/latex/cquthesis/README.md b/Master/texmf-dist/doc/latex/cquthesis/README.md index b2ae28ce96f..d01dd8d197a 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/README.md +++ b/Master/texmf-dist/doc/latex/cquthesis/README.md @@ -1,9 +1,9 @@ # 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) +[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.16.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. +**CQUThesis** stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed. ![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png) diff --git a/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex index ba542bc4e45..a73b099d2cd 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex +++ b/Master/texmf-dist/doc/latex/cquthesis/contents/appendix.tex @@ -51,6 +51,26 @@ lengthSummary.to_csv('lengthSummary.csv') \end{Python} +以下是一段供排版测试的C++源代码: + +\begin{C++} +#include +#include +#include +std::vector target2(5); +std::vector target3; +template +void foo(RangeOfInts source) +{ + std::vector target1{std::begin(source), + std::end(source)}; + std::copy(std::begin(source), std::end(source), + std::begin(target2)); + std::copy(std::begin(source), std::end(source), + std::back_inserter(target3)); +} +\end{C++} + \section{附录的图和表} 以下内容用来测试附录中的插图和插表是否正常,主要的关注点在题注: diff --git a/Master/texmf-dist/doc/latex/cquthesis/contents/conclusion.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/conclusion.tex index 4d72732a3a5..433b1e6aeb5 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/contents/conclusion.tex +++ b/Master/texmf-dist/doc/latex/cquthesis/contents/conclusion.tex @@ -1,15 +1,20 @@ \chapter{结论} \section{关于开发}\label{sec:dev} -本项目开源托管于Github,地址为\url{https://github.com/nanmu42/CQUThesis} +本项目开源托管于Github,欢迎提交建议和意见,欢迎高质量的PR。项目地址为\url{https://github.com/nanmu42/CQUThesis} \section{关于下载} \begin{itemize} - \item 发行版本,托管于\texttt{CTAN},\url{https://www.ctan.org/pkg/cquthesis}; - \item 开发版本,位于Github,参见\ref{sec:dev}节。 + \item 发行版本,托管于CTAN,\url{https://www.ctan.org/pkg/cquthesis}; + \item 开发版本,位于Github,这个版本的更新最快,推荐使用。地址参见\ref{sec:dev}节。 \end{itemize} \section{求助方案} \begin{itemize} - \item 在Github提交Issue; - \item 造访重庆大学7117工作室寻求支持 + \item 在Github上提交Issue,地址:\url{https://github.com/nanmu42/cquthesis/issues} + \item 加入重庆大学\TeX 用户组进行讨论\footnote{即使您不是重庆大学的学子,只要您对\TeX 足够热爱并且为人友善,我们也会热诚地欢迎您。},地址:\url{http://jq.qq.com/?_wv=1027&k=2HvYu95} \end{itemize} + +大家的反馈为模板提高带来机会。 \section{Happy Texing!} -祝你好运! \ No newline at end of file +祝你好运! + +\bigskip +\hfill ——李振楠 2016年12月7日 \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/cquthesis/contents/introduction.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/introduction.tex index d6a440c60f1..8d603b2e1cf 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/contents/introduction.tex +++ b/Master/texmf-dist/doc/latex/cquthesis/contents/introduction.tex @@ -8,13 +8,19 @@ 本文档编译时使用的\cquthesis{}版本为\version{}。 -请注意到\url{https://github.com/nanmu42/CQUThesis}检查更新。 +请留意到本链接检查更新:\url{https://github.com/nanmu42/CQUThesis} \section{关于\LaTeX{}} \noindent{\heiti{}提示:}{\kaishu{}下面是一些基本思路和知识,如果你已经对\LaTeX{}比较熟悉,请直接跳转到第\ref{txt:FreqCmd}节。} +\subsection{关于推荐重庆大学开设\TeX 相关课程并推广其运用的提议} +这一小节是对\href{http://jq.qq.com/?_wv=1027&k=2HvYu95}{重庆大学\TeX 用户组}所撰写的提案的简介。 -\subsection{\LaTeX{}小史} +本提案从介绍排版系统\TeX 的背景和特点开始,从研究生期刊论文投稿以及毕业生毕业论文排版工作这两个维度阐述了引入\TeX 作为一种与Office Word平行的写作系统的优势和必要性,最终提出一套基于我校重庆大学实际情况,有效可行的实施方案。 + +这份提案可以作为新手从全局认识\TeX 的入门材料,提案的下载地址是:\url{https://github.com/CQUtug/TeXProposal} + +\subsection{\LaTeX{}小传} \LaTeX{}是\TeX{}的改进版本,后者由Knuth(高德纳)在上世纪七十年代研发,包含\TeX{}排版程序和Plain \TeX{}宏集这两部分。Plain \TeX{}可以看做是一种既定语法的编程语言,源代码对应文件后缀为\pkg{.tex},而\TeX{}程序对源代码进行解析,编译,得到排版结果。上世纪八十年代,\LaTeX{}对Plain \TeX{}的语言体系进行了升级和重构,使得\TeX{}的易用性获得了质的提升。 \TeX{}有着很多分支,比如\LaTeX{}, \LuaTeX{}和\XeTeX{}。每个分支的产生都是为了解决不同的问题。其中,\XeTeX{}提供了对东亚字体(中日韩)的原生支持。 diff --git a/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf index 16cf1b9cbb0..2111b7ea8b6 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 81273520106..8116672b1c1 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty +++ b/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty @@ -20,6 +20,7 @@ %% LaTeX version 2005/12/01 or later. %% \ProvidesPackage{dtx-style} +\RequirePackage[bottom,perpage,hang,]{footmisc} \RequirePackage{hypdoc} \RequirePackage[UTF8,scheme=chinese]{ctex} \RequirePackage{newpxtext} @@ -37,6 +38,17 @@ headsep=3mm]{geometry} \RequirePackage{metalogo} \RequirePackage{graphicx} \RequirePackage{xspace} +\RequirePackage{pifont} + +\def\footnoterule{\vskip-3\p@\hrule\@width0.3\textwidth\@height0.4\p@\vskip2.6\p@} +\let\cqu@footnotesize\footnotesize +\renewcommand{\footnotesize}{\cqu@footnotesize\zihao{-5}} +\footnotemargin1.5em\relax + +\let\cqu@makefnmark\@makefnmark +\def\cqu@@makefnmark{\mbox{{\normalfont\@thefnmark}}} +\pretocmd{\@makefntext}{\let\@makefnmark\cqu@@makefnmark}{}{} +\apptocmd{\@makefntext}{\let\@makefnmark\cqu@makefnmark}{}{} \colorlet{cqu@macro}{blue!60!black} \colorlet{cqu@env}{blue!70!black} diff --git a/Master/texmf-dist/doc/latex/cquthesis/main.tex b/Master/texmf-dist/doc/latex/cquthesis/main.tex index 871c40c93b8..191e99bfdd9 100644 --- a/Master/texmf-dist/doc/latex/cquthesis/main.tex +++ b/Master/texmf-dist/doc/latex/cquthesis/main.tex @@ -5,15 +5,15 @@ \documentclass% [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, % 写作期间可选,不渲染图片,关闭外围功能,加快预览速度,默认未开启 +% 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, % 写作期间可选,不渲染图片,关闭外围功能,加快预览速度,默认未开启 % 请在cquthesis.sty文件中定义其他会用到的宏包和自己的变量 % 这样可以防止main.tex太过臃肿。 diff --git a/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx b/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx index 70ed872f91a..1136b11b8b0 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/08/18 v1.14 Chongqing University Thesis Template] +\ProvidesFile{cquthesis.dtx}[2016/12/07 v1.16 Chongqing University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -30,7 +30,7 @@ % % \fi % -% \CheckSum{0} +% \CheckSum{1852} % % \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 @@ -101,14 +101,14 @@ % \end{center} % \vspace{\stretch{2}} % \begin{abstract}\noindent -% \cquthesis{}是重庆大学毕业论文的\LaTeX{}模板,支持学士(文学、理工)、硕士(学术、专业)、博士论文的排版。 +% \cquthesis\footnote{\url{https://github.com/nanmu42/CQUThesis}}是重庆大学毕业论文的\LaTeX{}模板,支持学士(文学、理工)、硕士(学术、专业)、博士论文的排版。 % \end{abstract} % \vspace{\stretch{1}} % \def\abstractname{用户协议} % \begin{abstract}\noindent % \begin{enumerate} % \item 本模板按照LaTeX Project Public License发布,协议版本号为1.3或以后的任何版本(随你意); -% \item 重庆大学教务处和研究生院只提供毕业论文写作指南,不提供官方模板,也不会授权或认证第三方模板为官方模板。 这个模板是按照写作指南的参考实现,模板作者自当尽力,但不保证审查老师不提意见。任何由于本模板而引起的论文格式审查问题与本模板作者无关。 +% \item 截止本文档编译时,重庆大学教务处和研究生院只提供了\href{https://github.com/nanmu42/CQUThesis/tree/master/toolkit}{毕业论文写作指南},没有提供官方模板,也没有授权或认证任何第三方模板为官方模板\footnote{\href{http://jq.qq.com/?_wv=1027&k=2HvYu95}{重庆大学\TeX 用户组}正在推动学校\href{https://github.com/CQUtug/TeXProposal}{认证\cquthesis} 。}。本模板是按照写作指南的参考实现,模板作者自当尽力,但不保证审查老师不提意见。在开始使用前,您同意,任何由于本模板而引起的论文格式审查问题与本模板作者无关。 % \end{enumerate} % \vskip2cm % \end{abstract} @@ -152,7 +152,7 @@ % \item Linux和Mac用户,推荐使用\TeX Live,这是一套大而全的\TeX{}发行版,考虑到使用这两个系统的用户动手能力相对较强,\TeX Live没法自己解决依赖这个问题应该不是很让人头疼\footnote{使用宏包管理器或者从CTAN获取依赖宏包。}。 % \end{itemize} % -% 本模板在Windows和Mac环境下的TeX Live发行版中都进行了编译测试。 +% 本模板在Windows和Mac环境下的\TeX Live发行版中都进行了编译测试。 % % \note{在条件允许的情况下,强烈推荐您使用\XeTeX 引擎进行编译工作。} % @@ -160,8 +160,8 @@ % 您可通过三个主要途径获取\cquthesis : % % \begin{itemize} -% \item 造访\cquthesis{ } \href{https://github.com/nanmu42/CQUThesis/releases}{Github主页}下载最新的预发行版本,这是更新最快,功能最全的版本(含工具箱Toolkit); -% \item 访问本模板\href{http://www.ctan.org/pkg/cquthesis}{CTAN官方镜像}下载发行版,这个版本定期从预发行版本同步(不含工具箱Toolkit\footnote{这是出于许可证方面的考虑。}); +% \item 造访\cquthesis 的 \href{https://github.com/nanmu42/CQUThesis}{Github主页}下载最新的开发版本,这是更新最快,功能最全的版本(含工具箱Toolkit); +% \item 访问本模板\href{https://www.ctan.org/pkg/cquthesis}{CTAN官方镜像}下载发行版,这个版本定期从预发行版本同步(不含工具箱Toolkit\footnote{这是出于许可证方面的考虑。}); % \item 使用Mik \TeX 或\TeX Live的宏包管理功能直接获得本模板,这个方式不含模板示例文件。 % \end{itemize} % @@ -192,6 +192,7 @@ % contents/ & 示例文档章节具体内容\\ % figures/ & 示例文档图片路径\\ % ref/ & 示例文档参考文献目录\\ +% toolkit/ & 额外的写作工具箱\\ % cquthesis.sty & 为示例文档加载其它宏包\\\midrule % README-English & 英文安装提示,推荐中高阶用户阅读\\ % README.md & Readme\\ @@ -741,10 +742,10 @@ % 遇到难以解决的问题了?欢迎您向我反馈,您可以: % \begin{itemize} % \item 在Github上\href{https://github.com/nanmu42/cquthesis/issues}{提交Issue}; -% \item 莅临重庆大学7117工作室垂询 +% \item 加入\href{http://jq.qq.com/?_wv=1027&k=2HvYu95}{重庆大学\TeX 用户组}进行讨论\footnote{即使您不是重庆大学的学子,只要您对\TeX 足够热爱并且为人友善,我们也会热诚地欢迎您。}。 %\end{itemize} % -% 大家的反馈是模板提高的机会。 +% 大家的反馈为模板提高带来机会。 % \section{致谢} % 这个模板是站在巨人肩膀上的成果,感谢\LaTeXe{}计划,感谢CTeX开发组提供的中文解决方案,感谢薛瑞尼副教授(Github: xueruini/ThuThesis),感谢WeiJianWen同学(Github: weijianwen/SJTUThesis),感谢中国科学技术大学TeX用户组(Github: ustctug/gbt-7714-2015)。向你们致以真诚的问候和感激! % @@ -759,14 +760,14 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{cquthesis} %\ProvidesFile{cquthesis.cfg} -%[2016/08/18 v1.14 Chongqing University Thesis Template] +%[2016/12/07 v1.16 Chongqing University Thesis Template] % \end{macrocode} % 定义一些开发常量: % \begin{macrocode} %<*cls> \hyphenation{Cqu-Thesis} \newcommand{\cquthesis}{\textsc{CquThesis}} -\def\version{1.14} +\def\version{1.16} % % \end{macrocode} % \file{cquthesis.cfg}中,涉及文档部件的部分常量: @@ -778,7 +779,7 @@ \def\shorttablename {表} \def\shorttablenameEN {Table} \def\shortfigurename {图} -\def\shortfigurenameEN {Figure} +\def\shortfigurenameEN {Fig.} \def\listofequationsname {重要算式索引} \def\listofequationsnameEN {\textbf{List of Equations}} \def\listoffiguresnameEN {\textbf{List of Figures}} @@ -1193,7 +1194,8 @@ % \end{macrocode} % % \subsection{各级标题} -% 各级标题设置: +% 各级标题设置,使用\option{fixskip}来抑制三级和四级标题的额外间距。这里的\option{beforeskip}和\option{afterskip}是与Word样例对比后通过尝试得出的。 +% \changes{v1.16}{2016/12/07}{去除了三级和四级标题的额外垂直间距。} % \begin{macrocode} %<*cfg> \ctexset{% @@ -1215,8 +1217,8 @@ titleformat = \zihao{-3}, aftername = \hskip\ccwd, number = {\ifcqu@liberalformat\parenthesesthis{\chinese{section}}\else\thesection\fi}, - beforeskip = 24bp \@plus 1ex \@minus .2ex, - afterskip = 6bp \@plus .2ex, + beforeskip = 24bp plus 1ex minus .2ex, + afterskip = 6bp plus .2ex, }, subsection = {% name = {}, @@ -1225,8 +1227,9 @@ titleformat = \zihao{4}, aftername = \hskip\ccwd, number = {\ifcqu@liberalformat\arabic{subsection}\else\thesubsection\fi}, - beforeskip = 16bp \@plus 1ex \@minus .2ex, - afterskip = 6bp \@plus .2ex, + beforeskip = 12bp plus 1bp, + afterskip = 10bp, + fixskip = true, }, subsubsection = { name = {}, @@ -1236,8 +1239,9 @@ numbering = true, number = {\ifcqu@liberalformat\parenthesesthis{\arabic{subsubsection}}\else\@circlenum{subsubsection}\fi}, numberformat+ = {\ifcqu@liberalformat\relax\else\zihao{4}\fi}, - beforeskip = 1ex plus 0.5ex minus .2ex, - afterskip = 1bp \@plus .1ex, + beforeskip = 10bp plus .5bp, + afterskip = 10bp, + fixskip = true, }, appendix = {% numbering = false, @@ -1441,16 +1445,17 @@ % % \subsubsection{浮动对象} % 设定浮动对象与文字的间距 +% \changes{v1.16}{2016/12/07}{优化浮动对象与文字的间距。} % \begin{macrocode} %<*cls> -\setlength{\floatsep}{20bp \@plus4pt \@minus1pt} -\setlength{\intextsep}{24bp \@plus4pt \@minus2pt} -\setlength{\textfloatsep}{20bp \@plus4pt \@minus2pt} -\setlength{\@fptop}{6bp \@plus2bp} -\setlength{\@fpsep}{12bp \@plus2bp} -\setlength{\@fpbot}{6bp \@plus2bp} +\setlength{\floatsep}{20bp plus2bp minus2bp} +\setlength{\intextsep}{20bp plus2bp minus2bp} +\setlength{\textfloatsep}{20bp plus2bp minus2bp} +\setlength{\@fptop}{6bp plus2bp} +\setlength{\@fpsep}{12bp plus2bp} +\setlength{\@fpbot}{6bp plus2bp} % \end{macrocode} -% 让浮动对象缺省值更宽松 +% 让浮动对象的页面缺省值更宽松 % \begin{macrocode} \renewcommand{\textfraction}{0.15} \renewcommand{\topfraction}{0.85} @@ -1489,16 +1494,17 @@ % \end{macro} % \end{macro} % \end{macro} -% 定制表格和插图的题注样式: +% 定制表格和插图的题注样式,这里注意\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}{正文中的题注的名称和序号不再加粗,同时优化了题注和插图(插表)的垂直距离。} % \begin{macrocode} \def\cqu@tabular{\zihao{5}\@tabular} -\DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti \textbf{#1~#2}}} +\DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti #1~#2}} \DeclareCaptionLabelSeparator{cqu}{\hspace{\ccwd}} \DeclareCaptionFont{cqu}{\zihao{5}\rmfamily\songti} \captionsetup{labelformat=cqu,labelsep=cqu,font=cqu} -\captionsetup[table]{position=top,belowskip={12bp-\intextsep},aboveskip=6bp} -\captionsetup[figure]{position=bottom,belowskip={12bp-\intextsep},aboveskip=6bp} +\captionsetup[table]{position=top,belowskip=6bp,aboveskip=0bp} +\captionsetup[figure]{position=bottom,belowskip=0bp,aboveskip=6bp} \captionsetup[sub]{font=cqu,skip=6bp} \renewcommand{\thesubfigure}{(\alph{subfigure})} \renewcommand{\thesubtable}{(\alph{subtable})} @@ -1620,12 +1626,14 @@ language=Python} % \end{macrocode} % \end{environment} -% \begin{environment}{Cplus} +% \begin{environment}{C++} +% \changes{v1.16}{2016/12/07}{出于简明的考虑,\env{Cplus}环境现在已经更名为\env{C++}环境。\env{Cplus}环境为历史兼容而保留定义。修改了语言环境定义中的一个错误,现在C++和Python环境能够正确地进行代码上色了。} % \begin{environment}{Python} -% \cquthesis 内置了两个代码环境,\env{Cplus}和\env{Python},您可以参照代码在\file{cquthesis.sty}中定义自己的环境。 +% \cquthesis 内置了两个代码环境,\env{C++}和\env{Python},您可以参照代码在\file{cquthesis.sty}中定义自己的环境。\env{Cplus}环境为历史兼容而保留定义。 % \begin{macrocode} -\lstnewenvironment{Cplus}{\lstset{style=lstStylePython}}{} -\lstnewenvironment{Python}{\lstset{style=lstStyleCplus}}{} +\lstnewenvironment{C++}{\lstset{style=lstStyleCplus}}{} +\lstnewenvironment{Cplus}{\lstset{style=lstStyleCplus}}{} +\lstnewenvironment{Python}{\lstset{style=lstStylePython}}{} % \end{macrocode} % \end{environment} % \end{environment} @@ -1869,6 +1877,7 @@ % \begin{macro}{\make@cover@EN} % 英文封面由于不需要汉字两端对齐,相对来说排版难度低一些: % \changes{v1.14}{2016/08/18}{“助理指导教师”“校外指导教师”的英文字段也相应添加,同样自动判定是否有输入来决定是否显示。} +% \changes{v1.16}{2016/12/07}{修正英文封面的指导教师的表达。另外,让“by”加粗了。} % \begin{macrocode} \newcommand{\make@cover@EN}{% \cleardoublepage @@ -1884,7 +1893,7 @@ \includegraphics[width=5cm]{CQUbadge.pdf} \\ \vspace{\stretch{2}} \zihao{3}\textbf{\cqu@studentEN\cqu@title@separatorEN\mbox{\cqu@eauthor}}\\ - \cqu@supervisorEN\cqu@title@separatorEN\mbox{\cqu@esupervisor}\\ + \cqu@supervisorEN\mbox{\cqu@esupervisor}\\ \ifdefstring{\cqu@eassistsupervisor}{}{\relax}{\cqu@assistsupervisorEN\cqu@title@separatorEN\mbox{\cqu@eassistsupervisor}\\} \cqu@majorEN\cqu@title@separatorEN\mbox{\cqu@emajor} \else @@ -1894,11 +1903,11 @@ \\ \vspace{\stretch{2}} \zihao{3}\cqu@thesistypenameEN \\[1mm] - \cqu@workby + \textbf{\cqu@workby} \\[2mm] \zihao{3}\mbox{\textbf{\cqu@eauthor}} \\ \vspace{\stretch{1}} - \textbf{\cqu@supervisorEN\cqu@title@separatorEN}\textbf{\cqu@esupervisor}\\ + \textbf{\cqu@supervisorEN}\textbf{\cqu@esupervisor}\\ \ifcqu@academic\relax\else\textbf{\cqu@psupervisorEN\cqu@title@separatorEN\cqu@epsupervisor}\\\fi \textbf{\cqu@majorEN\cqu@title@separatorEN}\mbox{\textbf{\cqu@emajor}} \fi @@ -2047,7 +2056,7 @@ \def\cqu@studentEN{Undergraduate} \def\cqu@studentnumCN{学号} \def\cqu@supervisorCN{指导教师} - \def\cqu@supervisorEN{Supervisor} + \def\cqu@supervisorEN{Supervised by{ }} \def\cqu@assistsupervisorCN{助理指导教师} \def\cqu@extrasupervisorCN{校外指导教师} \def\cqu@assistsupervisorEN{Assistant Supervisor} @@ -2063,7 +2072,7 @@ \ifcqu@academic{ }the\fi\\\cqu@edgree} \def\cqu@studentCN{学生姓名} \def\cqu@supervisorCN{指导教师} - \def\cqu@supervisorEN{Supervisor} + \def\cqu@supervisorEN{Supervised by{ }} \def\cqu@psupervisorCN{兼职导师} \def\cqu@psupervisorEN{Pluralistic~Supervisor} \def\cqu@majorCN{专业} @@ -2085,7 +2094,7 @@ \def\cqu@studentCN{学生姓名} \def\cqu@studentEN{Ph.D. Candidate} \def\cqu@supervisorCN{指导教师} - \def\cqu@supervisorEN{Supervisor} + \def\cqu@supervisorEN{Supervised by{ }} \def\cqu@majorCN{学科专业} \def\cqu@majorclassCN{学科门类} \def\cqu@majorEN{Specialty} @@ -2314,6 +2323,7 @@ % \begin{macrocode} %<*dtx-style> \ProvidesPackage{dtx-style} +\RequirePackage[bottom,perpage,hang,]{footmisc} \RequirePackage{hypdoc} \RequirePackage[UTF8,scheme=chinese]{ctex} \RequirePackage{newpxtext} @@ -2331,6 +2341,17 @@ headsep=3mm]{geometry} \RequirePackage{metalogo} \RequirePackage{graphicx} \RequirePackage{xspace} +\RequirePackage{pifont} + +\def\footnoterule{\vskip-3\p@\hrule\@width0.3\textwidth\@height0.4\p@\vskip2.6\p@} +\let\cqu@footnotesize\footnotesize +\renewcommand{\footnotesize}{\cqu@footnotesize\zihao{-5}} +\footnotemargin1.5em\relax + +\let\cqu@makefnmark\@makefnmark +\def\cqu@@makefnmark{\mbox{{\normalfont\@thefnmark}}} +\pretocmd{\@makefntext}{\let\@makefnmark\cqu@@makefnmark}{}{} +\apptocmd{\@makefntext}{\let\@makefnmark\cqu@makefnmark}{}{} \colorlet{cqu@macro}{blue!60!black} \colorlet{cqu@env}{blue!70!black} diff --git a/Master/texmf-dist/source/latex/cquthesis/cquthesis.ins b/Master/texmf-dist/source/latex/cquthesis/cquthesis.ins index 640e2915d63..b1fad28b4ee 100644 --- a/Master/texmf-dist/source/latex/cquthesis/cquthesis.ins +++ b/Master/texmf-dist/source/latex/cquthesis/cquthesis.ins @@ -65,7 +65,7 @@ This is the configuration file of the cquthesis package with LaTeX2e. \file{dtx-style.sty}{\from{\jobname.dtx}{dtx-style}}} \ifToplevel{% - \Msg{**************************CQUThesis INFO******************} + \Msg{********************CQUThesis INFO******************} \Msg{*} \Msg{* To finish the installation you have to move the following} \Msg{* files into a directory searched by TeX:} @@ -74,6 +74,7 @@ This is the configuration file of the cquthesis package with LaTeX2e. \Msg{*} \Msg{* \space\space cquthesis.cls} \Msg{* \space\space cquthesis.cfg} + \Msg{* \space\space cqunumerical.sty} \Msg{* \space\space cqunumerical.bst} \Msg{*} \Msg{* To produce the documentation please run these command:} @@ -89,6 +90,9 @@ This is the configuration file of the cquthesis package with LaTeX2e. \Msg{* \space xelatex main.tex} \Msg{* \space xelatex main.tex} \Msg{*} + \Msg{* ============== Tips =================} + \Msg{* Check makewin.bat and/or .Makefile for a *smoother* way to compile. :) } + \Msg{*} \Msg{* For further info, please go to:} \Msg{* \space\space https://github.com/nanmu42/CQUThesis} \Msg{*} diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg index 763888259ff..38f2a8e55a7 100644 --- a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg +++ b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg @@ -22,13 +22,13 @@ %% This is the configuration file of the cquthesis package with LaTeX2e. %% \ProvidesFile{cquthesis.cfg} -[2016/08/18 v1.14 Chongqing University Thesis Template] +[2016/12/07 v1.16 Chongqing University Thesis Template] \def\cqueqshortname {式} \def\cqu@denotation@name {主要符号对照表} \def\shorttablename {表} \def\shorttablenameEN {Table} \def\shortfigurename {图} -\def\shortfigurenameEN {Figure} +\def\shortfigurenameEN {Fig.} \def\listofequationsname {重要算式索引} \def\listofequationsnameEN {\textbf{List of Equations}} \def\listoffiguresnameEN {\textbf{List of Figures}} @@ -55,8 +55,8 @@ nameformat = \bfseries\zihao{-3}, titleformat = \zihao{-3}, aftername = \hskip\ccwd, number = {\ifcqu@liberalformat\parenthesesthis{\chinese{section}}\else\thesection\fi}, -beforeskip = 24bp \@plus 1ex \@minus .2ex, -afterskip = 6bp \@plus .2ex, +beforeskip = 24bp plus 1ex minus .2ex, +afterskip = 6bp plus .2ex, }, subsection = {% name = {}, @@ -65,8 +65,9 @@ nameformat = \bfseries\zihao{4}, titleformat = \zihao{4}, aftername = \hskip\ccwd, number = {\ifcqu@liberalformat\arabic{subsection}\else\thesubsection\fi}, -beforeskip = 16bp \@plus 1ex \@minus .2ex, -afterskip = 6bp \@plus .2ex, +beforeskip = 12bp plus 1bp, +afterskip = 10bp, +fixskip = true, }, subsubsection = { name = {}, @@ -76,8 +77,9 @@ aftertitle = {}, numbering = true, number = {\ifcqu@liberalformat\parenthesesthis{\arabic{subsubsection}}\else\@circlenum{subsubsection}\fi}, numberformat+ = {\ifcqu@liberalformat\relax\else\zihao{4}\fi}, -beforeskip = 1ex plus 0.5ex minus .2ex, -afterskip = 1bp \@plus .1ex, +beforeskip = 10bp plus .5bp, +afterskip = 10bp, +fixskip = true, }, appendix = {% numbering = false, @@ -205,7 +207,7 @@ range-phrase = {$ \sim $}, \def\cqu@studentEN{Undergraduate} \def\cqu@studentnumCN{学号} \def\cqu@supervisorCN{指导教师} -\def\cqu@supervisorEN{Supervisor} +\def\cqu@supervisorEN{Supervised by{ }} \def\cqu@assistsupervisorCN{助理指导教师} \def\cqu@extrasupervisorCN{校外指导教师} \def\cqu@assistsupervisorEN{Assistant Supervisor} @@ -221,7 +223,7 @@ in Partial Fulfillment of the Requirement for% \ifcqu@academic{ }the\fi\\\cqu@edgree} \def\cqu@studentCN{学生姓名} \def\cqu@supervisorCN{指导教师} -\def\cqu@supervisorEN{Supervisor} +\def\cqu@supervisorEN{Supervised by{ }} \def\cqu@psupervisorCN{兼职导师} \def\cqu@psupervisorEN{Pluralistic~Supervisor} \def\cqu@majorCN{专业} @@ -243,7 +245,7 @@ in Partial Fulfillment of the Requirement for the\\\cqu@edgree} \def\cqu@studentCN{学生姓名} \def\cqu@studentEN{Ph.D. Candidate} \def\cqu@supervisorCN{指导教师} -\def\cqu@supervisorEN{Supervisor} +\def\cqu@supervisorEN{Supervised by{ }} \def\cqu@majorCN{学科专业} \def\cqu@majorclassCN{学科门类} \def\cqu@majorEN{Specialty} diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls index 6445c6db8c0..73b71cc8c00 100644 --- a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls +++ b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls @@ -21,10 +21,10 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{cquthesis} -[2016/08/18 v1.14 Chongqing University Thesis Template] +[2016/12/07 v1.16 Chongqing University Thesis Template] \hyphenation{Cqu-Thesis} \newcommand{\cquthesis}{\textsc{CquThesis}} -\def\version{1.14} +\def\version{1.16} \RequirePackage{kvoptions} \SetupKeyvalOptions{ family=cqu, @@ -294,12 +294,12 @@ math-micro = {\upmu}, text-micro = {\textmu}, }%\sisetup \fi -\setlength{\floatsep}{20bp \@plus4pt \@minus1pt} -\setlength{\intextsep}{24bp \@plus4pt \@minus2pt} -\setlength{\textfloatsep}{20bp \@plus4pt \@minus2pt} -\setlength{\@fptop}{6bp \@plus2bp} -\setlength{\@fpsep}{12bp \@plus2bp} -\setlength{\@fpbot}{6bp \@plus2bp} +\setlength{\floatsep}{20bp plus2bp minus2bp} +\setlength{\intextsep}{20bp plus2bp minus2bp} +\setlength{\textfloatsep}{20bp plus2bp minus2bp} +\setlength{\@fptop}{6bp plus2bp} +\setlength{\@fpsep}{12bp plus2bp} +\setlength{\@fpbot}{6bp plus2bp} \renewcommand{\textfraction}{0.15} \renewcommand{\topfraction}{0.85} \renewcommand{\bottomfraction}{0.65} @@ -325,12 +325,12 @@ text-micro = {\textmu}, \fi} } \def\cqu@tabular{\zihao{5}\@tabular} -\DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti \textbf{#1~#2}}} +\DeclareCaptionLabelFormat{cqu}{{\zihao{5}\rmfamily\songti #1~#2}} \DeclareCaptionLabelSeparator{cqu}{\hspace{\ccwd}} \DeclareCaptionFont{cqu}{\zihao{5}\rmfamily\songti} \captionsetup{labelformat=cqu,labelsep=cqu,font=cqu} -\captionsetup[table]{position=top,belowskip={12bp-\intextsep},aboveskip=6bp} -\captionsetup[figure]{position=bottom,belowskip={12bp-\intextsep},aboveskip=6bp} +\captionsetup[table]{position=top,belowskip=6bp,aboveskip=0bp} +\captionsetup[figure]{position=bottom,belowskip=0bp,aboveskip=6bp} \captionsetup[sub]{font=cqu,skip=6bp} \renewcommand{\thesubfigure}{(\alph{subfigure})} \renewcommand{\thesubtable}{(\alph{subtable})} @@ -412,8 +412,9 @@ style=lstStyleBase, frame=l, rulecolor=\color{cyan}, language=Python} -\lstnewenvironment{Cplus}{\lstset{style=lstStylePython}}{} -\lstnewenvironment{Python}{\lstset{style=lstStyleCplus}}{} +\lstnewenvironment{C++}{\lstset{style=lstStyleCplus}}{} +\lstnewenvironment{Cplus}{\lstset{style=lstStyleCplus}}{} +\lstnewenvironment{Python}{\lstset{style=lstStylePython}}{} \newcounter{cquXuHao} \newcounter{cquXuHaoType} \setcounter{cquXuHaoType}{1} @@ -575,7 +576,7 @@ language=Python} \includegraphics[width=5cm]{CQUbadge.pdf} \\ \vspace{\stretch{2}} \zihao{3}\textbf{\cqu@studentEN\cqu@title@separatorEN\mbox{\cqu@eauthor}}\\ -\cqu@supervisorEN\cqu@title@separatorEN\mbox{\cqu@esupervisor}\\ +\cqu@supervisorEN\mbox{\cqu@esupervisor}\\ \ifdefstring{\cqu@eassistsupervisor}{}{\relax}{\cqu@assistsupervisorEN\cqu@title@separatorEN\mbox{\cqu@eassistsupervisor}\\} \cqu@majorEN\cqu@title@separatorEN\mbox{\cqu@emajor} \else @@ -585,11 +586,11 @@ language=Python} \\ \vspace{\stretch{2}} \zihao{3}\cqu@thesistypenameEN \\[1mm] -\cqu@workby +\textbf{\cqu@workby} \\[2mm] \zihao{3}\mbox{\textbf{\cqu@eauthor}} \\ \vspace{\stretch{1}} -\textbf{\cqu@supervisorEN\cqu@title@separatorEN}\textbf{\cqu@esupervisor}\\ +\textbf{\cqu@supervisorEN}\textbf{\cqu@esupervisor}\\ \ifcqu@academic\relax\else\textbf{\cqu@psupervisorEN\cqu@title@separatorEN\cqu@epsupervisor}\\\fi \textbf{\cqu@majorEN\cqu@title@separatorEN}\mbox{\textbf{\cqu@emajor}} \fi -- cgit v1.2.3