2 files changed, 36 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg b/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg
index 4e38c128658..b93cdbd30d1 100644
--- a/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg
+++ b/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2017-2017 by Chu Yanshuo <yanshuoc@gmail.com>
+%% Copyright (C) 2017-2018 by Chu Yanshuo <yanshuoc@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 hithesis package with LaTeX2e.
 %% 
 \ProvidesFile{hithesis.cfg}
-[2017/08/21 0.0.1 Harbin Institute of Technology]
+[2017/11/5 1.0.9 Harbin Institute of Technology]
 \theorembodyfont{\normalfont}
 \theoremheaderfont{\normalfont\heiti}
 \theoremsymbol{\ensuremath{\square}}
diff --git a/Master/texmf-dist/tex/latex/hithesis/hithesis.cls b/Master/texmf-dist/tex/latex/hithesis/hithesis.cls
index 6d1068b2f4c..f3659498d67 100644
--- a/Master/texmf-dist/tex/latex/hithesis/hithesis.cls
+++ b/Master/texmf-dist/tex/latex/hithesis/hithesis.cls
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2017-2017 by Chu Yanshuo <yanshuoc@gmail.com>
+%% Copyright (C) 2017-2018 by Chu Yanshuo <yanshuoc@gmail.com>
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3a
@@ -25,7 +25,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{hithesis}
-[2017/08/21 0.0.1 Harbin Institute of Technology]
+[2017/11/5 1.0.9 Harbin Institute of Technology]
 \RequirePackage{ifthen}
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -42,7 +42,7 @@
   \expandafter\csname hit@#1true\endcsname}
 \DeclareBoolOption[false]{arialtoc}
 \DeclareBoolOption[false]{arialtitle}
-\DeclareBoolOption[false]{raggedbottom}
+\DeclareBoolOption[true]{raggedbottom}
 \DeclareBoolOption[false]{pifootnote}
 \DeclareBoolOption[false]{glue}
 \DeclareBoolOption[false]{tocfour}
@@ -53,7 +53,8 @@
 \DeclareBoolOption[false]{debug}
 \DeclareBoolOption[false]{newgeometry}
 \DeclareBoolOption[false]{openright}
-\DeclareBoolOption[true]{caplastcenter}
+\DeclareBoolOption[false]{capcenterlast}
+\DeclareBoolOption[false]{subcapcenterlast}
 \DeclareStringOption{fontset}
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}}
 \ProcessKeyvalOptions*
@@ -164,6 +165,7 @@
 \fi
 \ifhit@debug%
 \RequirePackage{layout}
+\RequirePackage{layouts}
 \RequirePackage{lineno}
 \fi
 \RequirePackage{fancyhdr}
@@ -174,7 +176,10 @@
 \RequirePackage[below]{placeins}%允许上一个section的浮动图形出现在下一个section的开始部分,还提供\FloatBarrier命令,使所有未处理的浮动图形立即被处理
 \RequirePackage{flafter}       % 使得所有浮动体不能被放置在其浮动环境之前，以免浮动体在引述它的文本之前出现.
 \RequirePackage{multirow}       %使用Multirow宏包，使得表格可以合并多个row格
-\RequirePackage[hang]{subfigure}%支持子图 %centerlast 设置最后一行是否居中
+\ifhit@subcapcenterlast
+\PassOptionsToPackage{centerlast}{subfigure}
+\fi
+\RequirePackage{subfigure}%支持子图 %centerlast 设置最后一行是否居中
 \RequirePackage[subfigure]{ccaption} %支持双语标题
 \RequirePackage[makeindex]{splitidx}
 \newindex[]{china}
@@ -325,8 +330,11 @@
 \setlength{\intextsep}{\ifhit@glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
 \setlength{\textfloatsep}{\ifhit@glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
 \setlength{\@fptop}{0bp}
-\setlength{\@fpsep}{12bp}
+\setlength{\@fpsep}{\ifhit@glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
 \setlength{\@fpbot}{0bp}
+\g@addto@macro\appendix{\renewcommand*{\thefigure}{\thechapter-\arabic{figure}}}
+\g@addto@macro\appendix{\renewcommand*{\thetable}{\thechapter-\arabic{table}}}
+\g@addto@macro\appendix{\renewcommand*{\theequation}{\thechapter-\arabic{equation}}}
 \renewcommand{\textfraction}{0.15}
 \renewcommand{\topfraction}{0.85}
 \renewcommand{\bottomfraction}{0.65}
@@ -341,9 +349,21 @@
 \def\endtable{\vskip-1em\hit@oldendtable\endgroup}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \wuhao\ifhit@caplastcenter\centering\fi\sbox\@tempboxa{#1\ifhit@bachelor\hskip\ccwd\else\enskip\fi#2}%
+  \wuhao\sbox\@tempboxa{#1\ifhit@bachelor\hskip\ccwd\else\enskip\fi#2}%
   \ifdim \wd\@tempboxa >\hsize
-  #1\ifhit@bachelor\hskip\ccwd\else\enskip\fi#2\par
+  \ifhit@capcenterlast%
+  \vskip 6.3bp%
+  {\setbox0=\vbox{#1\ifhit@bachelor\hskip\ccwd\else\enskip\fi#2}
+  \setbox1=\vbox{%
+  \unvbox0
+  \setbox2=\lastbox
+  \hbox to \textwidth{\hfill\unhcopy2 \unskip\unskip\hfill}
+  }
+  \unvbox1}
+  \else%
+  #1\ifhit@bachelor\hskip\ccwd\else\enskip\fi#2%
+  \fi%
+    \par
   \else
   \global \@minipagefalse
   \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
@@ -367,14 +387,11 @@
 \renewcommand{\thesubfigure}{\alph{subfigure})}%使子图编号为 a)的格式
 \renewcommand{\p@subfigure}{\thefigure~} %使子图引用为 7-1 a) 的格式，母图编号和子图编号之间用~加一个空格
 \renewcommand{\thetable}{\arabic{chapter}-\arabic{table}}%使表编号为 7-1 的格式
-\renewcommand{\theequation}{\arabic{chapter}-\arabic{equation}}%使公式编号为 7-1 的格式
 \setitemize{leftmargin=0em,itemsep=0em,partopsep=0em,parsep=0em,topsep=0em,itemindent=3em}
 \setenumerate{leftmargin=0em,itemsep=0em,partopsep=0em,parsep=0em,topsep=0em,itemindent=3.5em}
 \newcommand{\citeup}[1]{\textsuperscript{\cite{#1}}}
 \captionnamefont{\wuhao}
 \captiontitlefont{\wuhao}
-\captiondelim{~~}
-\hangcaption
 \renewcommand{\subcapsize}{\wuhao}
 \setlength{\abovecaptionskip}{0pt}%为了双标题之间的间距，不能设置
 \setlength{\belowcaptionskip}{0pt}
@@ -500,7 +517,7 @@
     {\hit@chapter{#3}}%
     {\hit@chapter[#2]{#3}}%
     \IfValueT{#4}{%
-    \addcontentsline{toe}{chapter}{\bfseries\relax Chapter \thechapter\hspace{0.5em} #4}
+    \addcontentsline{toe}{chapter}{\bfseries\relax Chapter \thechapter\hspace{0.5em}\ignorespaces #4}
     }
   }
 }
@@ -519,7 +536,7 @@
     {\hit@section{#3}}%
     {\hit@section[#2]{#3}}%
     \IfValueT{#4}{%
-    \addcontentsline{toe}{section}{\protect\numberline{\csname thesection\endcsname} #4}
+    \addcontentsline{toe}{section}{\protect\numberline{\csname thesection\endcsname}\ignorespaces #4}
     }
   }
 }
@@ -538,7 +555,7 @@
     {\hit@subsection{#3}}%
     {\hit@subsection[#2]{#3}}%
     \IfValueT{#4}{%
-    \addcontentsline{toe}{subsection}{\protect\numberline{\csname thesubsection\endcsname} #4}
+    \addcontentsline{toe}{subsection}{\protect\numberline{\csname thesubsection\endcsname}\ignorespaces #4}
     }
   }
 }
@@ -557,7 +574,7 @@
     {\hit@subsubsection{#3}}%
     {\hit@subsubsection[#2]{#3}}%
     \IfValueT{#4}{%
-    \addcontentsline{toe}{subsubsection}{\protect\numberline{\csname thesubsubsection\endcsname} #4}
+    \addcontentsline{toe}{subsubsection}{\protect\numberline{\csname thesubsubsection\endcsname}\ignorespaces #4}
     }
   }
 }
@@ -870,13 +887,13 @@
 \def\@pnumwidth{4em}%规定中的提前悬挂
 \def\@tocrmarg{\@pnumwidth}
 \def\@dotsep{1}
+\setlength\@tempdima{4em}%
 \patchcmd{\@dottedtocline}{#4}{\csname hit@toc@font\endcsname #4}{}{}
 \patchcmd{\@dottedtocline}{\hb@xt@\@pnumwidth}{\hbox}{}{}
 \renewcommand*\l@chapter[2]{%
   \ifnum \c@tocdepth >\m@ne
     \addpenalty{-\@highpenalty}%
     %\vskip 4bp \@plus\p@
-    \setlength\@tempdima{4em}%
     \begingroup
       \parindent \z@ \rightskip \@pnumwidth
       \parfillskip -\@pnumwidth
@@ -903,6 +920,7 @@
 
 \def\engcontentsname{\bfseries Contents}
 \newcommand\tableofengcontents{
+  \def\l@chapter{\@dottedtocline{0}{0em}{5em}}%控制英文目录： 细点\@dottedtocline  粗点\@dottedtoclinebold
   \@restonecolfalse
   \chapter*{\engcontentsname  %chapter*上移一行，避免在toc中出现。
   \pdfbookmark[0]{Contents}{econtent}