summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/cquthesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-12 22:06:46 +0000
committerKarl Berry <karl@freefriends.org>2019-10-12 22:06:46 +0000
commita8cad73a996a39c83b4cb426d77de1d0188b97a3 (patch)
tree14953b0742075592f8b4203d35484a9fcd79a9ca /Master/texmf-dist/source/latex/cquthesis
parent99ec425b8fb26a84dadfc706c8f58738321c0e98 (diff)
cquthesis (13oct19)
git-svn-id: svn://tug.org/texlive/trunk@52355 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/cquthesis')
-rw-r--r--Master/texmf-dist/source/latex/cquthesis/Makefile92
-rw-r--r--Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx20
2 files changed, 101 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/cquthesis/Makefile b/Master/texmf-dist/source/latex/cquthesis/Makefile
new file mode 100644
index 00000000000..900f583af0a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/cquthesis/Makefile
@@ -0,0 +1,92 @@
+# Makefile for CQUThesis
+# Adapted from Thuthesis Makefile
+
+# Compiling method: latexmk/xelatex/pdflatex
+METHOD = latexmk
+# Set opts for latexmk if you use it
+LATEXMKOPTS = -xelatex -quiet -halt-on-error -interaction=nonstopmode
+# Basename of thesis
+THESISMAIN = main
+
+
+PACKAGE=cquthesis
+SOURCES=$(PACKAGE).ins $(PACKAGE).dtx
+THESISCONTENTS=$(THESISMAIN).tex contents/*.tex $(FIGURES)
+# NOTE: update this to reflect your local file types.
+# 注意:下列内容可能需要根据你的实际情况调整
+FIGURES=$(wildcard figures/*.eps figures/*.pdf figures/*.jpg figures/*.jpeg figures/*.png)
+BIBFILE=ref/refs.bib
+SHUJICONTENTS=$(SHUJIMAIN).tex
+CLSFILES=dtx-style.sty $(PACKAGE).cls $(PACKAGE).cfg
+
+# make deletion work on Windows
+ifdef SystemRoot
+ RM = del /Q
+ OPEN = start
+else
+ RM = rm -f
+ OPEN = open
+endif
+
+.PHONY: all clean cleanall cls check doc distclean thesis viewthesis viewdoc FORCE_MAKE
+
+all: doc thesis
+
+cls: $(CLSFILES)
+
+doc: $(PACKAGE).pdf
+
+$(CLSFILES): $(SOURCES)
+ latex $(PACKAGE).ins
+
+viewdoc: doc
+ $(OPEN) $(PACKAGE).pdf
+
+viewthesis: thesis
+ $(OPEN) $(THESISMAIN).pdf
+
+thesis: $(THESISMAIN).pdf
+
+ifeq ($(METHOD),latexmk)
+
+$(PACKAGE).pdf: $(CLSFILES)
+ 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 -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)
+
+else ifneq (,$(filter $(METHOD),xelatex pdflatex))
+
+$(PACKAGE).pdf: $(CLSFILES)
+ $(METHOD) $(PACKAGE).dtx
+ makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
+ makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
+ $(METHOD) $(PACKAGE).dtx
+ $(METHOD) $(PACKAGE).dtx
+ $(METHOD) $(PACKAGE).dtx
+
+$(THESISMAIN).pdf: $(CLSFILES) $(THESISCONTENTS) $(THESISMAIN).bbl
+ $(METHOD) $(THESISMAIN)
+ $(METHOD) $(THESISMAIN)
+
+$(THESISMAIN).bbl: $(BIBFILE)
+ $(METHOD) $(THESISMAIN)
+ -bibtex $(THESISMAIN)
+ $(RM) $(THESISMAIN).pdf
+
+else
+$(error Unknown METHOD: $(METHOD))
+
+endif
+
+clean:
+ latexmk -c $(PACKAGE).dtx $(THESISMAIN)
+ -@$(RM) *~
+
+cleanall: clean
+ -@$(RM) $(PACKAGE).pdf $(THESISMAIN).pdf
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,