summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/thuthesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-17 20:25:45 +0000
committerKarl Berry <karl@freefriends.org>2018-05-17 20:25:45 +0000
commit6523183e9bf0cb9c831adaa6eed6cac3b3c9d207 (patch)
treedfb57e6a782143343f709904b9e3ff57c091ab76 /Master/texmf-dist/tex/latex/thuthesis
parent7e9227dfbf310d133bca2331f978d17b65320433 (diff)
thuthesis (17may18)
git-svn-id: svn://tug.org/texlive/trunk@47740 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/thuthesis')
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls33
2 files changed, 29 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
index 75268fc2877..dd230e3a7ad 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
@@ -22,7 +22,7 @@
%%
\ProvidesFile{thuthesis.cfg}
-[2018/04/24 5.4.4 Tsinghua University Thesis Template]
+[2018/05/17 5.4.5 Tsinghua University Thesis Template]
\theorembodyfont{\normalfont}
\theoremheaderfont{\normalfont\heiti}
\theoremsymbol{\ensuremath{\square}}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
index ea6884052d8..ed86f329ec2 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
@@ -24,10 +24,10 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{thuthesis}
-[2018/04/24 5.4.4 Tsinghua University Thesis Template]
+[2018/05/17 5.4.5 Tsinghua University Thesis Template]
\hyphenation{Thu-Thesis}
\def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.4.4}
+\def\version{5.4.5}
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
@@ -58,7 +58,6 @@
\DeclareBoolOption{tocarialchapter}
\DeclareBoolOption{tocarialchapterentry}
\DeclareBoolOption{tocarialchapterpage}
-\IfFileExists{/dev/null}{}{\PassOptionsToClass{fontset=windowsold}{ctexbook}}
\DeclareBoolOption{raggedbottom}
\DeclareBoolOption{pifootnote}
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}}
@@ -167,10 +166,34 @@
\renewcommand\backmatter{%
\if@openright\cleardoublepage\else\clearpage\fi
\@mainmattertrue}
+\newcommand\thu@fontset{\csname g__ctex_fontset_tl\endcsname}
+\ifthenelse{\equal{\thu@fontset}{windows}}{
+ \ifxetex
+ \setCJKsansfont{SimHei}
+ \else
+ \setCJKsansfont{simhei.ttf}
+ \csname ctex_punct_map_family:nn\endcsname{\CJKsfdefault}{zhhei}
+ \fi
+}{}
+\ifthenelse{\equal{\thu@fontset}{mac}}{
+ \setCJKmainfont[
+ UprightFont = * Light,
+ BoldFont = * Bold,
+ ItalicFont = Kaiti SC,
+ BoldItalicFont = Kaiti SC Bold
+ ]{Songti SC}
+ \setCJKsansfont{Heiti SC}
+ \setCJKfamilyfont{zhsong}[
+ UprightFont = * Light,
+ BoldFont = * Bold,
+ ]{Songti SC}
+ \setCJKfamilyfont{zhhei}{Heiti SC}
+ \setCJKfamilyfont{zhkai}{Kaiti SC}
+}{}
\renewcommand\normalsize{%
\@setfontsize\normalsize{12bp}{20bp}%
- \abovedisplayskip=20bp \@plus 2bp \@minus 2bp
- \abovedisplayshortskip=20bp \@plus 2bp \@minus 2bp
+ \abovedisplayskip=12bp \@plus 2bp \@minus 2bp
+ \abovedisplayshortskip=12bp \@plus 2bp \@minus 2bp
\belowdisplayskip=\abovedisplayskip
\belowdisplayshortskip=\abovedisplayshortskip}
\def\thu@def@fontsize#1#2{%