summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc')
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md4
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/Makefile4
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/README (renamed from Master/texmf-dist/doc/latex/cquthesis/README.md)6
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md44
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdfbin609510 -> 1035298 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty2
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/figures/README8
-rw-r--r--Master/texmf-dist/doc/latex/cquthesis/ref/refs.bib12
9 files changed, 58 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md b/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md
index c987a1e8309..1c98767fbd4 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md
+++ b/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md
@@ -9,8 +9,10 @@ CQUThesis是一个绵薄的开源项目,自从2016年5月份上线以来,很
* **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),这带来了一个新功能!)
+* **交换団**(重庆大学TeX用户组成员,他发现了.bat文件中由Git引入的换行符的问题。这里有[解决方法](https://stackoverflow.com/questions/19551037/git-how-to-keep-crlf-endings-for-specific-files-only))
* **Zousiyu**(重庆大学TeX用户组成员,他贡献了开发思路)
-* **Lotus**(重庆大学TeX用户组成员,他在群里各种--瞎--带节奏)
+* **Lotus**(重庆大学TeX用户组成员,他在群里各种 ~~瞎~~ 带节奏)
+* **珍惜拥有**(重庆大学TeX用户组成员,他反馈了`bst`文件过时的问题)
还有,
* 我的母校,**重庆大学**
diff --git a/Master/texmf-dist/doc/latex/cquthesis/Makefile b/Master/texmf-dist/doc/latex/cquthesis/Makefile
index 57f1c90cb4d..2a22bbaae79 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/Makefile
+++ b/Master/texmf-dist/doc/latex/cquthesis/Makefile
@@ -4,7 +4,7 @@
# Compiling method: latexmk/xelatex/pdflatex
METHOD = latexmk
# Set opts for latexmk if you use it
-LATEXMKOPTS = -xelatex
+LATEXMKOPTS = -xelatex -quiet -halt-on-error -interaction=nonstopmode
# Basename of thesis
THESISMAIN = main
@@ -28,7 +28,7 @@ else
OPEN = open
endif
-.PHONY: all clean cls check doc distclean thesis viewthesis viewdoc FORCE_MAKE
+.PHONY: all clean cleanall cls check doc distclean thesis viewthesis viewdoc FORCE_MAKE
all: doc thesis
diff --git a/Master/texmf-dist/doc/latex/cquthesis/README.md b/Master/texmf-dist/doc/latex/cquthesis/README
index f90ece32994..ba4f7b74510 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/README.md
+++ b/Master/texmf-dist/doc/latex/cquthesis/README
@@ -1,7 +1,9 @@
-# About CQUThesis
+# CQUThesis v1.30 (2018/02/23)
+[![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.20.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.30.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.
diff --git a/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md b/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md
index f8b251d8ea0..f9026bb7576 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md
+++ b/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md
@@ -1,8 +1,8 @@
-# 嗨,这里是CQUThesis!
-
+# 嗨,这里是CQUThesis! v1.30 (2018/02/23)
+[![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.20.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.30.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**.
@@ -17,7 +17,8 @@ CQUThesis根据重庆大学《重庆大学本科设计(论文)撰写规范
* 内置封面、目录、索引、授权书等论文部件,可按需自动生成;
* 自动侦测文档页数,生成相应的单面打印/双面打印PDF文件;
* 预置一批优化过的宏包和小功能,包含中英双语题注及配套图录、表录,国际标准单位、化学式支持、三线表等,可按需开启;
-* 支持基于cwl文件的代码着色和补全,makefile功能能够在Linux, Mac, Windows三平台通用。
+* 支持基于cwl文件的代码着色和补全,makefile功能能够在Linux, Mac, Windows三平台通用;
+* 每周自动进行持续集成测试,保证模板在最新宏包环境下能够正常运行。
![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png)
@@ -90,21 +91,16 @@ make cls
* [Github Issues](https://github.com/nanmu42/CQUThesis/issues)
* 加入[重庆大学TeX用户组](http://jq.qq.com/?_wv=1027&k=2HvYu95)寻求支持
-# 用户协议
-
-1. 本模板按照[LaTeX Project Public License](https://latex-project.org/lppl/lppl-1-3.txt)发布,协议版本号为1.3或以后的任何版本(随你意)。本条款不适用于重庆大学LaTeX模板工具箱(CQUThesis Toolkit);
-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)。向你们致以真诚的问候和感激!
+持续集成构建服务由[Travis CI](https://travis-ci.org/)提供,在构建中,CQUThesis使用了由Christian Schenk开发的[MiKTeX](https://miktex.org),使用[Docker](https://www.docker.com/)进行了[虚拟化](https://github.com/nanmu42/TeXPackageTestBench),镜像中包含[Ubuntu发行版](https://www.ubuntu.com),作者在此特别致谢。
+
特别感谢参与CQUThesis的开发和维护的诸位[**直接贡献者**](https://github.com/nanmu42/CQUThesis/blob/master/CONTRIBUTORS.md),向你们致以真诚的敬意和感激!
+特别感谢我的母校重庆大学无偿提供[CTAN镜像](https://mirrors.cqu.edu.cn/ctan/)服务,这对于中国西南地区的TeX用户而言是极大的利好。感谢[CQU Mirror Site Dev. Task Force](https://github.com/cqumirror)和[重庆大学蓝盟](http://lanunion.cqu.edu.cn/)的维护支持!
+
世界因你们更美好。
The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind:
@@ -115,14 +111,28 @@ The author would like to acknowledge these contributors for their efforts and, e
* [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/)
+* [Travis CI](https://travis-ci.org/)
+* [MiKTeX](https://miktex.org)
+* [Docker](https://www.docker.com/)
+* [Ubuntu](https://www.ubuntu.com)
+
+# CQUThesis Toolkit
+
+重庆大学LaTeX模板工具箱(CQUThesis Toolkit)是为了增强CQUThesis而提供的额外文件和程序,这些内容往往是对CQUThesis易用性或功能的增强,没有它们,CQUThesis仍然可以良好地独立运行。
+
+这些内容有着自己的授权方式和简单的用户协议,不会随本模板的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)
- [重庆大学博士、硕士学位论文撰写格式标准(2007修订).pdf](https://github.com/nanmu42/CQUThesis/files/644309/2007.pdf)
+- [GB/T 7714-2015 信息与文献 参考文献著录规则.pdf](https://github.com/nanmu42/CQUThesis/files/1096886/GBT.7714-2015.pdf)
-# 关于CQUThesis Toolkit
-
-重庆大学LaTeX模板工具箱(CQUThesis Toolkit)是为了增强CQUThesis而提供的额外文件和程序,这些内容往往是对CQUThesis易用性或功能的增强,没有它们,CQUThesis仍然可以良好地独立运行。
+# About CQUThesis
-这些内容有着自己的授权方式和简单的用户协议,不会随本模板的CTAN版本发布,CQUThesis的Github源是这些内容唯一的官方源,程序的更新和修正都会在这里进行。
+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/analysis.tex b/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex
index ceb3bef2994..96625c98a47 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex
+++ b/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex
@@ -356,7 +356,7 @@ The \textbf{words} in this sentences are \textit{processed} with three different
\cquthesis 同时提供正文模式的参考文献引用功能\cs{inlinecite},适用于以下情况:
-文献\inlinecite{r6}表明,文献\inlinecite{r7,r8,r9}所述的情况是有理论依据的。
+文献\inlinecite{r6,z1,z2,z3}表明,文献\inlinecite{r7,r8,r9,r10}所述的情况是有理论依据的。
\section{数学公式}
\label{sec:equation}
diff --git a/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf
index 615b15630c4..2847fb3c375 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/dtx-style.sty b/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty
index a085f566184..08f533047ae 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-2017 by Zhennan Li <i@nanmu.me>
+%% Copyright (C) 2016-2018 by Zhennan Li <i@nanmu.me>
%% 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
new file mode 100644
index 00000000000..e9ddd0ca282
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cquthesis/figures/README
@@ -0,0 +1,8 @@
+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/ref/refs.bib b/Master/texmf-dist/doc/latex/cquthesis/ref/refs.bib
index dd9a1e5fbc6..903762a9f49 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/ref/refs.bib
+++ b/Master/texmf-dist/doc/latex/cquthesis/ref/refs.bib
@@ -404,6 +404,18 @@
web-of-science-categories = {Electrochemistry; Materials Science, Coatings \& Films}
}
+@InProceedings{r10,
+ author = {Ross Girshick and Jeff Donahue and Trevor Darrell and Jitendra Malik},
+ title = {Rich Feature Hierarchies for Accurate Object Detection and Semantic Segmentation},
+ booktitle = {Proceedings of the IEEE Conference on Computer Vision and Pattern Recognition (CVPR)},
+ year = {2014},
+ editor = {},
+ volume = {},
+ pages = {580--587},
+ address = {Ohio, USA},
+ publisher = {IEEE}
+}
+
@Article{z1,
author = {胡壮麒 and 刘丽荣 and 金涛 and 孙晓峰},
title = {镍基单晶高温合金的发展},