thuthesis (18jan16)

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

3 files changed, 75 insertions, 51 deletions

diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
index 2095c171ef9..c022d814abf 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cfg
@@ -24,7 +24,7 @@
 %% 
 %% \end{latex}
 \ProvidesFile{thuthesis.cfg}
-[2016/1/11 5.2.0 Tsinghua University Thesis Template]
+[2016/01/18 5.2.1 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 f7c251b455c..f9a0f9c781e 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
@@ -26,10 +26,10 @@
 %% \end{latex}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{thuthesis}
-[2016/1/11 5.2.0 Tsinghua University Thesis Template]
+[2016/01/18 5.2.1 Tsinghua University Thesis Template]
 \hyphenation{Thu-Thesis}
 \def\thuthesis{\textsc{ThuThesis}}
-\def\version{5.2.0}
+\def\version{5.2.1}
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -83,7 +83,9 @@
 \RequirePackage{ifxetex}
 \RequirePackage{xparse}
 \RequirePackage{amsmath}
-\RequirePackage{txfonts}
+\RequirePackage{newtxtext}
+\RequirePackage{newtxmath}
+\RequirePackage{tgcursor}
 \RequirePackage{graphicx}
 \RequirePackage[labelformat=simple]{subcaption}
 \RequirePackage{pdfpages}
@@ -98,16 +100,11 @@
 \RequirePackage{CJKfntef}
 \renewcommand{\baselinestretch}{1.0} % todo:?
 \ifxetex
-  % todo: minor fix of CJKnumb
   \def\CJK@null{\kern\CJKnullspace\Unicode{48}{7}\kern\CJKnullspace}
-  \defaultfontfeatures{Mapping=tex-text} % use TeX --
+  \defaultfontfeatures{Mapping=tex-text}
   \IfFileExists{ctex-fontset-thuthesis.def}%
     {\ctexset{fontset=thuthesis}}%
     {\ctexset{fontset=windows}}
-
-  \setmainfont{Times New Roman}
-  \setsansfont{Arial}
-  \setmonofont{Courier New}
 \else
   \RequirePackage{CJKspace}
   \ifthu@arial
@@ -418,15 +415,19 @@
       \leavevmode
       \advance\leftskip\@tempdima
       \hskip -\leftskip
-      {\ifthu@bachelor\sffamily\else\csname thu@toc@font\endcsname\fi\heiti #1} % numberline is called here, and it uses \@tempdima
+      % 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
       \penalty\@highpenalty
     \endgroup
   \fi}
-\renewcommand*\l@section{\@dottedtocline{1}{\ccwd}{2.1em}}
-\renewcommand*\l@subsection{\@dottedtocline{2}{\ifthu@bachelor 1.5\ccwd\else 2\ccwd\fi}{3em}}
-\renewcommand*\l@subsubsection{\@dottedtocline{3}{\ifthu@bachelor 2.4em\else 3.5em\fi}{3.8em}}
+\renewcommand*\l@section{%
+  \@dottedtocline{1}{\ccwd}{2.1em}}
+\renewcommand*\l@subsection{%
+  \@dottedtocline{2}{\ifthu@bachelor 1.5\ccwd\else 2\ccwd\fi}{3em}}
+\renewcommand*\l@subsubsection{%
+  \@dottedtocline{3}{\ifthu@bachelor 2.4em\else 3.5em\fi}{3.8em}}
 \def\thu@def@term#1{%
   \define@key{thu}{#1}{\csname #1\endcsname{##1}}
   \expandafter\gdef\csname #1\endcsname##1{%
@@ -490,7 +491,8 @@
   \expandafter\gdef\csname #1\endcsname##1{
     \@for\reserved@a:=##1\do{
       \expandafter\ifx\csname thu@#1\endcsname\@empty\else
-        \expandafter\g@addto@macro\csname thu@#1\endcsname{\ignorespaces\csname thu@#1@separator\endcsname}
+        \expandafter\g@addto@macro\csname thu@#1\endcsname{%
+          \ignorespaces\csname thu@#1@separator\endcsname}
       \fi
       \expandafter\expandafter\expandafter\g@addto@macro%
         \expandafter\csname thu@#1\expandafter\endcsname\expandafter{\reserved@a}}}}
@@ -509,7 +511,8 @@
     \vspace*{0.7cm}
     \begingroup\wuhao[1.5]%
     \thu@put@title{\thu@catalog@number@title}\thu@underline\thu@catalognumber\hfill%
-    \thu@put@title{\thu@secretlevel}\expandafter\thu@underline\ifthu@secret\thu@secret@content\else\relax\fi\par
+    \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\heiti
@@ -533,10 +536,18 @@
       \else
         \begin{tabular}{p{\thu@title@width}l@{}l}
       \fi
-          \thu@put@title{\thu@author@title}     & \thu@title@sep & \thu@cauthor \\
-          \thu@put@title{\thu@postdoctor@first@discipline@title}      & \thu@title@sep & \thu@cfirstdiscipline\\
-          \thu@put@title{\thu@postdoctor@second@discipline@title}      & \thu@title@sep & \thu@cseconddiscipline\\
-          \thu@put@title{\thu@supervisor@title} & \thu@title@sep & \thu@csupervisor\\
+          \thu@put@title{\thu@author@title}
+            & \thu@title@sep
+            & \thu@cauthor \\
+          \thu@put@title{\thu@postdoctor@first@discipline@title}
+            & \thu@title@sep
+            & \thu@cfirstdiscipline\\
+          \thu@put@title{\thu@postdoctor@second@discipline@title}
+            & \thu@title@sep
+            & \thu@cseconddiscipline\\
+          \thu@put@title{\thu@supervisor@title}
+            & \thu@title@sep
+            & \thu@csupervisor\\
         \end{tabular}}
     \vskip2cm
     {\sihao\thu@postdoctor@date@title\hskip1em\underline\thu@postdoctordate}
@@ -586,12 +597,17 @@
          \else
            \begin{tabular}{p{\thu@title@width}l@{}l}
          \fi
-             \thu@put@title{\thu@department@title} & \thu@title@sep & \thu@cdepartment\\
-             \thu@put@title{\thu@major@title}      & \thu@title@sep & \thu@cmajor\\
-             \thu@put@title{\thu@author@title}     & \thu@title@sep & \thu@cauthor \\
-             \thu@put@title{\thu@supervisor@title} & \thu@title@sep & \thu@csupervisor\\
+             \thu@put@title{\thu@department@title} & \thu@title@sep
+               & \thu@cdepartment\\
+             \thu@put@title{\thu@major@title}      & \thu@title@sep
+               & \thu@cmajor\\
+             \thu@put@title{\thu@author@title}     & \thu@title@sep
+               & \thu@cauthor \\
+             \thu@put@title{\thu@supervisor@title} & \thu@title@sep
+               & \thu@csupervisor\\
              \ifx\thu@cassosupervisor\@empty\else%
-               \thu@put@title{\thu@assosuper@title} & \thu@title@sep & \thu@cassosupervisor\\
+               \thu@put@title{\thu@assosuper@title} & \thu@title@sep
+               & \thu@cassosupervisor\\
              \fi
            \end{tabular}
         }}
@@ -606,21 +622,29 @@
           \else
             \begin{tabular}{p{\thu@title@width}c@{\extracolsep{4pt}}l}
           \fi
-              \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}\\
+              \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{0.6875}\thu@cassosupervisor}\\
+                \thu@put@title{\thu@assosuper@title} & \thu@title@sep
+                & {\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}\\
+                \hfill\makebox[0pt][r]{\thu@cosuper@title} & \thu@title@sep
+                & {\ziju{0.6875}\thu@ccosupervisor}\\
               \fi
             \end{tabular}
         \end{center}}}
       \fi
      \begin{center}
-       {\ifthu@bachelor\vskip-1.0cm\hskip-1.2cm\xiaosi\else\vskip-0.5cm\sanhao\fi \songti \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@engcover}{%
@@ -765,22 +789,24 @@
   \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]{
+\newenvironment{denotation}[1][2.5cm]{%
   \thu@chapter*[]{\thu@denotation@name} % no tocline
-  \noindent\begin{list}{}%
-    {\vskip-30bp\xiaosi[1.6]
-     \renewcommand\makelabel[1]{##1\hfil}
-     \setlength{\labelwidth}{#1} % 标签盒子宽度
-     \setlength{\labelsep}{0.5cm} % 标签与列表文本距离
-     \setlength{\itemindent}{0cm} % 标签缩进量
-     \setlength{\leftmargin}{\labelwidth+\labelsep} % 左边界
-     \setlength{\rightmargin}{0cm}
-     \setlength{\parsep}{0cm} % 段落间距
-     \setlength{\itemsep}{0cm} % 标签间距
-    \setlength{\listparindent}{0cm} % 段落缩进量
-    \setlength{\topsep}{0pt} % 标签与上文的间距
-   }}{\end{list}}
-\NewDocumentEnvironment{ack}{o}{%
+  \vskip-30bp\xiaosi[1.6]\begin{thu@denotation}[labelwidth=#1]
+}{%
+  \end{thu@denotation}
+}
+\newlist{thu@denotation}{description}{1}
+\setlist[thu@denotation]{%
+  nosep,
+  font=\normalfont,
+  align=left,
+  leftmargin=!, % sum of the following 3 lengths
+  labelindent=0pt,
+  labelwidth=2.5cm,
+  labelsep*=0.5cm,
+  itemindent=0pt,
+}
+\NewDocumentEnvironment{acknowledgement}{o}{%
     \thu@chapter*{\thu@ackname}
   }
   {
@@ -797,6 +823,8 @@
       }%
     \fi
   }
+\let\ack\acknowledgement
+\let\endack\endacknowledgement
 \def\thu@starttoc#1{% #1: float type, prepend type name in \listof*** entry.
   \let\oldnumberline\numberline
   \def\numberline##1{\oldnumberline{\csname #1name\endcsname\hskip.4em ##1}}
diff --git a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.sty b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.sty
index 315ee726225..87585f53963 100644
--- a/Master/texmf-dist/tex/latex/thuthesis/thuthesis.sty
+++ b/Master/texmf-dist/tex/latex/thuthesis/thuthesis.sty
@@ -3,16 +3,12 @@
 % 处理数学公式中的黑斜体的宏包
 % \RequirePackage{bm}
 
-
 % 不同于 \mathcal \mathfrak 之类的英文花体字体
 % \RequirePackage{mathrsfs}
 
 % 表格中支持跨行
 \RequirePackage{multirow}
 
-% 跨页表格
-% \RequirePackage{longtable}
-
 % 固定宽度的表格
 \RequirePackage{tabularx}