From 92dfd63f1480de91bdf82d2ae9fd7a76110f39d7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 27 Nov 2014 23:12:33 +0000 Subject: thuthesis (27nov14) git-svn-id: svn://tug.org/texlive/trunk@35672 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/thuthesis/thuthesis.cfg | 40 +-- .../texmf-dist/tex/latex/thuthesis/thuthesis.cls | 366 ++++++++------------- Master/texmf-dist/tex/latex/thuthesis/thutils.sty | 2 +- 3 files changed, 163 insertions(+), 245 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg index 7fa1ac3269d..3cdef155137 100644 --- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg +++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2011 by Xue Ruini +%% Copyright (C) 2005-2014 by Xue Ruini %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3a @@ -25,7 +25,7 @@ %% \ProvidesFile{thuthesis.cfg} -[2011/05/02 4.6 Tsinghua University Thesis Template] +[2014/11/27 4.8 Tsinghua University Thesis Template] \theoremsymbol{\ensuremath{\square}} \newtheorem*{proof}{证明} \theoremstyle{plain} @@ -54,7 +54,8 @@ \renewcommand\tablename{表} \newcommand\CJKprepartname{第} \newcommand\CJKpartname{部分} -\newcommand\CJKthepart{\CJKnumber{\@arabic\c@part}} +\CTEXnumber{\thu@thepart}{\@arabic\c@part} +\newcommand\CJKthepart{\thu@thepart} \newcommand\CJKprechaptername{第} \newcommand\CJKchaptername{章} \newcommand\CJKthechapter{\@arabic\c@chapter} @@ -70,8 +71,11 @@ \let\CJK@todaysave=\today \def\CJK@todaysmall@short{\the\year 年 \the\month 月} \def\CJK@todaysmall{\CJK@todaysmall@short \the\day 日} -\def\CJK@todaybig@short{\CJKdigits{\the\year} 年 \CJKnumber{\the\month} 月} -\def\CJK@todaybig{\CJK@todaybig@short \CJKnumber{\the\day} 日} +\CTEXdigits{\thu@CJK@year}{\the\year} +\CTEXnumber{\thu@CJK@month}{\the\month} +\CTEXnumber{\thu@CJK@day}{\the\day} +\def\CJK@todaybig@short{\thu@CJK@year{}年\thu@CJK@month{}月} +\def\CJK@todaybig{\CJK@todaybig@short{}\thu@CJK@day{}日} \def\CJK@today{\CJK@todaysmall} \renewcommand\today{\CJK@today} \newcommand\CJKtoday[1][1]{% @@ -79,16 +83,8 @@ \or\def\CJK@today{\CJK@todaysmall} \or\def\CJK@today{\CJK@todaybig} \fi} -\def\thu@ckeywords@separator{ - \ifthu@bachelor\hspace{1em} - \else - \ifthu@master\hspace{2em}\else;\fi - \fi} -\def\thu@ekeywords@separator{ - \ifthu@bachelor\hspace{1em} - \else - \ifthu@master\hspace{2em}\else;\fi - \fi} +\def\thu@ckeywords@separator{;} +\def\thu@ekeywords@separator{;} \def\thu@catalog@number@title{分类号} \def\thu@id@title{编号} \def\thu@title@sep{:} @@ -102,8 +98,6 @@ \def\thu@postdoctor@report@title{博士后研究报告} \def\thu@bachelor@subtitle{综合论文训练} \def\thu@bachelor@title@pre{题目} -\def\thu@department@title{系别} -\def\thu@major@title{专业} \def\thu@postdoctor@date@title{研究起止日期} \ifthu@postdoctor \def\thu@author@title{博士后姓名} @@ -121,8 +115,13 @@ \ifx\thu@secretlevel\thu@secretlevel@inner\relax\else ★\fi% \hspace{2em}\thu@secretyear\hspace{1em}年} \def\thu@apply{(申请清华大学\thu@cdegree 学位论文)} -\def\thu@department@title{培养单位} -\def\thu@major@title{学科} +\ifthu@bachelor + \def\thu@department@title{系别} + \def\thu@major@title{专业} +\else + \def\thu@department@title{培养单位} + \def\thu@major@title{学科} +\fi \ifthu@postdoctor \def\thu@supervisor@title{合作导师} \else @@ -161,7 +160,8 @@ \ifthu@bachelor(涉密的学位论文在解密后应遵守此规定)\else (保密的论文在解密后应遵守此规定)\fi} \newcommand{\thu@authorsig}{\ifthu@bachelor 签\hskip1em名:\else 作者签名:\fi} \newcommand{\thu@teachersig}{导师签名:} -\newcommand{\thu@frontdate}{日\hspace{2em}期:} +\newcommand{\thu@frontdate}{% + 日\ifthu@bachelor\hspace{1em}\else\hspace{2em}\fi 期:} \newcommand{\thu@ckeywords@title}{关键词:} \newcommand{\thu@denotation@name}{主要符号对照表} \newcommand{\thu@ackname}{致\hspace{1em}谢} diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls index daa79c63602..198f833cc08 100644 --- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls +++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2011 by Ruini Xue +%% Copyright (C) 2005-2014 by Ruini Xue %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3a @@ -26,14 +26,10 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{thuthesis} -[2011/05/02 4.6 Tsinghua University Thesis Template] -\newif\ifthu@UTF -\newif\ifthu@GBK -\DeclareOption{utf}{\thu@UTFtrue\thu@GBKfalse} -\DeclareOption{gbk}{\thu@GBKtrue\thu@UTFfalse} +[2014/11/27 4.8 Tsinghua University Thesis Template] \hyphenation{Thu-Thesis} \def\thuthesis{\textsc{ThuThesis}} -\def\version{4.6} +\def\version{4.8} \newif\ifthu@bachelor\thu@bachelorfalse \newif\ifthu@master\thu@masterfalse \newif\ifthu@doctor\thu@doctorfalse @@ -44,24 +40,18 @@ \DeclareOption{doctor}{\thu@doctortrue} \DeclareOption{postdoctor}{\thu@postdoctortrue} \DeclareOption{secret}{\thu@secrettrue} -\newif\ifthu@dvips -\newif\ifthu@dvipdfm -\newif\ifthu@xetex -\newif\ifthu@pdftex -\DeclareOption{dvips}{\thu@dvipstrue} -\DeclareOption{dvipdfm}{\thu@dvipdfmtrue} -\DeclareOption{pdftex}{\thu@pdftextrue} -\DeclareOption{xetex}{\thu@xetextrue} \newif\ifthu@arial \DeclareOption{arial}{\thu@arialtrue} \newif\ifthu@arialtoc \DeclareOption{arialtoc}{\thu@arialtoctrue} \newif\ifthu@arialtitle \DeclareOption{arialtitle}{\thu@arialtitletrue} -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} +\newif\ifthu@raggedbottom\thu@raggedbottomtrue +\DeclareOption{noraggedbottom}{\thu@raggedbottomfalse} +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}} \ExecuteOptions{utf,arialtitle} \ProcessOptions\relax -\LoadClass[12pt,a4paper,openany]{book} +\LoadClass[cs4size,a4paper,openany,nocap,UTF8]{ctexbook} \ifthu@bachelor\relax\else \ifthu@master\relax\else \ifthu@doctor\relax\else @@ -72,58 +62,35 @@ \fi \fi \fi -\RequirePackage{ifpdf,ifxetex} -\ifthu@xetex\RequireXeTeX\fi -\def\RequirePDFTeX{% - \ifpdf\else - \ClassError{thuthesis}% - {pdflatex is required to compile this document!}{} - \fi} -\ifthu@pdftex\RequirePDFTeX\fi -\def\thu@checkoption#1#2{% - \@for\reserved@a:=#2\do{% - \csname ifthu@\reserved@a\endcsname - \ClassError{thuthesis}% - {Please remove `\reserved@a' option when you run #1.}{} - \fi}} -\ifpdf\thu@checkoption{pdflatex}{dvips,dvipdfm,xetex}\thu@pdftextrue\fi % force the option to be true -\ifxetex\thu@checkoption{xelatex}{dvips,dvipdfm,pdftex}\thu@xetextrue\fi +\RequirePackage{ifxetex} \RequirePackage{ifthen,calc} -\RequirePackage{amsmath,amssymb} +\RequirePackage{amsmath} \RequirePackage{txfonts} \RequirePackage{graphicx} -\RequirePackage[config]{subfig} -\RequirePackage{indentfirst} +\RequirePackage[labelformat=simple]{subcaption} \RequirePackage[neverdecrease]{paralist} -\ifthu@xetex - \RequirePackage{mathptmx} % fontspec conflicts with txfonts now, so we have to load other times-math fonts. - \RequirePackage{xltxtra} - \RequirePackage[CJKnumber,BoldFont,ItalicFont,normalindentfirst]{xeCJK} +\ifthu@raggedbottom + \RequirePackage[bottom]{footmisc} + \raggedbottom +\fi +\ifthu@bachelor + \RequirePackage{CJKfntef} +\fi +\renewcommand{\baselinestretch}{1.0} +\ifxetex + \xeCJKsetup{AutoFakeBold=true,AutoFakeSlant=true} \punctstyle{quanjiao} % todo: minor fix of CJKnumb \def\CJK@null{\kern\CJKnullspace\Unicode{48}{7}\kern\CJKnullspace} \defaultfontfeatures{Mapping=tex-text} % use TeX -- - \setCJKmainfont[BoldFont={Adobe Heiti Std}, ItalicFont={Adobe Kaiti Std}]{Adobe Song Std} - \setCJKsansfont{Adobe Heiti Std} - \setCJKmonofont{Adobe Kaiti Std} - \setCJKfamilyfont{song}{Adobe Song Std} - \setCJKfamilyfont{hei}{Adobe Heiti Std} - \setCJKfamilyfont{fs}{Adobe Fangsong Std} - \setCJKfamilyfont{kai}{Adobe Kaiti Std} - \setCJKfamilyfont{li}{Adobe Kaiti Std} % todo: 用隶书字体代替 - \setCJKfamilyfont{you}{Adobe Kaiti Std} % todo: 用幼圆字体代替 + \ifCTEX@nofonts + \input{fontname.def} + \fi \setmainfont{Times New Roman} \setsansfont{Arial} \setmonofont{Courier New} \else - \RequirePackage{CJKutf8} - \RequirePackage{CJKnumb} - \ifthu@GBK % CJKpunct 在 UTF 下工作的不好。 - \IfFileExists{CJKpunct.sty}% - {\RequirePackage{CJKpunct}}% - {\ClassWarning{thuthesis}{no CJKpunct.sty availiable!}} - \fi \RequirePackage{CJKspace} \ifthu@arial \IfFileExists{arial.sty}% @@ -131,11 +98,6 @@ {\ClassWarning{thuthesis}{no arial.sty availiable!}} \fi \fi -\ifthu@dvips\else - \ifthu@xetex\else - \RequirePackage{ccmap} - \fi -\fi \RequirePackage[amsmath,thmmarks,hyperref]{ntheorem} \RequirePackage{array} \RequirePackage{longtable} @@ -159,11 +121,7 @@ plainpages=false, pdfpagelabels, pdfborder=0 0 0} -\ifthu@dvips - \RequirePackage{breakurl} -\fi \urlstyle{same} -\RequirePackage{hypernat} \renewcommand\frontmatter{% \if@openright\cleardoublepage\else\clearpage\fi \@mainmatterfalse @@ -177,18 +135,6 @@ \renewcommand\backmatter{% \if@openright\cleardoublepage\else\clearpage\fi \@mainmattertrue} -\newcommand{\song}{\CJKfamily{song}} % 宋体 -\def\songti{\song} -\newcommand{\fs}{\CJKfamily{fs}} % 仿宋体 -\def\fangsong{\fs} -\newcommand{\kai}{\CJKfamily{kai}} % 楷体 -\def\kaishu{\kai} -\newcommand{\hei}{\CJKfamily{hei}} % 黑体 -\def\heiti{\hei} -\newcommand{\li}{\CJKfamily{li}} % 隶书 -\def\lishu{\li} -\newcommand{\you}{\CJKfamily{you}} % 幼圆 -\def\youyuan{\you} \newlength\thu@linespace \newcommand{\thu@choosefont}[2]{% \setlength{\thu@linespace}{#2*\real{#1}}% @@ -232,15 +178,15 @@ \addtolength{\textwidth}{-6.4cm} \setlength{\topmargin}{2.8cm-1in} \setlength{\oddsidemargin}{3.2cm-1in} - \setlength{\footskip}{1.3cm} + \setlength{\footskip}{1.78cm} \setlength{\headsep}{0.6cm} \addtolength{\textheight}{-7.8cm} \else \addtolength{\textwidth}{-6cm} \setlength{\topmargin}{2.2cm-1in} \setlength{\oddsidemargin}{3cm-1in} - \setlength{\footskip}{1.5cm} - \setlength{\headsep}{0.5cm} + \setlength{\footskip}{0.6cm} + \setlength{\headsep}{0.2cm} \addtolength{\textheight}{-6cm} \fi \setlength{\evensidemargin}{\oddsidemargin} @@ -259,34 +205,20 @@ \def\ps@thu@plain{% \let\@oddhead\@empty% \let\@evenhead\@empty% - \def\@oddfoot{\hfil\wuhao\thepage\hfil}% + \def\@oddfoot{\hfil\xiaowu\thepage\hfil}% \let\@evenfoot=\@oddfoot} \def\ps@thu@headings{% \def\@oddhead{\vbox to\headheight{% - \hb@xt@\textwidth{\hfill\wuhao\song\leftmark\ifthu@bachelor\relax\else\hfill\fi}% + \hb@xt@\textwidth{\hfill\wuhao\songti\leftmark\ifthu@bachelor\relax\else\hfill\fi}% \vskip2pt\hbox{\vrule width\textwidth height0.4pt depth0pt}}} \def\@evenhead{\vbox to\headheight{% - \hb@xt@\textwidth{\wuhao\song% + \hb@xt@\textwidth{\wuhao\songti% \ifthu@bachelor\thu@schoolname\thu@bachelor@subtitle% \else\hfill\leftmark\fi\hfill}% \vskip2pt\hbox{\vrule width\textwidth height0.4pt depth0pt}}} \def\@oddfoot{\hfil\wuhao\thepage\hfil} \let\@evenfoot=\@oddfoot} \renewcommand{\chaptermark}[1]{\@mkboth{\@chapapp\ ~~#1}{}} -\newlength\CJK@twochars -\ifxetex - \def\CJK@spaceChar{\Unicode{48}{7}} -\else - \ifthu@UTF - \def\CJK@spaceChar{\CJKchar{"080}{"080}} - \fi - \ifthu@GBK - \def\CJK@spaceChar{\CJKchar{"0A1}{"0A1}} - \fi -\fi -\def\CJKindent{% - \settowidth\CJK@twochars{\CJK@spaceChar\CJK@spaceChar}% - \parindent\CJK@twochars} \setlength{\parskip}{0pt \@plus2pt \@minus0pt} \def\thu@item@space{% \let\itemize\compactitem @@ -323,9 +255,10 @@ \def\@makefnmark{\textsuperscript{\hbox{\normalfont\@thefnmark}}} \long\def\@makefntext#1{ \bgroup - \setbox\@tempboxa\hbox{% + \newbox\thu@tempboxa + \setbox\thu@tempboxa\hbox{% \hb@xt@ 2em{\@thefnmark\hss}} - \leftmargin\wd\@tempboxa + \leftmargin\wd\thu@tempboxa \rightmargin\z@ \linewidth \columnwidth \advance \linewidth -\leftmargin @@ -333,7 +266,7 @@ \footnotesize \@setpar{{\@@par}}% \leavevmode - \llap{\box\@tempboxa}% + \llap{\box\thu@tempboxa}% #1 \par\egroup} \allowdisplaybreaks[4] @@ -359,8 +292,8 @@ \fi \@endparenv \fi #1} -\theorembodyfont{\song\rmfamily} -\theoremheaderfont{\hei\rmfamily} +\theorembodyfont{\songti\rmfamily} +\theoremheaderfont{\heiti\rmfamily} \setlength{\floatsep}{12bp \@plus4pt \@minus1pt} \setlength{\intextsep}{12bp \@plus4pt \@minus2pt} \setlength{\textfloatsep}{12bp \@plus4pt \@minus2pt} @@ -373,13 +306,13 @@ \renewcommand{\floatpagefraction}{0.60} \let\old@tabular\@tabular \def\thu@tabular{\dawu[1.5]\old@tabular} -\DeclareCaptionLabelFormat{thu}{{\dawu[1.5]\song #1~\rmfamily #2}} +\DeclareCaptionLabelFormat{thu}{{\dawu[1.5]\songti #1~\rmfamily #2}} \DeclareCaptionLabelSeparator{thu}{\hspace{1em}} \DeclareCaptionFont{thu}{\dawu[1.5]} \captionsetup{labelformat=thu,labelsep=thu,font=thu} \captionsetup[table]{position=top,belowskip={12bp-\intextsep},aboveskip=6bp} \captionsetup[figure]{position=bottom,belowskip={12bp-\intextsep},aboveskip=6bp} -\captionsetup[subfloat]{labelformat=simple,font=thu,captionskip=6bp,nearskip=6bp,farskip=0bp,topadjust=0bp} +\captionsetup[sub]{font=thu,skip=6bp} \renewcommand{\thesubfigure}{(\alph{subfigure})} \renewcommand{\thesubtable}{(\alph{subtable})} \let\thu@LT@array\LT@array @@ -411,21 +344,21 @@ \chaptermark{#1}% \@makechapterhead{#2}} \def\@makechapterhead#1{% - \vspace*{20bp}% + \ifthu@bachelor\vspace*{24bp}\else\vspace*{20bp}\fi% {\parindent \z@ \centering - \hei\csname thu@title@font\endcsname\ifthu@bachelor\xiaosan\else\sanhao[1]\fi + \csname thu@title@font\endcsname\heiti\ifthu@bachelor\xiaosan\else\sanhao[1]\fi \ifnum \c@secnumdepth >\m@ne \@chapapp\hskip1em \fi #1\par\nobreak - \vskip 24bp}} + \ifthu@bachelor\vskip 20bp\else\vskip 24bp\fi}} \def\@schapter#1{% \@makeschapterhead{#1} \@afterheading} \def\@makeschapterhead#1{% - \vspace*{20bp}% + \ifthu@bachelor\vspace*{30bp}\else\vspace*{20bp}\fi% {\parindent \z@ \centering - \hei\csname thu@title@font\endcsname\sanhao[1] + \csname thu@title@font\endcsname\heiti\sanhao[1] \ifthu@bachelor\xiaosan\else \def\@tempa{#1} \def\@tempb{\eabstractname} @@ -433,7 +366,7 @@ \fi \interlinepenalty\@M #1\par\nobreak - \vskip 24bp}} + \ifthu@bachelor\vskip 20bp\else\vskip 24bp\fi}} \newcounter{thu@bookmark} \def\thu@chapter*{% \@ifnextchar [ % ] @@ -462,17 +395,17 @@ \@mkboth{#3}{#3} \fi} \renewcommand\section{\@startsection {section}{1}{\z@}% - {\ifthu@bachelor -20bp\else -24bp\fi\@plus -1ex \@minus -.2ex}% - {6bp \@plus .2ex}% - {\hei\csname thu@title@font\endcsname\sihao[1.429]}} + {\ifthu@bachelor -25bp\else -24bp\fi\@plus -1ex \@minus -.2ex}% + {\ifthu@bachelor 12bp\else 6bp\fi \@plus .2ex}% + {\csname thu@title@font\endcsname\heiti\sihao[1.429]}} \renewcommand\subsection{\@startsection{subsection}{2}{\z@}% {\ifthu@bachelor -12bp\else -16bp\fi\@plus -1ex \@minus -.2ex}% {6bp \@plus .2ex}% - {\hei\csname thu@title@font\endcsname\ifthu@bachelor\xiaosi[1.667]\else\banxiaosi[1.538]\fi}} + {\csname thu@title@font\endcsname\heiti\ifthu@bachelor\xiaosi[1.667]\else\banxiaosi[1.538]\fi}} \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% {\ifthu@bachelor -12bp\else -16bp\fi\@plus -1ex \@minus -.2ex}% {6bp \@plus .2ex}% - {\hei\csname thu@title@font\endcsname\xiaosi[1.667]}} + {\csname thu@title@font\endcsname\heiti\xiaosi[1.667]}} \setcounter{secnumdepth}{3} \ifthu@doctor \setcounter{tocdepth}{2} @@ -481,7 +414,7 @@ \fi \renewcommand\tableofcontents{% \thu@chapter*[]{\contentsname} - \ifthu@bachelor\xiaosi[1.8]\else\xiaosi[1.5]\fi\@starttoc{toc}\normalsize} + \ifthu@bachelor\xiaosi[1.8]\else\xiaosi[1.65]\fi\@starttoc{toc}\normalsize} \ifthu@arialtoc \def\thu@toc@font{\sffamily} \fi @@ -513,7 +446,7 @@ \leavevmode \advance\leftskip\@tempdima \hskip -\leftskip - {\hei\ifthu@bachelor\sffamily\else\csname thu@toc@font\endcsname\fi #1} % numberline is called here, and it uses \@tempdima + {\ifthu@bachelor\sffamily\else\csname thu@toc@font\endcsname\fi\heiti #1} % numberline is called here, and it uses \@tempdima \leaders\hbox{$\m@th\mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill \nobreak{\normalfont\normalcolor #2}\par \penalty\@highpenalty @@ -593,19 +526,19 @@ \thu@put@title{\thu@secretlevel}\expandafter\thu@underline\ifthu@secret\thu@secret@content\else\relax\fi\par \thu@put@title{U D C}\thu@underline\thu@udc\hfill% \thu@put@title{\thu@id@title}\thu@underline\thu@id\par\vskip3cm\endgroup - \begingroup\hei - {\xiaochu\ziju{1em}\thu@schoolname}\par\vskip2cm - {\xiaoyi\ziju{1em}\thu@postdoctor@report@title}\par\vskip3cm + \begingroup\heiti + {\xiaochu\ziju{1}\thu@schoolname}\par\vskip2cm + {\xiaoyi\ziju{1}\thu@postdoctor@report@title}\par\vskip3cm {\sanhao[1.5]\thu@ctitle}\par\vskip2cm {\xiaoer\thu@cauthor} \endgroup \par\vskip3cm - {\xiaosan[1.5]\ziju{1em}\thu@schoolname\par\vskip0.5em\CJK@todaysmall@short} + {\xiaosan[1.5]\ziju{1}\thu@schoolname\par\vskip0.5em\CJK@todaysmall@short} \end{center} \cleardoublepage \begin{center} \vspace*{2cm} - {\sihao\hei\thu@ctitle\par\thu@etitle}\par + {\sihao\heiti\thu@ctitle\par\thu@etitle}\par \parbox[t][7cm][b]{\textwidth-6cm}{\sihao[1.5]% \setlength{\thu@title@width}{11em} \setlength{\extrarowheight}{6pt} @@ -622,47 +555,40 @@ \vskip2cm {\sihao\thu@postdoctor@date@title\hskip1em\underline\thu@postdoctordate} \end{center}} +\newcommand*{\getcmlength}[1]{\strip@pt\dimexpr0.035146\dimexpr#1\relax\relax} \newcommand{\thu@first@titlepage@other}{ \begin{center} \vspace*{-1.3cm} \parbox[b][2.4cm][t]{\textwidth}{% \ifthu@secret\hfill{\sihao\thu@secretlevel\thu@secret@content}\else\rule{1cm}{0cm}\fi} \ifthu@bachelor - \vskip0.2cm - {\ziju{10bp}\yihao\li\thu@schoolname} - \par\vskip1.2cm - {\ziju{18bp}\xiaochu\hei\thu@bachelor@subtitle} - \vskip2.5cm - \noindent\hei\xiaoer\thu@bachelor@title@pre\thu@title@sep + \vskip0.45cm + {\yihao\lishu\ziju{0.3846}\thu@schoolname} + \par\vskip1.5cm + {\xiaochu\heiti\ziju{0.5}\thu@bachelor@subtitle} + \vskip2.2cm + \noindent\heiti\xiaoer\thu@bachelor@title@pre\thu@title@sep \parbox[t]{12cm}{% - \setbox0=\hbox{{\yihao[1.55]\thu@ctitle}} - \begin{picture}(0,0)(0,0) - \setlength\unitlength{1cm} - \linethickness{1.3pt} - \put(0,-0.25){\line(1,0){12}} - \ifdim\wd0>12cm - \put(0,-1.68){\line(1,0){12}} - \fi - \end{picture}% - \ignorespaces\yihao[1.55]\thu@ctitle} %TODO: CJKulem.sty - \vskip1.55cm + \ignorespaces\yihao[1.55]% + \renewcommand{\CJKunderlinebasesep}{0.25cm}% + \renewcommand{\ULthickness}{1.3pt}% + \def\CJKunderlinecolor{}% + \CJKunderline*{\thu@ctitle}} + \vskip1.3cm \else + \vskip0.8cm \parbox[t][9cm][t]{\paperwidth-8cm}{ - \renewcommand{\baselinestretch}{1.5} + \renewcommand{\baselinestretch}{1.3} \begin{center} - \yihao[1.2]{\hei\sffamily\thu@ctitle}\par - \ifthu@master - \erhao[1.1] \textbf{\sffamily\thu@etitle}\par\vskip 5bp - \else % for doctor - \par\vskip 20bp - \fi - \xiaoer[1] \textrm{{\ziju{2bp}\thu@apply}} + \yihao[1.2]{\sffamily\heiti\thu@ctitle}\par + \par\vskip 18bp + \xiaoer[1] \textrm{\thu@apply} \end{center}} \fi \ifthu@bachelor \vskip1cm \parbox[t][7.0cm][t]{\textwidth}{{\sanhao[1.8] - \hspace*{1.65cm}\fs + \hspace*{1.65cm}\fangsong \setlength{\thu@title@width}{4em} \setlength{\extrarowheight}{6pt} \ifxetex % todo: ugly codes @@ -680,33 +606,46 @@ \end{tabular} }} \else + \vskip 5bp \parbox[t][7.8cm][t]{\textwidth}{{\sanhao[1.5] - \begin{center}\fs - \setlength{\thu@title@width}{6em} + \begin{center}\fangsong + \setlength{\thu@title@width}{5em} \setlength{\extrarowheight}{4pt} \ifxetex % todo: ugly codes \begin{tabular}{p{\thu@title@width}@{}c@{\extracolsep{8pt}}l} \else \begin{tabular}{p{\thu@title@width}c@{\extracolsep{4pt}}l} \fi - \thu@put@title{\thu@department@title} & \thu@title@sep & {\ziju{3bp}\thu@cdepartment}\\ - \thu@put@title{\thu@major@title} & \thu@title@sep & {\ziju{3bp}\thu@cmajor}\\ - \thu@put@title{\thu@author@title} & \thu@title@sep & {\ziju{11bp}\thu@cauthor}\\ - \thu@put@title{\thu@supervisor@title} & \thu@title@sep & {\ziju{11bp}\thu@csupervisor}\\ + \thu@put@title{\thu@department@title} & \thu@title@sep & {\ziju{0.1875}\thu@cdepartment}\\ + \thu@put@title{\thu@major@title} & \thu@title@sep & {\ziju{0.1875}\thu@cmajor}\\ + \thu@put@title{\thu@author@title} & \thu@title@sep & {\ziju{0.6875}\thu@cauthor}\\ + \thu@put@title{\thu@supervisor@title} & \thu@title@sep & {\ziju{0.6875}\thu@csupervisor}\\ \ifx\thu@cassosupervisor\@empty\else - \thu@put@title{\thu@assosuper@title} & \thu@title@sep & {\ziju{11bp}\thu@cassosupervisor}\\ + \thu@put@title{\thu@assosuper@title} & \thu@title@sep & {\ziju{0.6875}\thu@cassosupervisor}\\ \fi \ifx\thu@ccosupervisor\@empty\else - \thu@put@title{\thu@cosuper@title} & \thu@title@sep & {\ziju{11bp}\thu@ccosupervisor}\\ + \thu@put@title{\thu@cosuper@title} & \thu@title@sep & {\ziju{0.6875}\thu@ccosupervisor}\\ \fi \end{tabular} \end{center}}} \fi \begin{center} - {\ifthu@bachelor\hskip-0.9cm\xiaosi\else\sanhao\fi \song \thu@cdate} + {\ifthu@bachelor\vskip-1.0cm\hskip-1.2cm\xiaosi\else\vskip-0.5cm\sanhao\fi \songti \thu@cdate} \end{center} \end{center}} % end of titlepage -\newcommand{\thu@doctor@engcover}{% +\newcommand{\thu@engcover}{% + \def\thu@master@art{Master of Arts} + \def\thu@master@sci{Master of Science} + \def\thu@doctor@phi{Doctor of Philosophy} + \newif\ifthu@professional + \thu@professionalfalse + \ifthu@master + \ifx\thu@edegree\thu@master@art\relax\else + \ifx\thu@edegree\thu@master@sci\relax\else + \thu@professionaltrue\fi\fi\fi + \ifthu@doctor + \ifx\thu@edegree\thu@doctor@phi\relax\else + \thu@professionaltrue\fi\fi \begin{center} \vspace*{0.2cm} \parbox[t][5.2cm][t]{\paperwidth-7.2cm}{ @@ -714,26 +653,38 @@ \begin{center} \erhao[1.1]\bfseries\sffamily\thu@etitle \end{center}} - \parbox[t][5.8cm][t]{\paperwidth-7.2cm}{ + \parbox[t][][t]{\paperwidth-7.2cm}{ \renewcommand{\baselinestretch}{1.3} \begin{center} - \sanhao Dissertation Submitted to\\ + \sanhao + \ifthu@master Thesis \else Dissertation \fi + Submitted to\\ {\bfseries Tsinghua University}\\ in partial fulfillment of the requirement\\ - for the degree of\\ + for the \ifthu@professional professional \fi + degree of\\ {\bfseries\sffamily\thu@edegree} + \ifthu@professional\relax\else + \\in\\[3bp] + {\bfseries\sffamily\thu@emajor} + \fi \end{center}} - \parbox[t][3.6cm][b]{\paperwidth-7.2cm}{ + \parbox[t][][b]{\paperwidth-7.2cm}{ \renewcommand{\baselinestretch}{1.3} \begin{center} \sanhao\sffamily by\\[3bp] - \bfseries\thu@eauthor\\(~\thu@emajor~) + \bfseries\thu@eauthor + \ifthu@professional + \ifx\thu@emajor\empty\relax\else + \\(~\thu@emajor~) + \fi\fi \end{center}} \par\vspace{0.9cm} \parbox[t][2.1cm][t]{\paperwidth-7.2cm}{ \renewcommand{\baselinestretch}{1.2}\xiaosan\centering \begin{tabular}{rl} - Dissertation Supervisor : & \thu@esupervisor\\ + \ifthu@master Thesis \else Dissertation \fi + Supervisor : & \thu@esupervisor\\ \ifx\thu@eassosupervisor\@empty \else Associate Supervisor : & \thu@eassosupervisor\\\fi \ifx\thu@ecosupervisor\@empty @@ -745,15 +696,15 @@ \end{center}} \end{center}} \newcommand{\thu@authorization@mk}{% - \ifthu@bachelor\vspace*{-0.6cm}\else\vspace*{-0.1cm}\fi % shit code! - \begin{center}\erhao\hei\thu@authtitle\end{center} - \ifthu@bachelor\vskip\baselineskip\else\vskip18pt\sihao[2.03]\fi\par + \ifthu@bachelor\vspace*{0.5cm}\else\vspace*{0.72cm}\fi % shit code! + \begin{center}\erhao\heiti\thu@authtitle\end{center} + \ifthu@bachelor\vskip5pt\else\vskip40pt\sihao[2.03]\fi\par \thu@authorization\par \textbf{\thu@authorizationaddon}\par - \ifthu@bachelor\vskip1.0cm\else\vskip1.9cm\fi + \ifthu@bachelor\vskip0.7cm\else\vskip1.0cm\fi \ifthu@bachelor - \ifthu@bachelor\indent\else\noindent\fi\thu@authorsig\thu@underline\relax% - \thu@teachersig\thu@underline\relax\thu@frontdate\thu@underline\relax + \indent\mbox{\thu@authorsig\thu@underline\relax% + \thu@teachersig\thu@underline\relax\thu@frontdate\thu@underline\relax} \else \begingroup \parindent0pt\xiaosi @@ -769,12 +720,22 @@ \normalsize% \begin{titlepage} \thu@first@titlepage - \ifthu@doctor - \cleardoublepage\thu@doctor@engcover - \fi + \ifthu@bachelor\relax\else + \ifthu@postdoctor\relax\else + \cleardoublepage\thu@engcover + \fi\fi \ifthu@postdoctor\relax\else% \ifthu@bachelor\clearpage\else\cleardoublepage\fi% - \thu@authorization@mk\fi + \ifthu@bachelor\thu@authorization@mk\else% + \begin{list}{}{% + \topsep\z@% + \listparindent\parindent% + \parsep\parskip% + \setlength{\leftmargin}{0.9mm}% + \setlength{\rightmargin}{0.9mm}}% + \item[]\thu@authorization@mk% + \end{list}\fi% + \fi \end{titlepage} \normalsize \thu@makeabstract @@ -790,13 +751,13 @@ \pagenumbering{Roman} \thu@cabstract \vskip12bp - \setbox0=\hbox{{\hei\thu@ckeywords@title}} + \setbox0=\hbox{{\heiti\thu@ckeywords@title}} \ifthu@bachelor\indent\else\noindent\hangindent\wd0\hangafter1\fi \box0\thu@ckeywords \thu@chapter*[]{\eabstractname} % no tocline \thu@eabstract \vskip12bp - \setbox0=\hbox{\textbf{Key words:\enskip}} + \setbox0=\hbox{\textbf{\ifthu@bachelor Keywords:\else Key words:\fi\enskip}} \ifthu@bachelor\indent\else\noindent\hangindent\wd0\hangafter1\fi \box0\thu@ekeywords} \newenvironment{denotation}[1][2.5cm]{ @@ -851,8 +812,8 @@ \DeclareRobustCommand\onlinecite{\@onlinecite} \def\@onlinecite#1{\begingroup\let\@cite\NAT@citenum\citep{#1}\endgroup} \def\thudot{\ifthu@bachelor\else\unskip.\fi} -\def\thumasterbib{\ifthu@doctor [M]\else [Master Thesis]\fi} -\def\thuphdbib{\ifthu@doctor [D]\else [Doctor Thesis]\fi} +\def\thumasterbib{\ifthu@bachelor [D]\else [硕士学位论文]\fi} +\def\thuphdbib{\ifthu@bachelor [D]\else [博士学位论文]\fi} \renewenvironment{thebibliography}[1]{% \thu@chapter*{\bibname}% \wuhao[1.5] @@ -883,9 +844,9 @@ }{} \newenvironment{resume}[1][\thu@resume@title]{% \thu@chapter*{#1}}{} -\newcommand{\resumeitem}[1]{\vspace{2.5em}{\sihao\hei\centerline{#1}}\par} +\newcommand{\resumeitem}[1]{\vspace{24pt}{\sihao\heiti\centerline{#1}}\par\vspace{6pt}} \newcommand{\shuji}[1][\thu@ctitle]{ - \newpage\thispagestyle{empty}\ziju{0.4em}\fs\xiaosan + \newpage\thispagestyle{empty}\fangsong\xiaosan\ziju{0.4} \hfill\rotatebox{-90}{\hb@xt@ \textheight{#1\hfill\thu@cauthor}}} \iffalse \newcommand{\bs}{\symbol{'134}}%Print backslash @@ -903,37 +864,8 @@ \texttt{#1}} \newcommand{\wi}[1]{\index{#1}#1} \fi -\newcommand*{\ziju}[1]{\renewcommand{\CJKglue}{\hskip #1}} \newcommand{\pozhehao}{\kern0.3ex\rule[0.8ex]{2em}{0.1ex}\kern0.3ex} -\def\thu@active@cjk{ - % Activate all >128 characters. - \count@=128 - \@whilenum\count@<254 \do{% - \advance\count@ by 1 - \lccode`\~=\count@ - \catcode\count@=\active - \lowercase{\def~{\kern1ex}}}} -\AtEndOfClass{\ifxetex\else\thu@active@cjk\fi\input{thuthesis.cfg}} -\def\thu@fixselectfont{% - \ifx\@EverySelectfont@EveryHook\@undefined\else% everysel package is loaded - \DeclareRobustCommand{\selectfont}{% - \ifx\f@linespread\baselinestretch \else - \set@fontsize\baselinestretch\f@size\f@baselineskip \fi - \xdef\font@name{% - \csname\curr@fontshape/\f@size\endcsname}% - \pickup@font - \font@name - % CJK addition: - \CJK@bold@false - \csname \curr@fontshape\endcsname - % everysel addition: - \@EverySelectfont@EveryHook - \@EverySelectfont@AtNextHook - \gdef\@EverySelectfont@AtNextHook{}% - % end additions - \size@update - \enc@update} - \fi} +\AtEndOfClass{\input{thuthesis.cfg}} \def\thu@setup@pdfinfo{% \hypersetup{% pdftitle={\thu@ctitle}, @@ -942,20 +874,6 @@ pdfkeywords={\thu@ckeywords}, pdfcreator={\thu@cauthor}, pdfproducer={\thuthesis}}} -\ifxetex - \AtBeginDocument{\CJKindent} -\else - \def\thu@beginCJK{% - \thu@fixselectfont% - \begin{CJK*}{UTF8}{song}\CJKindent} - \def\thu@endCJK{\clearpage\end{CJK*}} - \let\thu@begindocumenthook\@begindocumenthook - \let\thu@enddocumenthook\@enddocumenthook - \def\AtBeginDocument{\g@addto@macro\thu@begindocumenthook} - \def\AtEndDocument{\g@addto@macro\thu@enddocumenthook} - \def\@begindocumenthook{\thu@begindocumenthook\thu@beginCJK} - \def\@enddocumenthook{\thu@endCJK\thu@enddocumenthook} -\fi \AtEndOfClass{\sloppy\thu@item@space} \endinput %% diff --git a/Master/texmf-dist/tex/latex/thuthesis/thutils.sty b/Master/texmf-dist/tex/latex/thuthesis/thutils.sty index dcafb0e7807..62a3229d0fb 100644 --- a/Master/texmf-dist/tex/latex/thuthesis/thutils.sty +++ b/Master/texmf-dist/tex/latex/thuthesis/thutils.sty @@ -17,7 +17,7 @@ \RequirePackage{tabularx} % 表格中的反斜线 -\RequirePackage{slashbox} +\RequirePackage{diagbox} % 确定浮动对象的位置,可以使用~H,强制将浮动对象放到这里(可能效果很差) \RequirePackage{float} -- cgit v1.2.3