thuthesis (24apr18)

git-svn-id: svn://tug.org/texlive/trunk@47502 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 53 insertions, 36 deletions

diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
index 21f0238eadc..75268fc2877 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-2017 by Xue Ruini <xueruini@gmail.com>
+%% Copyright (C) 2005-2018 by Xue Ruini <xueruini@gmail.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,8 +20,9 @@
 %% 
 %% This is the configuration file of the ThuThesis package with LaTeX2e.
 %% 
+
 \ProvidesFile{thuthesis.cfg}
-[2017/12/24 5.4.3 Tsinghua University Thesis Template]
+[2018/04/24 5.4.4 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 3a487f17c8e..ea6884052d8 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-2017 by Ruini Xue <xueruini@gmail.com>
+%% Copyright (C) 2005-2018 by Ruini Xue <xueruini@gmail.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,12 +21,13 @@
 %% To produce the documentation run the original source files ending with `.dtx'
 %% through LaTeX.
 %% 
+
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{thuthesis}
-[2017/12/24 5.4.3 Tsinghua University Thesis Template]
+[2018/04/24 5.4.4 Tsinghua University Thesis Template]
 \hyphenation{Thu-Thesis}
 \def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.4.3}
+\def\version{5.4.4}
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -54,15 +55,15 @@
 \DeclareVoidOption{doctor}{\thu@deprecated@degree@option}
 \DeclareVoidOption{postdoctor}{\thu@deprecated@degree@option}
 \DeclareBoolOption{secret}
-\DeclareBoolOption{arialtoc}
-\DeclareBoolOption{arialtitle}
+\DeclareBoolOption{tocarialchapter}
+\DeclareBoolOption{tocarialchapterentry}
+\DeclareBoolOption{tocarialchapterpage}
 \IfFileExists{/dev/null}{}{\PassOptionsToClass{fontset=windowsold}{ctexbook}}
 \DeclareBoolOption{raggedbottom}
 \DeclareBoolOption{pifootnote}
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}}
 \kvsetkeys{thu}{%
-  raggedbottom,
-  arialtitle}
+  raggedbottom}
 \ProcessKeyvalOptions*
 \ifthu@bachelor\relax\else
   \ifthu@master\relax\else
@@ -148,6 +149,7 @@
     footskip=6mm}
 \fi
 \RequirePackage{fancyhdr}
+\RequirePackage{notoccite}
 \let\thu@cleardoublepage\cleardoublepage
 \newcommand{\thu@clearemptydoublepage}{%
   \clearpage{\pagestyle{thu@empty}\thu@cleardoublepage}}
@@ -267,10 +269,10 @@
 \DeclareCaptionLabelFormat{thu}{{\dawu[1.5]\normalfont #1~#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[sub]{font=thu,skip=6bp}
+\captionsetup{labelformat=thu,labelsep=thu,font=thu,skip=6bp}
+\captionsetup[table]{position=top}
+\captionsetup[figure]{position=bottom}
+\captionsetup[sub]{font=thu}
 \renewcommand{\thesubfigure}{(\alph{subfigure})}
 \renewcommand{\thesubtable}{(\alph{subtable})}
 \let\thu@LT@array\LT@array
@@ -278,8 +280,6 @@
 \def\hlinewd#1{%
   \noalign{\ifnum0=`}\fi\hrule \@height #1 \futurelet
     \reserved@a\@xhline}
-\def\thu@title@font{%
-  \ifthu@arialtitle\sffamily\else\heiti\fi}
 \AtBeginDocument{%
   \pagestyle{thu@empty}
   \renewcommand{\chaptermark}[1]{\@mkboth{\CTEXthechapter\hskip\ccwd#1}{}}}
@@ -297,7 +297,7 @@
     beforeskip={\ifthu@bachelor 15bp\else 9bp\fi},
     aftername=\hskip\ccwd,
     afterskip={\ifthu@bachelor 20bp\else 24bp\fi},
-    format={\centering\thu@title@font\ifthu@bachelor\xiaosan[1.333]\else\sanhao[1]\fi},
+    format={\centering\sffamily\ifthu@bachelor\xiaosan[1.333]\else\sanhao[1]\fi},
     nameformat=\relax,
     numberformat=\relax,
     titleformat=\thu@chapter@titleformat,
@@ -308,20 +308,20 @@
     afterindent=true,
     beforeskip={\ifthu@bachelor 25bp\else 24bp\fi\@plus 1ex \@minus .2ex},
     afterskip={\ifthu@bachelor 12bp\else 6bp\fi \@plus .2ex},
-    format={\thu@title@font\ifthu@bachelor\sihao[1.286]\else\sihao[1.429]\fi},
+    format={\sffamily\ifthu@bachelor\sihao[1.286]\else\sihao[1.429]\fi},
   },
   subsection={
     afterindent=true,
     beforeskip={\ifthu@bachelor 12bp\else 16bp\fi\@plus 1ex \@minus .2ex},
     afterskip={6bp \@plus .2ex},
-    format={\thu@title@font\ifthu@bachelor\xiaosi[1.25]\else\banxiaosi[1.538]\fi},
-    numberformat={\thu@title@font\ifthu@bachelor\banxiaosi[1.154]\else\banxiaosi[1.538]\fi},
+    format={\sffamily\ifthu@bachelor\xiaosi[1.25]\else\banxiaosi[1.538]\fi},
+    numberformat={\sffamily\ifthu@bachelor\banxiaosi[1.154]\else\banxiaosi[1.538]\fi},
   },
   subsubsection={
     afterindent=true,
     beforeskip={\ifthu@bachelor 12bp\else 16bp\fi\@plus 1ex \@minus .2ex},
     afterskip={6bp \@plus .2ex},
-    format={\thu@title@font\ifthu@bachelor\xiaosi[1.25]\else\xiaosi[1.667]\fi},
+    format={\sffamily\ifthu@bachelor\xiaosi[1.25]\else\xiaosi[1.667]\fi},
   },
   paragraph/afterindent=true,
   subparagraph/afterindent=true}
@@ -357,18 +357,18 @@
 \renewcommand\tableofcontents{%
   \thu@chapter*[]{\contentsname}
   \ifthu@bachelor\xiaosi[1.667]\else\xiaosi[1.65]\fi\@starttoc{toc}\normalsize}
-\ifthu@arialtoc
-  \def\thu@toc@font{\sffamily}
-\fi
 \def\@pnumwidth{2em}
 \def\@tocrmarg{\@pnumwidth}
 \def\@dotsep{1}
-\patchcmd{\@dottedtocline}{#4}{\csname thu@toc@font\endcsname #4}{}{}
-\patchcmd{\@dottedtocline}{\hb@xt@\@pnumwidth}{\hbox}{}{}
+\ifthu@tocarialchapter
+  \thu@tocarialchapterentrytrue\thu@tocarialchapterpagetrue
+\fi
+\def\thu@toc@chapter@entry@font{\ifthu@tocarialchapterentry\sffamily\fi}
+\def\thu@toc@chapter@page@font{\ifthu@tocarialchapterpage\sffamily\fi}
 \renewcommand*\l@chapter[2]{%
   \ifnum \c@tocdepth >\m@ne
     \addpenalty{-\@highpenalty}%
-    \ifthu@bachelor \vskip 6bp \else \vskip 4bp \fi \@plus\p@
+    \ifthu@bachelor\vskip 6bp\else\vskip 4bp\fi \@plus\p@
     \setlength\@tempdima{4em}%
     \begingroup
       \parindent \z@ \rightskip \@pnumwidth
@@ -376,13 +376,13 @@
       \leavevmode
       \advance\leftskip\@tempdima
       \hskip -\leftskip
-      % numberline is called here, and it uses \@tempdima
-      {\ifthu@bachelor\sffamily\else\csname thu@toc@font\endcsname\fi\heiti #1}
-      \leaders\hbox{$\m@th\mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill
-      \nobreak{\normalfont\normalcolor #2}\par
+      {\thu@toc@chapter@entry@font #1}%
+      \leaders\hbox{$\m@th\mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill%
+      \nobreak{\thu@toc@chapter@page@font #2}\par
       \penalty\@highpenalty
     \endgroup
   \fi}
+\patchcmd{\@dottedtocline}{\hb@xt@\@pnumwidth}{\hbox}{}{}
 \renewcommand*\l@section{%
   \@dottedtocline{1}{\ccwd}{2.1em}}
 \renewcommand*\l@subsection{%
@@ -519,7 +519,7 @@
       \ifthu@secret{\heiti\sanhao\thu@secretlevel\thu@secret@content}\else\rule{1cm}{0cm}\fi}
     \ifthu@bachelor
       \vskip0.65cm
-      {\yihao\lishu\ziju{0.5}\thu@schoolname}
+      {\ifcsname lishu\endcsname\yihao\lishu\ziju{0.5}\thu@schoolname\else\includegraphics{tsinghua}\fi}
       \par\vskip1.5cm
       {\xiaochu\heiti\ziju{0.5}\textbf\thu@bachelor@subtitle}
       \vskip2.2cm\hskip0.8cm
@@ -600,8 +600,14 @@
                 & {\ziju{0.6875}\thu@cassosupervisor}\\
               \fi
               \ifx\thu@ccosupervisor\@empty\else
-                \hfill\makebox[0pt][r]{\thu@cosuper@title} & \thu@title@sep
-                & {\ziju{0.6875}\thu@ccosupervisor}\\
+                \ifthu@master
+                  \hfill\makebox[0pt][r]{\thu@cosuper@title} & \thu@title@sep
+                  & {\ziju{0.6875}\thu@ccosupervisor}\\
+                \fi
+                \ifthu@doctor
+                  \thu@put@title{\thu@cosuper@title} & \thu@title@sep
+                  & {\ziju{0.6875}\thu@ccosupervisor}\\
+                \fi
               \fi
             \end{tabular}
         \end{center}}}
@@ -752,13 +758,13 @@
   \fi
   \pagenumbering{Roman}
   \thu@cabstract
-  \vskip12bp
+  \ifthu@doctor\vfill\else\vskip12bp\fi
   \thu@put@keywords{\textbf\thu@ckeywords@title}{\thu@ckeywords}
   \thu@chapter*[]{\eabstractname} % no tocline
   \thu@eabstract
-  \vskip12bp
+  \ifthu@doctor\vfill\else\vskip12bp\fi
   \thu@put@keywords{%
-    \textbf{\ifthu@bachelor Keywords:\else Key words:\fi\enskip}}{\thu@ekeywords}}
+    \textbf{\ifthu@bachelor Keywords:\else Key Words:\fi\enskip}}{\thu@ekeywords}}
 \newenvironment{denotation}[1][2.5cm]{%
   \thu@chapter*[]{\thu@denotation@name} % no tocline
   \vskip-30bp\xiaosi[1.6]\begin{thu@denotation}[labelwidth=#1]
@@ -823,6 +829,7 @@
 \setlength\bibhang{2\ccwd}
 \addtolength{\bibsep}{-0.7em}
 \setlength{\labelsep}{0.4em}
+\def\@biblabel#1{[#1]\hfill}
 \expandafter\newcommand\csname bibstyle@thuthesis-numeric\endcsname{%
   \bibpunct{[}{]}{,}{s}{,}{\textsuperscript{,}}}
 \expandafter\newcommand\csname bibstyle@thuthesis-author-year\endcsname{%
@@ -852,6 +859,15 @@
 \renewcommand\NAT@cite%
     [3]{\ifNAT@swa\NAT@@open\if*#2*\else#2\NAT@spacechar\fi
         #1\NAT@@close\if*#3*\else\textsuperscript{#3}\fi\else#1\fi\endgroup}
+\patchcmd{\NAT@citexnum}{%
+  \ifx\NAT@last@yr\relax
+    \def@NAT@last@yr{\@citea}%
+  \else
+    \def@NAT@last@yr{--\NAT@penalty}%
+  \fi
+}{%
+  \def@NAT@last@yr{-\NAT@penalty}%
+}{}{}
 \let\thu@appendix\appendix
 \renewenvironment{appendix}{%
   \let\title\thu@appendix@title