summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/thuthesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-20 21:19:13 +0000
committerKarl Berry <karl@freefriends.org>2016-03-20 21:19:13 +0000
commitaa253b3b308e46f4c80345fd766b3fba30d9e03d (patch)
treec8ac66d0eeabdddea9fee05c37ac93562170a8b9 /Master/texmf-dist/tex/latex/thuthesis
parentbafd11420aed2f53489e204712292894250a89bb (diff)
thuthesis (20mar16)
git-svn-id: svn://tug.org/texlive/trunk@40085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/thuthesis')
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/ctex-fontset-thuthesis.def22
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls20
3 files changed, 5 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/thuthesis/ctex-fontset-thuthesis.def b/Master/texmf-dist/tex/latex/thuthesis/ctex-fontset-thuthesis.def
deleted file mode 100644
index 5f7b4c59cee..00000000000
--- a/Master/texmf-dist/tex/latex/thuthesis/ctex-fontset-thuthesis.def
+++ /dev/null
@@ -1,22 +0,0 @@
-% This file is auto-generated by zhfonts.py script
-
-\ProvidesFile{ctex-fontset-thuthesis.def}
-
-\setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
-\setCJKsansfont{SimHei}
-\setCJKmonofont{KaiTi}
-\setCJKfamilyfont{zhsong}{SimSun}
-\setCJKfamilyfont{zhhei}{SimHei}
-\setCJKfamilyfont{zhkai}{KaiTi}
-\setCJKfamilyfont{zhfs}{FangSong}
-\setCJKfamilyfont{zhli}{STLiti}
-\setCJKfamilyfont{zhyou}{Yuanti SC}
-
-\newcommand*{\songti}{\CJKfamily{zhsong}}
-\newcommand*{\heiti}{\CJKfamily{zhhei}}
-\newcommand*{\kaishu}{\CJKfamily{zhkai}}
-\newcommand*{\fangsong}{\CJKfamily{zhfs}}
-\newcommand*{\lishu}{\CJKfamily{zhli}}
-\newcommand*{\youyuan}{\CJKfamily{zhyou}}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
index fafe73e3f11..e75ad7e30b0 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
@@ -23,7 +23,7 @@
%% This is the configuration file of the thuthesis package with LaTeX2e.
%%
\ProvidesFile{thuthesis.cfg}
-[2016/03/12 5.3.0 Tsinghua University Thesis Template]
+[2016/03/20 5.3.1 Tsinghua University Thesis Template]
\theoremsymbol{\ensuremath{\square}}
\newtheorem*{proof}{证明}
\theoremstyle{plain}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
index 9f8a34a2411..f87c20af8f3 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
@@ -25,10 +25,10 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{thuthesis}
-[2016/03/12 5.3.0 Tsinghua University Thesis Template]
+[2016/03/20 5.3.1 Tsinghua University Thesis Template]
\hyphenation{Thu-Thesis}
\def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.3.0}
+\def\version{5.3.1}
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
@@ -54,7 +54,6 @@
\DeclareVoidOption{doctor}{\thu@deprecated@type@option}
\DeclareVoidOption{postdoctor}{\thu@deprecated@type@option}
\DeclareBoolOption{secret}
-\DeclareBoolOption{arial}
\DeclareBoolOption{arialtoc}
\DeclareBoolOption{arialtitle}
\DeclareBoolOption{raggedbottom}
@@ -62,11 +61,10 @@
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}}
\kvsetkeys{thu}{%
raggedbottom,
- arial,
arialtitle}
\ProcessKeyvalOptions*
\PassOptionsToPackage{no-math}{fontspec}
-\LoadClass[a4paper,openany,UTF8,zihao=-4,scheme=plain,fontset=none]{ctexbook}
+\LoadClass[a4paper,openany,UTF8,zihao=-4,scheme=plain]{ctexbook}
\ifthu@bachelor\relax\else
\ifthu@master\relax\else
\ifthu@doctor\relax\else
@@ -104,16 +102,6 @@
\ifxetex
\def\CJK@null{\kern\CJKnullspace\Unicode{48}{7}\kern\CJKnullspace}
\defaultfontfeatures{Mapping=tex-text}
- \IfFileExists{ctex-fontset-thuthesis.def}%
- {\ctexset{fontset=thuthesis}}%
- {\ctexset{fontset=windows}}
-\else
- \RequirePackage{CJKspace}
- \ifthu@arial
- \IfFileExists{arial.sty}%
- {\RequirePackage{arial}}%
- {\ClassWarning{thuthesis}{arial.sty is not availiable!}}
- \fi
\fi
\RequirePackage[amsmath,thmmarks,hyperref]{ntheorem}
\RequirePackage{array}
@@ -526,7 +514,7 @@
\ifthu@secret{\heiti\sanhao\thu@secretlevel\thu@secret@content}\else\rule{1cm}{0cm}\fi}
\ifthu@bachelor
\vskip0.45cm
- {\yihao\lishu\ziju{0.3846}\thu@schoolname}
+ {\includegraphics{tsinghua}}
\par\vskip1.5cm
{\xiaochu\heiti\ziju{0.5}\thu@bachelor@subtitle}
\vskip2.2cm