From 4d5ecf8fcf4e6667025feb557ddbb30c9f671c7a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 11 Jan 2016 22:12:17 +0000 Subject: thuthesis (11jan16) git-svn-id: svn://tug.org/texlive/trunk@39351 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/thuthesis/thuthesis.cfg | 6 +- .../texmf-dist/tex/latex/thuthesis/thuthesis.cls | 112 ++++++++++----------- .../texmf-dist/tex/latex/thuthesis/thuthesis.sty | 20 ++-- 3 files changed, 66 insertions(+), 72 deletions(-) (limited to 'Master/texmf-dist/tex/latex/thuthesis') diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg index 8d657ce0bfa..2095c171ef9 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-2015 by Xue Ruini +%% Copyright (C) 2005-2016 by Xue Ruini %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3a @@ -22,8 +22,9 @@ %% %% This is the configuration file of the thuthesis package with LaTeX2e. %% +%% \end{latex} \ProvidesFile{thuthesis.cfg} -[2015/12/27 5.1.0 Tsinghua University Thesis Template] +[2016/1/11 5.2.0 Tsinghua University Thesis Template] \theoremsymbol{\ensuremath{\square}} \newtheorem*{proof}{证明} \theoremstyle{plain} @@ -176,6 +177,7 @@ \newcommand{\thu@resume@title}{个人简历、在学期间发表的学术论文与研究成果} \fi \fi +\newcommand{\pozhehao}{——} \endinput %% %% End of file `thuthesis.cfg'. diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls index 35320b4a26c..f7c251b455c 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-2015 by Ruini Xue +%% Copyright (C) 2005-2016 by Ruini Xue %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3a @@ -23,12 +23,13 @@ %% To produce the documentation run the original source files ending with `.dtx' %% through LaTeX. %% +%% \end{latex} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{thuthesis} -[2015/12/27 5.1.0 Tsinghua University Thesis Template] +[2016/1/11 5.2.0 Tsinghua University Thesis Template] \hyphenation{Thu-Thesis} \def\thuthesis{\textsc{ThuThesis}} -\def\version{5.1.0} +\def\version{5.2.0} \RequirePackage{kvoptions} \SetupKeyvalOptions{ @@ -65,7 +66,6 @@ raggedbottom, arial, arialtitle} - \ProcessKeyvalOptions* \PassOptionsToPackage{no-math}{fontspec} \LoadClass[a4paper,openany,UTF8,zihao=-4,scheme=plain,fontset=none]{ctexbook} @@ -359,35 +359,26 @@ subparagraph/afterindent=true} \newcounter{thu@bookmark} \NewDocumentCommand\thu@chapter{s o m o}{ - \IfBooleanF{#1} - {% + \IfBooleanF{#1}{% \ClassError{thuthesis}{You have to use the star form: \string\thu@chapter*}{} - } - - \IfValueTF{#2} - {% - \ifthenelse{\equal{#2}{}} - {% + }% + \if@openright\cleardoublepage\else\clearpage\fi\phantomsection% + \IfValueTF{#2}{% + \ifthenelse{\equal{#2}{}}{% \addtocounter{thu@bookmark}\@ne \pdfbookmark[0]{#3}{thuchapter.\thethu@bookmark} - } - {% + }{% \addcontentsline{toc}{chapter}{#3} } - } - {% + }{% \addcontentsline{toc}{chapter}{#3} - } - - \chapter*{#3}%\phantomsection - - \IfValueTF{#4} - {% + }% + \chapter*{#3}% + \IfValueTF{#4}{% \ifthenelse{\equal{#4}{}} {\@mkboth{}{}} {\@mkboth{#4}{#4}} - } - {% + }{% \@mkboth{#3}{#3} } } @@ -441,23 +432,23 @@ \expandafter\gdef\csname #1\endcsname##1{% \expandafter\gdef\csname thu@#1\endcsname{##1}} \csname #1\endcsname{}} -\thu@def@term{catalognumber} -\thu@def@term{udc} \thu@def@term{id} +\thu@def@term{udc} +\thu@def@term{catalognumber} \thu@def@term{secretlevel} \thu@def@term{secretyear} \thu@def@term{ctitle} \thu@def@term{cdegree} -\newcommand\cdepartment[2][]{% todo: for definekeys - \def\thu@cdepartment@short{#1} - \def\thu@cdepartment{#2}} -\define@key{thu}{cdepartment}{% - \expandafter\cdepartment#1} -\def\caffil{\cdepartment} % for compatibility -\def\thu@cdepartment@short{} -\def\thu@cdepartment{} +\thu@def@term{cdepartment} +\def\caffil{% for compatibility + \ClassWarning{thuthesis} + {'\string\caffil' is deprecated, please use '\string\cdepartment' instead.}{}% + \cdepartment} \thu@def@term{cmajor} -\def\csubject{\cmajor} % for compatibility +\def\csubject{% for compatibility + \ClassWarning{thuthesis} + {'\string\csubject' is deprecated, please use '\string\cmajor' instead.}{}% + \cmajor} \thu@def@term{cfirstdiscipline} \thu@def@term{cseconddiscipline} \thu@def@term{cauthor} @@ -469,9 +460,15 @@ \thu@def@term{etitle} \thu@def@term{edegree} \thu@def@term{edepartment} -\def\eaffil{\edepartment} % for compability +\def\eaffil{% for compability + \ClassWarning{thuthesis} + {'\string\eaffil' is deprecated, please use '\string\edepartment' instead.}{}% + \edepartment} \thu@def@term{emajor} -\def\esubject{\emajor} %for compability +\def\esubject{%for compability + \ClassWarning{thuthesis} + {'\string\esubject' is deprecated, please use '\string\emajor' instead.}{}% + \emajor} \thu@def@term{eauthor} \thu@def@term{esupervisor} \thu@def@term{eassosupervisor} @@ -851,38 +848,33 @@ \endlist\frenchspacing} \let\thu@appendix\appendix \renewenvironment{appendix}{% - \thu@appendix - }{} + \let\title\thu@appendix@title + \thu@appendix}{% + \let\title\@gobble} +\let\title\@gobble +\newcommand{\thu@appendix@title}[1]{% + \begin{center} + \bfseries\xiaosi #1 + \end{center}} +\newlist{translationbib}{enumerate}{1} +\setlist[translationbib]{label=[\arabic*],align=left,nosep,itemsep=6bp, + leftmargin=10mm,labelsep=!,before=\vspace{0.5\baselineskip}\wuhao[1.3]} \newenvironment{resume}[1][\thu@resume@title]{% \thu@chapter*{#1}}{} -\newcommand{\resumeitem}[1]{\vspace{24bp}{\sihao\heiti\centerline{#1}}\par\vspace{6bp}} -\newcommand{\researchitem}[1]{\vspace{32bp}{\sihao\heiti\centerline{#1}}\par\vspace{14bp}} +\newcommand{\resumeitem}[1]{% + \vspace{24bp}{\sihao\heiti\centerline{#1}}\par\vspace{6bp}} +\newcommand{\researchitem}[1]{% + \vspace{32bp}{\sihao\heiti\centerline{#1}}\par\vspace{14bp}} \newlist{publications}{enumerate}{1} \setlist[publications]{label=[\arabic*],align=left,nosep,itemsep=8bp, -leftmargin=10mm,labelsep=!,before*=\xiaosi[1.26],after*=\vspace{29bp},resume} + leftmargin=10mm,labelsep=!,before=\xiaosi[1.26],resume} \newlist{achievements}{enumerate}{1} \setlist[achievements]{label=[\arabic*],align=left,nosep,itemsep=8bp, -leftmargin=10mm,labelsep=!,before*=\xiaosi[1.26]} + leftmargin=10mm,labelsep=!,before=\xiaosi[1.26]} +\def\publicationskip{\bigskip\bigskip} \NewDocumentCommand{\shuji}{O{\thu@ctitle} O{\thu@cauthor}}{% \newpage\thispagestyle{empty}\fangsong\xiaosan\ziju{0.4}% \noindent\hfill\rotatebox[origin=lt]{-90}{\makebox[\textheight]{#1\hfill#2}}} -\iffalse -\newcommand{\bs}{\symbol{'134}}%Print backslash -\newcommand{\cih}[1]{% - \index{commands!#1@\texttt{\bs#1}}% - \index{#1@\texttt{\hspace*{-1.2ex}\bs #1}}} -\newcommand{\ci}[1]{\cih{#1}\texttt{\bs#1}} -\newcommand{\pai}[1]{% - \index{packages!#1@\textsf{#1}}% - \index{#1@\textsf{#1}}% - \textsf{#1}} -\newcommand{\ei}[1]{% - \index{environments!\texttt{#1}}% - \index{#1@\texttt{#1}}% - \texttt{#1}} -\newcommand{\wi}[1]{\index{#1}#1} -\fi -\newcommand{\pozhehao}{——} \AtEndOfClass{\input{thuthesis.cfg}} \AtEndOfClass{\sloppy} \endinput diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.sty b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.sty index 4b5940223b1..315ee726225 100644 --- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.sty +++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.sty @@ -1,17 +1,17 @@ \ProvidesPackage{thuthesis}[2007/11/30 4.1 put any packages you would like to use here] % 处理数学公式中的黑斜体的宏包 -%\RequirePackage{bm} +% \RequirePackage{bm} -% 不同于~|\mathcal| or |\mathfrak| 之类的英文花体字体 -%\RequirePackage{mathrsfs} +% 不同于 \mathcal \mathfrak 之类的英文花体字体 +% \RequirePackage{mathrsfs} % 表格中支持跨行 \RequirePackage{multirow} % 跨页表格 -%\RequirePackage{longtable} +% \RequirePackage{longtable} % 固定宽度的表格 \RequirePackage{tabularx} @@ -19,16 +19,16 @@ % 表格中的反斜线 \RequirePackage{diagbox} -% 确定浮动对象的位置,可以使用~H,强制将浮动对象放到这里(可能效果很差) +% 确定浮动对象的位置,可以使用 H,强制将浮动对象放到这里(可能效果很差) \RequirePackage{float} % 浮动图形控制宏包。 -% 允许上一个~section 的浮动图形出现在下一个~section 的开始部分 -% 该宏包提供处理浮动对象的~|\FloatBarrier| 命令,使所有未处 +% 允许上一个 section 的浮动图形出现在下一个 section 的开始部分 +% 该宏包提供处理浮动对象的 \FloatBarrier 命令,使所有未处 % 理的浮动图形立即被处理。这三个宏包仅供参考,未必使用: - % \RequirePackage[below]{placeins} - % \RequirePackage{floatflt} % 图文混排用宏包 - % \RequirePackage{rotating} % 图形和表格的控制旋转 +% \RequirePackage[below]{placeins} +% \RequirePackage{floatflt} % 图文混排用宏包 +% \RequirePackage{rotating} % 图形和表格的控制旋转 % 给自定义的宏后面自动加空白 % \RequirePackage{xspace} -- cgit v1.2.3