thuthesis (26mar17)

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

2 files changed, 27 insertions, 23 deletions

diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
index e75ad7e30b0..1749d21b188 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-2016 by Xue Ruini <xueruini@gmail.com>
+%% Copyright (C) 2005-2017 by Xue Ruini <xueruini@gmail.com>
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3a
@@ -23,7 +23,7 @@
 %% This is the configuration file of the thuthesis package with LaTeX2e.
 %% 
 \ProvidesFile{thuthesis.cfg}
-[2016/03/20 5.3.1 Tsinghua University Thesis Template]
+[2017/03/26 5.3.2 Tsinghua University Thesis Template]
 \theoremsymbol{\ensuremath{\square}}
 \newtheorem*{proof}{证明}
 \theoremstyle{plain}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
index f87c20af8f3..48d4cb72131 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-2016 by Ruini Xue <xueruini@gmail.com>
+%% Copyright (C) 2005-2017 by Ruini Xue <xueruini@gmail.com>
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3a
@@ -25,10 +25,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{thuthesis}
-[2016/03/20 5.3.1 Tsinghua University Thesis Template]
+[2017/03/26 5.3.2 Tsinghua University Thesis Template]
 \hyphenation{Thu-Thesis}
 \def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.3.1}
+\def\version{5.3.2}
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -82,7 +82,7 @@
 \RequirePackage{amsmath}
 \RequirePackage[defaultsups]{newtxtext}
 \RequirePackage{newtxmath}
-\RequirePackage{tgcursor}
+\RequirePackage{courier}
 \RequirePackage{graphicx}
 \RequirePackage[labelformat=simple]{subcaption}
 \RequirePackage{pdfpages}
@@ -99,15 +99,13 @@
   \RequirePackage{pifont}
 \fi
 \RequirePackage{CJKfntef}
-\ifxetex
-  \def\CJK@null{\kern\CJKnullspace\Unicode{48}{7}\kern\CJKnullspace}
-  \defaultfontfeatures{Mapping=tex-text}
-\fi
 \RequirePackage[amsmath,thmmarks,hyperref]{ntheorem}
 \RequirePackage{array}
 \RequirePackage{longtable}
 \RequirePackage{booktabs}
 \RequirePackage[numbers,super,sort&compress]{natbib}
+\patchcmd{\@chapter}{\addtocontents{lof}{\protect\addvspace{10\p@}}}{}{}{} % lof
+\patchcmd{\@chapter}{\addtocontents{lot}{\protect\addvspace{10\p@}}}{}{}{} % lot
 \RequirePackage{hyperref}
 \ifxetex
   \hypersetup{%
@@ -222,7 +220,7 @@
       {Too many footnotes in this page.}{Keep footnote less than 10.}
   \fi
   \ifthu@pifootnote%
-    \ding{\numexpr171+\value{#1}}%
+    \ding{\the\numexpr\value{#1}+171\relax}%
   \else%
     \textcircled{\xiaoliu\arabic{#1}}%
   \fi}
@@ -457,7 +455,7 @@
 \newcommand\thu@underline[2][6em]{\hskip1pt\underline{\hb@xt@ #1{\hss#2\hss}}\hskip3pt}
 \newlength{\thu@title@width}
 \newcommand{\thu@put@title}[2][\thu@title@width]{%
-  \begin{CJKfilltwosides}{#1}#2\end{CJKfilltwosides}}
+  \begin{CJKfilltwosides}[b]{#1}#2\end{CJKfilltwosides}}
 \def\thu@first@titlepage{%
   \ifthu@postdoctor\thu@first@titlepage@postdoctor\else\thu@first@titlepage@other\fi}
 \newcommand{\thu@first@titlepage@postdoctor}{
@@ -535,14 +533,19 @@
       \parbox[t][9cm][t]{\paperwidth-8cm}{
       \renewcommand{\baselinestretch}{1.3}
       \begin{center}
-      \yihao[1.2]{\sffamily\heiti\thu@ctitle}\par
-      \par\vskip 18bp
-      \xiaoer[1] \textrm{\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}{%
+      \ifx\thu@cassosupervisor\@empty%
+        \def\thu@tempa{7.0cm}
+      \else%
+        \def\thu@tempa{8.0cm}
+      \fi%
+      \parbox[t][\thu@tempa][t]{\textwidth}{%
         {\fangsong\sanhao[1.8]%
          \hspace*{1.65cm}
          \setlength{\thu@title@width}{4em}
@@ -621,37 +624,38 @@
     \parbox[t][5.2cm][t]{\paperwidth-7.2cm}{
       \renewcommand{\baselinestretch}{1.5}
       \begin{center}
-        \erhao[1.1]\bfseries\sffamily\thu@etitle
+        \erhao[1.1]\bfseries\sffamily\thu@etitle%
       \end{center}}
     \parbox[t][][t]{\paperwidth-7.2cm}{
       \renewcommand{\baselinestretch}{1.3}
       \begin{center}
-        \sanhao
+        \sanhao%
         \ifthu@master Thesis \else Dissertation \fi
         Submitted to\\
         {\bfseries Tsinghua University}\\
         in partial fulfillment of the requirement\\
         for the \ifthu@professional professional \fi
         degree of\\
-        {\bfseries\sffamily\thu@edegree}
+        {\bfseries\sffamily\thu@edegree}%
         \ifthu@professional\relax\else
           \\in\\[3bp]
-          {\bfseries\sffamily\thu@emajor}
+          {\bfseries\sffamily\thu@emajor}%
         \fi
       \end{center}}
     \parbox[t][][b]{\paperwidth-7.2cm}{
       \renewcommand{\baselinestretch}{1.3}
       \begin{center}
         \sanhao\sffamily by\\[3bp]
-        \bfseries\thu@eauthor
+        \bfseries\thu@eauthor%
         \ifthu@professional
           \ifx\thu@emajor\empty\relax\else
-            \\(~\thu@emajor~)
+            \\(~\thu@emajor~)%
         \fi\fi
       \end{center}}
     \par\vspace{0.9cm}
     \parbox[t][2.1cm][t]{\paperwidth-7.2cm}{
-      \renewcommand{\baselinestretch}{1.2}\xiaosan\centering
+      \renewcommand{\baselinestretch}{1.2}
+      \xiaosan\centering
       \begin{tabular}{rl}
         \ifthu@master Thesis \else Dissertation \fi
         Supervisor : & \thu@esupervisor\\