cquthesis (13oct19)

git-svn-id: svn://tug.org/texlive/trunk@52355 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 26 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md b/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md
index f9026bb7576..7e03272dd11 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！ v1.30 (2018/02/23)
+# 嗨，这里是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.30.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.40.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**.
diff --git a/Master/texmf-dist/doc/latex/cquthesis/README b/Master/texmf-dist/doc/latex/cquthesis/README.md
index ba4f7b74510..bfa0213a6a6 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/README
+++ b/Master/texmf-dist/doc/latex/cquthesis/README.md
@@ -1,8 +1,8 @@
-# CQUThesis v1.30 (2018/02/23)
+# 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.30.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.40.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/cquthesis.pdf b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf
index 2847fb3c375..515c3cb05ae 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf
+++ b/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf
diff --git a/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty b/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty
index 08f533047ae..9332eee0284 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-2018 by Zhennan Li <i@nanmu.me>
+%% Copyright (C) 2016-2019 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
@@ -23,8 +23,6 @@
 \RequirePackage[bottom,perpage,hang,]{footmisc}
 \RequirePackage{hypdoc}
 \RequirePackage[UTF8,scheme=chinese]{ctex}
-\RequirePackage{newpxtext}
-\RequirePackage{newpxmath}
 \RequirePackage[
 top=2.5cm, bottom=2.5cm,
 left=4cm, right=2cm,
diff --git a/Master/texmf-dist/doc/latex/cquthesis/Makefile b/Master/texmf-dist/source/latex/cquthesis/Makefile
index 2a22bbaae79..900f583af0a 100644
--- a/Master/texmf-dist/doc/latex/cquthesis/Makefile
+++ b/Master/texmf-dist/source/latex/cquthesis/Makefile
@@ -50,12 +50,12 @@ thesis: $(THESISMAIN).pdf
 ifeq ($(METHOD),latexmk)
 
 $(PACKAGE).pdf: $(CLSFILES)
-	xelatex $(PACKAGE).dtx
+	xelatex -quiet -halt-on-error -interaction=nonstopmode $(PACKAGE).dtx
 	makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
 	makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
-	xelatex $(PACKAGE).dtx
-	xelatex $(PACKAGE).dtx
-	xelatex $(PACKAGE).dtx
+	xelatex -quiet -halt-on-error -interaction=nonstopmode $(PACKAGE).dtx
+	xelatex -quiet -halt-on-error -interaction=nonstopmode $(PACKAGE).dtx
+	xelatex -quiet -halt-on-error -interaction=nonstopmode $(PACKAGE).dtx
 
 $(THESISMAIN).pdf: $(CLSFILES)
 	$(METHOD) $(LATEXMKOPTS) $(THESISMAIN)
diff --git a/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx b/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx
index 7750fb6ca39..60df9b710dd 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}[2018/02/23 v1.30 Chongqing University Thesis Template]
+\ProvidesFile{cquthesis.dtx}[2019/10/12 v1.40 Chongqing University Thesis Template]
 \documentclass{ltxdoc}
 \usepackage{dtx-style}
 
@@ -30,7 +30,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1893}
+% \CheckSum{1891}
 %
 % \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
@@ -89,7 +89,8 @@
 % \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}有中英文两个版本了。}
-% \changes{v1.30}{2017/05/30}{从\href{https://github.com/zepinglee/gbt7714-bibtex-style}{上游供应商zepinglee/gbt7714-bibtex-style}更新了\file{cqunumerical.bst}。}
+% \changes{v1.30}{2018/02/23}{从\href{https://github.com/zepinglee/gbt7714-bibtex-style}{上游供应商zepinglee/gbt7714-bibtex-style}更新了\file{cqunumerical.bst}。}
+% \changes{v1.40}{2019/10/12}{修复了\href{https://github.com/nanmu42/CQUThesis/issues/44}{Issue 44}。}
 %
 %
 % \def\indexname{代码索引}
@@ -777,7 +778,7 @@
 %<cls>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<cls>\ProvidesClass{cquthesis}
 %<cfg>\ProvidesFile{cquthesis.cfg}
-%<cls|cfg>[2018/02/23 v1.30 Chongqing University Thesis Template]
+%<cls|cfg>[2019/10/12 v1.40 Chongqing University Thesis Template]
 %    \end{macrocode}
 % 定义一些开发常量：
 %    \begin{macrocode}
@@ -960,7 +961,6 @@
 % 一些字体相关的宏包：
 %    \begin{macrocode}
 \RequirePackage[defaultsups]{newtxtext}
-\RequirePackage{newtxmath}
 \RequirePackage{pifont}
 \RequirePackage{CJKfntef}
 %    \end{macrocode}
@@ -1388,7 +1388,7 @@
 % 定理环境中文定义在.cfg中完成
 %    \begin{macrocode}
 %<*cfg>
-\theoremsymbol{\ensuremath{\square}}
+\theoremsymbol{\ensuremath{\ding{110}}}
 \newtheorem*{proof}{证明}
 \theoremstyle{plain}
 \theoremsymbol{}
@@ -1437,9 +1437,9 @@
 %    \begin{macrocode}
 %<*cfg>
 \sisetup{%
-	list-final-separator	=	{和},
-	list-pair-separator		=	{和},
-	range-phrase			=	{$ \sim $},
+	list-final-separator	=	{ 和 },
+	list-pair-separator		=	{ 和 },
+	range-phrase			=	{～},
 }%\sisetup
 %    \end{macrocode}
 %
@@ -2390,8 +2390,6 @@
 \RequirePackage[bottom,perpage,hang,]{footmisc}
 \RequirePackage{hypdoc}
 \RequirePackage[UTF8,scheme=chinese]{ctex}
-\RequirePackage{newpxtext}
-\RequirePackage{newpxmath}
 \RequirePackage[
 top=2.5cm, bottom=2.5cm,
 left=4cm, right=2cm,
diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
index 4f1ce138e45..285f80f6641 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-2018 by Zhennan Li <i@nanmu.me>
+%% Copyright (C) 2016-2019 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
@@ -22,7 +22,7 @@
 %% This is the configuration file of the cquthesis package with LaTeX2e.
 %% 
 \ProvidesFile{cquthesis.cfg}
-[2018/02/23 v1.30 Chongqing University Thesis Template]
+[2019/10/12 v1.40 Chongqing University Thesis Template]
 \def\cqueqshortname {式} 
 \def\cqu@denotation@name {主要符号对照表}
 \def\shorttablename {表}
@@ -133,7 +133,7 @@ indexname=索引,
 {More than 10 footnotes in a single page are not supported.}{}
 \fi
 }{}{}
-\theoremsymbol{\ensuremath{\square}}
+\theoremsymbol{\ensuremath{\ding{110}}}
 \newtheorem*{proof}{证明}
 \theoremstyle{plain}
 \theoremsymbol{}
@@ -151,9 +151,9 @@ indexname=索引,
 \newtheorem{problem}{问题}[chapter]
 \newtheorem{conjecture}{猜想}[chapter]
 \sisetup{%
-list-final-separator = {和},
-list-pair-separator = {和},
-range-phrase = {$ \sim $},
+list-final-separator = { 和 },
+list-pair-separator = { 和 },
+range-phrase = {～},
 }%\sisetup
 \AtBeginDocument{%
 \def\figureautorefname{图}
diff --git a/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls b/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
index cf11381ee3b..252676f045b 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-2018 by Zhennan Li <i@nanmu.me>
+%% Copyright (C) 2016-2019 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
@@ -21,7 +21,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{cquthesis}
-[2018/02/23 v1.30 Chongqing University Thesis Template]
+[2019/10/12 v1.40 Chongqing University Thesis Template]
 \hyphenation{Cqu-Thesis}
 \newcommand{\cquthesis}{\textsc{CquThesis}}
 \def\version{1.30}
@@ -106,7 +106,6 @@ bilinguallist=[off|combined|apart]}{}
 \RequirePackage{fontspec}
 \RequirePackage{amsmath}
 \RequirePackage[defaultsups]{newtxtext}
-\RequirePackage{newtxmath}
 \RequirePackage{pifont}
 \RequirePackage{CJKfntef}
 \RequirePackage{newfloat}