summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/cquthesis
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/cquthesis')
-rw-r--r--macros/latex/contrib/cquthesis/CONTRIBUTORS.md5
-rw-r--r--macros/latex/contrib/cquthesis/README-Chinese.md22
-rw-r--r--macros/latex/contrib/cquthesis/README.md12
-rw-r--r--macros/latex/contrib/cquthesis/cquthesis.cwl104
-rw-r--r--macros/latex/contrib/cquthesis/cquthesis.dtx23
-rw-r--r--macros/latex/contrib/cquthesis/cquthesis.pdfbin1084846 -> 1090499 bytes
-rw-r--r--macros/latex/contrib/cquthesis/cquthesis.sty19
7 files changed, 51 insertions, 134 deletions
diff --git a/macros/latex/contrib/cquthesis/CONTRIBUTORS.md b/macros/latex/contrib/cquthesis/CONTRIBUTORS.md
index 1c98767fbd..82eaaa500a 100644
--- a/macros/latex/contrib/cquthesis/CONTRIBUTORS.md
+++ b/macros/latex/contrib/cquthesis/CONTRIBUTORS.md
@@ -13,11 +13,10 @@ CQUThesis是一个绵薄的开源项目,自从2016年5月份上线以来,很
* **Zousiyu**(重庆大学TeX用户组成员,他贡献了开发思路)
* **Lotus**(重庆大学TeX用户组成员,他在群里各种 ~~瞎~~ 带节奏)
* **珍惜拥有**(重庆大学TeX用户组成员,他反馈了`bst`文件过时的问题)
+* **@Neuromancer43** (他贡献了[这些PR](https://github.com/nanmu42/CQUThesis/pulls?q=is%3Apr+author%3ANeuromancer43))
还有,
* 我的母校,**重庆大学**
* 最后,当然是[重庆大学TeX用户组](http://jq.qq.com/?_wv=1027&k=2HvYu95)的全体同仁
-在此,向诸位致以最真诚的谢意,因为你们,CQUThesis才能够越走越稳,直到今天!
-
-2017年5月30日 —— CQUThesis 一岁整 \ No newline at end of file
+在此,向诸位致以最真诚的谢意。 \ No newline at end of file
diff --git a/macros/latex/contrib/cquthesis/README-Chinese.md b/macros/latex/contrib/cquthesis/README-Chinese.md
index 7e03272dd1..14a528a209 100644
--- a/macros/latex/contrib/cquthesis/README-Chinese.md
+++ b/macros/latex/contrib/cquthesis/README-Chinese.md
@@ -1,13 +1,14 @@
-# 嗨,这里是CQUThesis!
+# CQUThesis:重庆大学毕业论文LaTeX模板
+
[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](https://travis-ci.org/nanmu42/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.40.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.50.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**.
-本宏包是重庆大学毕业论文的`\LaTeX{}`模板,支持学士、硕士、博士论文的排版。合理使用本宏包可以大大减轻重庆大学毕业生在毕业论文撰写过程中的排版工作量。
+本宏包是重庆大学毕业论文的`\LaTeX{}`模板,支持学士、硕士、博士论文的排版,熟悉LaTeX的同学在合理使用本宏包的情况下可以减轻毕业论文撰写过程中的排版工作量。
CQUThesis根据重庆大学《重庆大学本科设计(论文)撰写规范化要求(2007年修订版)》和《重庆大学博士、硕士论文撰写格式标准(2007年修订版)》编写,力求合规,简洁,易于实现,用户友好。
@@ -18,11 +19,17 @@ CQUThesis根据重庆大学《重庆大学本科设计(论文)撰写规范
* 自动侦测文档页数,生成相应的单面打印/双面打印PDF文件;
* 预置一批优化过的宏包和小功能,包含中英双语题注及配套图录、表录,国际标准单位、化学式支持、三线表等,可按需开启;
* 支持基于cwl文件的代码着色和补全,makefile功能能够在Linux, Mac, Windows三平台通用;
-* 每周自动进行持续集成测试,保证模板在最新宏包环境下能够正常运行。
+* 每周自动进行持续集成测试,保证模板在最新宏包环境下能够正常运行,当前状态:[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](https://travis-ci.org/nanmu42/CQUThesis)
![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png)
+# 用户协议
+
+1. 本模板按照[LaTeX Project Public License](https://latex-project.org/lppl/lppl-1-3.txt)发布,协议版本号为1.3或以后的任何版本(随你意)。本条款不适用于重庆大学LaTeX模板工具箱(CQUThesis Toolkit);
+1. 截止本文档编辑时,重庆大学教务处和研究生院只提供了毕业论文写作指南,没有提供官方模板,也没有授权或认证任何第三方模板为官方模板。本模板是按照写作指南的参考实现,模板作者自当尽力,但不保证审查老师不提意见。在开始使用前,您同意,任何由于本模板而引起的论文格式审查问题与本模板作者无关。
+
# 获取CQUThesis
+
## 下载
版本 | 下载地址 | 描述
@@ -81,7 +88,7 @@ make cls
文档 | 描述
--- | ---
-排版示例 | 请编译`main.tex`获得
+排版示例 | 编译`main.tex`获得,也可 [点我下载](https://github.com/nanmu42/CQUThesis/files/4817714/main.pdf)
用户文档 | 随模板发布,也可[点我下载](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),希望这份文档能帮到您。目前,我们正在学校范围内推动这一提案。
@@ -122,11 +129,6 @@ The author would like to acknowledge these contributors for their efforts and, e
这些内容有着自己的授权方式和简单的用户协议,不会随本模板的CTAN版本发布,CQUThesis的Github源是这些内容唯一的官方源,程序的更新和修正都会在这里进行。
-# 用户协议
-
-1. 本模板按照[LaTeX Project Public License](https://latex-project.org/lppl/lppl-1-3.txt)发布,协议版本号为1.3或以后的任何版本(随你意)。本条款不适用于重庆大学LaTeX模板工具箱(CQUThesis Toolkit);
-1. 截止本文档编译时,重庆大学教务处和研究生院只提供了毕业论文写作指南,没有提供官方模板,也没有授权或认证任何第三方模板为官方模板。本模板是按照写作指南的参考实现,模板作者自当尽力,但不保证审查老师不提意见。在开始使用前,您同意,任何由于本模板而引起的论文格式审查问题与本模板作者无关。
-
# 论文写作规范
- [重庆大学本科毕业设计(论文)撰写规范化要求(2007修订).pdf](https://github.com/nanmu42/CQUThesis/files/644308/2007.pdf)
diff --git a/macros/latex/contrib/cquthesis/README.md b/macros/latex/contrib/cquthesis/README.md
index bfa0213a6a..b276aa4f7e 100644
--- a/macros/latex/contrib/cquthesis/README.md
+++ b/macros/latex/contrib/cquthesis/README.md
@@ -1,8 +1,9 @@
# About CQUThesis
+
[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](https://travis-ci.org/nanmu42/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.40.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.50.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503)
**CQUThesis** stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
@@ -10,7 +11,9 @@
![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png)
# Deployment
+
## Download
+
Version | Link | Description
--- | --- | ---
Dev. |[Click Here](https://github.com/nanmu42/cquthesis/zipball/master) | Recommend with new features and bug fixes
@@ -18,6 +21,7 @@ Pre-release | [Github Link](https://github.com/nanmu42/CQUThesis/releases) | Acc
Release |[CTAN Page](https://www.ctan.org/pkg/cquthesis)| Scheduled updates for CTAN, MikTeX and TeX Live
## 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:
@@ -28,6 +32,7 @@ make thesis
If everything goes smoothly, CQUThesis is ready for work, with typeseting example named `main.pdf` in your work folder.
# 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)
@@ -35,6 +40,7 @@ Feel free to raise any question, and any possible contribution is highly appreci
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)
@@ -42,9 +48,11 @@ The author would like to acknowledge these contributors for their efforts and, e
* [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.
+
+LI Zhennan (i at nanmu dot me) proudly presents this work for you.
# License
+
This whole project 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 version. The latest version of this license is in:
http://www.latex-project.org/lppl.txt
diff --git a/macros/latex/contrib/cquthesis/cquthesis.cwl b/macros/latex/contrib/cquthesis/cquthesis.cwl
deleted file mode 100644
index 59f378abfe..0000000000
--- a/macros/latex/contrib/cquthesis/cquthesis.cwl
+++ /dev/null
@@ -1,104 +0,0 @@
-#Written by Zhennan Li 2016/06/10
-#include:amsmath
-#include:array
-#include:booktabs
-#include:tabularx
-#include:longtable
-#include:multirow
-#include:diagbox
-#include:graphicx
-#include:hyperref
-#include:xparse
-#include:ntheorem
-#include:metalogo
-#include:xcolor
-#include:mhchem
-#include:siunitx
-#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
-\begin{eabstract}#S
-\begin{Cplus}#n
-\begin{Python}#n
-\begin{axiom}#n
-\begin{theorem}#n
-\begin{definition}#n
-\begin{proposition}#n
-\begin{lemma}#n
-\begin{conjecture}#n
-\begin{proof}#n
-\begin{corollary}#n
-\begin{example}#n
-\begin{exercise}#n
-\begin{assumption}#n
-\begin{remark}#n
-\begin{problem}#n
-\end{cabstract}#S
-\end{denotation}#S
-\end{eabstract}#S
-\end{Cplus}#n
-\end{Python}#n
-\end{axiom}#n
-\end{theorem}#n
-\end{definition}#n
-\end{proposition}#n
-\end{lemma}#n
-\end{conjecture}#n
-\end{proof}#n
-\end{corollary}#n
-\end{example}#n
-\end{exercise}#n
-\end{assumption}#n
-\end{remark}#n
-\end{problem}#n
-\ccwd#n
-\colsep{length}#t
-\cquthesis#n
-\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
-\heiti#n
-\headcell{content}#t
-\inlinecite{bibid}#c
-\onlinecite{bibid}#c
-\kaishu#n
-\listeq{name}#n
-\listeq{name}[EnglishName]#n
-\listofequations#n
-\listofequationsEN#n
-\listoffiguresEN#n
-\listoftablesEN#n
-\lishu#n
-\mainmatter#S
-\makeabstract#S
-\makecover#S
-\resetrownum#n
-\resetxuhao#n
-\rownum#n
-\rownum[1]#n
-\rownumseparator#n
-\rownumtype[1-6]#n
-\songti#n
-\setxuhao#S
-\tabref#S
-\version#n
-\xuhao#n
-\xuhao[1]#n
-\xuhaoseparator#n
-\xuhaotype[1-6]#n
-\youyuan#n
-\zihao{num}#n
diff --git a/macros/latex/contrib/cquthesis/cquthesis.dtx b/macros/latex/contrib/cquthesis/cquthesis.dtx
index 60df9b710d..00bc741efd 100644
--- a/macros/latex/contrib/cquthesis/cquthesis.dtx
+++ b/macros/latex/contrib/cquthesis/cquthesis.dtx
@@ -16,7 +16,7 @@
%
% \iffalse
%<*driver>
-\ProvidesFile{cquthesis.dtx}[2019/10/12 v1.40 Chongqing University Thesis Template]
+\ProvidesFile{cquthesis.dtx}[2020/06/23 v1.50 Chongqing University Thesis Template]
\documentclass{ltxdoc}
\usepackage{dtx-style}
@@ -30,7 +30,7 @@
%</driver>
% \fi
%
-% \CheckSum{1891}
+% \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
@@ -99,7 +99,7 @@
% \GlossaryPrologue{\section{\glossaryname}}
%
% \title{\bfseries\color{blue!50!black}\cquthesis:重庆大学毕业论文\LaTeX 模板}
-% \author{{\fangsong 李振楠}\\[5pt]\texttt{i@nanmu.me}}
+% \author{{\fangsong 李振楠\footnote{\href{https://nanmu.me/zh-cn/about/}{中文页面},\href{https://nanmu.me/en/about}{About in English}}}\\[5pt]\texttt{i@nanmu.me}}
% \date{\fileversion\ (\filedate)}
% \maketitle\thispagestyle{empty}
% \vspace{\stretch{1}}
@@ -115,7 +115,7 @@
% \begin{abstract}\noindent
% \begin{enumerate}
% \item 本模板按照LaTeX Project Public License发布,协议版本号为1.3或以后的任何版本(随你意);
-% \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} 。}。本模板是按照写作指南的参考实现,模板作者自当尽力,但不保证审查老师不提意见。在开始使用前,您同意,任何由于本模板而引起的论文格式审查问题与本模板作者无关。
+% \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}
@@ -956,13 +956,15 @@
% \begin{macrocode}
\RequirePackage{fontspec}
\RequirePackage{amsmath}
+\RequirePackage{amssymb}
+\RequirePackage{amsfonts}
% \end{macrocode}
%
% 一些字体相关的宏包:
% \begin{macrocode}
\RequirePackage[defaultsups]{newtxtext}
\RequirePackage{pifont}
-\RequirePackage{CJKfntef}
+\RequirePackage{xeCJKfntef}
% \end{macrocode}
%
% 解决各种文档部件需求,如表格、题注、插图等
@@ -1538,18 +1540,19 @@
\renewcommand{\thesubtable}{(\alph{subtable})}
% \end{macrocode}
% \begin{macro}{\bicaption}
+% \changes{v1.50}{2020/06/23}{修改了双语图注的声明顺序,以适应新版\cs{bicaption}的变更。}
% 这里对\cs{bicaption}这个命令进行设置,题注的第二语言默认为英文,用户可以重定义\cs{shorttablenameEN}和\cs{shortfigurenameEN}
% \begin{macrocode}
-\captionsetup[bi-first]{bi-first}
-\captionsetup[bi-second]{bi-second}
\DeclareCaptionOption{bi-first}[]{%
\def\tablename{\shorttablename}
\def\figurename{\shortfigurename}
}%bi-first
\DeclareCaptionOption{bi-second}[]{%
- \def\tablename{\shorttablenameEN}
- \def\figurename{\shortfigurenameEN}
+\def\tablename{\shorttablenameEN}
+\def\figurename{\shortfigurenameEN}
}%bi-second
+\captionsetup[bi-first]{bi-first}
+\captionsetup[bi-second]{bi-second}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\listoffiguresEN}
@@ -2515,4 +2518,4 @@ headsep=3mm]{geometry}
% \fi
%
% \Finale
-\endinput \ No newline at end of file
+\endinput
diff --git a/macros/latex/contrib/cquthesis/cquthesis.pdf b/macros/latex/contrib/cquthesis/cquthesis.pdf
index 515c3cb05a..21ba5adab6 100644
--- a/macros/latex/contrib/cquthesis/cquthesis.pdf
+++ b/macros/latex/contrib/cquthesis/cquthesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/cquthesis/cquthesis.sty b/macros/latex/contrib/cquthesis/cquthesis.sty
index 7687abb02b..cd6710597b 100644
--- a/macros/latex/contrib/cquthesis/cquthesis.sty
+++ b/macros/latex/contrib/cquthesis/cquthesis.sty
@@ -9,13 +9,22 @@
-
-
-
% 晶向指数支持,如果需要请取消下面两行注释:
% \RequirePackage{miller}
% \pretocmd{\hkl}{{ }}{}{}
-
+%
+% 物理符号宏包:
+%\RequirePackage{physics}
+%
+% 计算机算法宏包:
+%\RequirePackage{algorithm2e}
+%\RequirePackage{algorithmic}
+%
+% 绘图宏包:
+%\RequirePackage{tikz}
+%
+% 绘制电路图:
+%\RequirePackage{circuitikz}
% 这两个个宏包仅供参考,未必使用:
% \RequirePackage{floatflt} % 图文混排用宏包
@@ -58,4 +67,4 @@
% now we make a command for a folder/file which inserts the icon and its label
% adjust this as needed. If you only have 2 icons, then you could create
% a \myfile and \myfolder command with the icon fixed.
-\newcommand{\myfolder}[2]{\myicon{#1}\ {#2}} \ No newline at end of file
+\newcommand{\myfolder}[2]{\myicon{#1}\ {#2}}