From 9484681dceef0e89457f4f8d595aafa1b543769b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Mar 2016 23:38:54 +0000 Subject: thuthesis (28feb16) git-svn-id: svn://tug.org/texlive/trunk@39915 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/thuthesis/thuthesis.cls | 36 ++++++++++++---------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls') diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls index f7358e248c6..e081ea0739c 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/01/18 5.2.1 Tsinghua University Thesis Template] +[2016/02/27 5.2.3 Tsinghua University Thesis Template] \hyphenation{Thu-Thesis} \def\thuthesis{\textsc{ThuThesis}} -\def\version{5.2.2} +\def\version{5.2.3} \RequirePackage{kvoptions} \SetupKeyvalOptions{ @@ -101,7 +101,6 @@ \RequirePackage{pifont} \fi \RequirePackage{CJKfntef} -\renewcommand{\baselinestretch}{1.0} % todo:? \ifxetex \def\CJK@null{\kern\CJKnullspace\Unicode{48}{7}\kern\CJKnullspace} \defaultfontfeatures{Mapping=tex-text} @@ -181,13 +180,15 @@ \renewcommand\backmatter{% \if@openright\cleardoublepage\else\clearpage\fi \@mainmattertrue} -\newlength\thu@linespace -\newcommand{\thu@choosefont}[2]{% - \setlength{\thu@linespace}{#2*\real{#1}}% - \fontsize{#2}{\thu@linespace}\selectfont} +\renewcommand\normalsize{% + \@setfontsize\normalsize{12bp}{20bp}% + \abovedisplayskip=20bp \@plus 2bp \@minus 2bp + \abovedisplayshortskip=20bp \@plus 2bp \@minus 2bp + \belowdisplayskip=\abovedisplayskip + \belowdisplayshortskip=\abovedisplayshortskip} \def\thu@def@fontsize#1#2{% - \expandafter\newcommand\csname #1\endcsname[1][\baselinestretch]{% - \thu@choosefont{##1}{#2}}} + \expandafter\newcommand\csname #1\endcsname[1][1.3]{% + \fontsize{#2}{##1\dimexpr #2}\selectfont}} \thu@def@fontsize{chuhao}{42bp} \thu@def@fontsize{xiaochu}{36bp} \thu@def@fontsize{yihao}{26bp} @@ -206,12 +207,6 @@ \thu@def@fontsize{xiaoliu}{6.5bp} \thu@def@fontsize{qihao}{5.5bp} \thu@def@fontsize{bahao}{5bp} -\renewcommand\normalsize{% - \@setfontsize\normalsize{12bp}{20bp}% - \abovedisplayskip=20bp \@plus 2bp \@minus 2bp - \abovedisplayshortskip=20bp \@plus 2bp \@minus 2bp - \belowdisplayskip=\abovedisplayskip - \belowdisplayshortskip=\abovedisplayshortskip} \fancypagestyle{thu@empty}{% \fancyhf{} \renewcommand{\headrulewidth}{0pt} @@ -257,10 +252,17 @@ \renewcommand\theequation{\ifnum \c@chapter>\z@ \thechapter-\fi\@arabic\c@equation} \def\make@df@tag{\@ifstar\thu@make@df@tag@@\make@df@tag@@@} \def\thu@make@df@tag@@#1{\gdef\df@tag{\thu@maketag{#1}\def\@currentlabel{#1}}} -\renewcommand{\eqref}[1]{\textup{(\ref{#1})}} -\renewcommand\theequation{\ifnum \c@chapter>\z@ \thechapter-\fi\@arabic\c@equation} +\iffalse +\ifthu@bachelor + \def\thu@maketag#1{\maketag@@@{% + (\ignorespaces\text{\equationname\hskip0.5em}#1\unskip\@@italiccorr)}} + \def\tagform@#1{\maketag@@@{% + (\ignorespaces\text{\equationname\hskip0.5em}#1\unskip\@@italiccorr)\equcaption{#1}}} +\fi +\fi \def\thu@maketag#1{\maketag@@@{(\ignorespaces #1\unskip\@@italiccorr)}} \def\tagform@#1{\maketag@@@{(\ignorespaces #1\unskip\@@italiccorr)\equcaption{#1}}} +\renewcommand{\eqref}[1]{\textup{(\ref{#1})}} \theorembodyfont{\rmfamily\songti} \theoremheaderfont{\rmfamily\heiti} \setlength{\floatsep}{20bp \@plus4pt \@minus1pt} -- cgit v1.2.3