3 files changed, 28 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg b/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg
index 5b7e59d5d0c..7647cc363e5 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-2019 by Chu Yanshuo <yanshuoc@gmail.com>
+%% Copyright (C) 2017-2020 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}
-[2018/12/05 2.0.6 Harbin Institute of Technology Thesis Template]
+[2019/06/27 2.0.11 Harbin Institute of Technology Thesis Template]
 \theorembodyfont{\normalfont}
 \theoremheaderfont{\normalfont\heiti}
 \theoremsymbol{\ensuremath{\square}}
@@ -171,7 +171,7 @@
 本人郑重声明：此处所提交的学位论文《\hit@ctitle》，是本人在导师指导下，在哈尔滨工业大学攻读学位期间独立进行研究工作所取得的成果，且学位论文中除已标注引用文献的部分外不包含他人完成或已发表的研究成果。对本学位论文的研究工作做出重要贡献的个人和集体，均已在文中以明确方式注明。}
 \newcommand{\hit@datefill}{\hspace{2.5em}年\hspace{1.5em}月\hspace{1.5em}日}
 \newcommand{\hit@publication@ctitle}{攻读\hit@cxuewei 学位期间发表的论文及其他成果}
-\newcommand{\hit@publication@etitle}{Papers published in the period of PH.D. education}
+\newcommand{\hit@publication@etitle}{Papers published in the period of Ph.D. education}
 \def\hit@index@etitle{Index}
 \def\hit@hi{嗨！thesis}
 \def\hit@cbraceleft{（}
diff --git a/Master/texmf-dist/tex/latex/hithesis/hithesis.cls b/Master/texmf-dist/tex/latex/hithesis/hithesis.cls
index e9dc36c4c86..03b9b1d3059 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-2019 by Chu Yanshuo <yanshuoc@gmail.com>
+%% Copyright (C) 2017-2020 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}
-[2018/12/05 2.0.6 Harbin Institute of Technology Thesis Template]
+[2019/06/27 2.0.11 Harbin Institute of Technology Thesis Template]
 \RequirePackage{ifthen}
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -58,6 +58,7 @@
 \DeclareBoolOption[false]{subtitle}
 \DeclareBoolOption[false]{debug}
 \DeclareBoolOption[false]{openright}
+\DeclareBoolOption[false]{library}
 \DeclareBoolOption[false]{capcenterlast}
 \DeclareBoolOption[false]{subcapcenterlast}
 \DeclareBoolOption[false]{absupper}
@@ -211,6 +212,7 @@ foot=8.5true mm
 \newindex[]{china}
 \newindex[]{english}
 \RequirePackage{xltxtra}
+\ifhit@library\hit@openrightfalse\else\relax\fi
 \let\hit@cleardoublepage\cleardoublepage
 \newcommand{\hit@clearemptydoublepage}{%
   \clearpage{\pagestyle{hit@empty}\hit@cleardoublepage}
@@ -222,18 +224,20 @@ foot=8.5true mm
   \pagenumbering{Roman}
   \pagestyle{hit@empty}
 }
-
 \renewcommand\mainmatter{%
   \ifhit@tocblank%
   \addtocontents{toc}{\vspace{\baselineskip}} %规范中并没有这一要求，此处不应该加
   \addtocontents{toe}{\vspace{\baselineskip}}
   \fi%
-  \ifhit@openright\cleardoublepage\else\clearpage\fi
+  \ifhit@doctor%
+    \ifhit@library\clearpage\else\cleardoublepage\fi
+    \else%
+    \clearpage
+  \fi%
   \@mainmattertrue
   \pagenumbering{arabic}
   \pagestyle{hit@headings}
 }
-
 \renewcommand\backmatter{%
   \ifhit@openright\cleardoublepage\else\clearpage\fi
   \@mainmattertrue}
@@ -246,6 +250,7 @@ foot=8.5true mm
 \def\hit@def@fontsize#1#2{%
   \expandafter\newcommand\csname #1\endcsname[1][1.3]{%
     \fontsize{#2}{##1\dimexpr #2}\selectfont}}
+\hit@def@fontsize{dachu}{58bp}
 \hit@def@fontsize{chuhao}{42bp}
 \hit@def@fontsize{xiaochu}{36bp}
 \hit@def@fontsize{yihao}{26bp}
@@ -356,7 +361,7 @@ foot=8.5true mm
 \renewcommand{\eqref}[1]{\textup{(\ref{#1})}}
 \setlength{\intextsep}{\ifhit@glue 8.50398bp \@plus 2.83465bp \@minus 0bp\else 8.50398bp\fi}
 \setlength{\textfloatsep}{\ifhit@glue 8.50398bp \@plus 2.83465bp \@minus 0bp\else 8.50398bp\fi}
-\setlength{\floatsep}{\ifhit@glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 20.50398bp\fi}
+\setlength{\floatsep}{\ifhit@glue 12bp \@plus 2.83465bp \@minus 0bp\else 12bp\fi}
 \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}}}
@@ -834,16 +839,16 @@ foot=8.5true mm
   \xiaosi[1]%
   \begin{titlepage}
     \hit@first@titlepage
-    \cleardoublepage
+    \ifhit@library\clearpage\else\cleardoublepage\fi
     \hit@second@titlepage
-    \cleardoublepage
+    \ifhit@library\clearpage\else\cleardoublepage\fi
     \ifhit@bachelor
     \relax
     \else
     \phantomsection
     \pdfbookmark[0]{\hit@etitle}{etitle}
     \hit@engcover
-    \cleardoublepage
+    \ifhit@library\clearpage\else\cleardoublepage\fi
     \fi
   \end{titlepage}
   \normalsize
@@ -924,7 +929,7 @@ foot=8.5true mm
       \advance\leftskip\@tempdima
       \hskip -\leftskip
       % numberline is called here, and it uses \@tempdima
-      {\ifhit@bachelor\sffamily\else\csname hit@toc@font\endcsname\fi\heiti #1}
+      {\ifhit@bachelor\rmfamily\else\csname hit@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
@@ -1068,6 +1073,7 @@ foot=8.5true mm
     \let\p@enumiv\@empty
   \renewcommand\theenumiv{\@arabic\c@enumiv}}%
   \sloppy\frenchspacing
+  \flushbottom
   \ifhit@splitbibitem
   \clubpenalty0
   \@clubpenalty \clubpenalty
diff --git a/Master/texmf-dist/tex/latex/hithesis/hithesis.sty b/Master/texmf-dist/tex/latex/hithesis/hithesis.sty
index b1508de9c77..d92ef07e6c7 100644
--- a/Master/texmf-dist/tex/latex/hithesis/hithesis.sty
+++ b/Master/texmf-dist/tex/latex/hithesis/hithesis.sty
@@ -3,17 +3,12 @@ Thesis Template Extension]
 % 此文件声明不在规范中要求的格式所使用的宏包。
 % （所以，格式基本上是自由发挥的。）
 
-
-\setCJKfamilyfont{siyuan}[]{SourceHanSerifCN-Regular}
-\newcommand{\highlight}[1]{{\CJKfamily{siyuan}\textbf{#1}}}
-
-
-
 % 根据窝工规范中对数字书写规范的规定（6）：
 % 凡4位或4位以上的数都从个位起每3位数空半个数码(1/4汉字)。
 % 注意此处，除此任何空格都是错误的（包括\:\;\ 等）
 \RequirePackage{siunitx}
 \sisetup{group-minimum-digits=4, group-separator= \hspace{0.25em}}
+\sisetup{detect-weight,detect-mode,detect-family} 
 
 % 处理数学公式中的黑斜体的宏包
 \RequirePackage{bm}
@@ -38,17 +33,21 @@ Thesis Template Extension]
 % 算法的宏包，注意宏包兼容性，先后顺序为float、hyperref、algorithm(2e)，否则无法
 % 生成算法列表。我工算法混乱问题详见hithesis文档。各个实验室设置具体方法详见
 % hithesis文档或者示例中给出的地址。
-\RequirePackage[boxed,linesnumbered,algochapter]{algorithm2e}
+\RequirePackage[algoruled,linesnumbered,algochapter]{algorithm2e}
+\SetAlCapSty{}
+\newcommand{\foocaption}[1]{ \def\@algocf@pre@plainruled{\hrule height1.5pt depth0pt\kern\interspacetitleruled #1 \kern\interspacealgoruled\hrule height1pt depth0pt\kern\interspacetitleruled} }
+\def\@algocf@post@ruled{\kern\interspacealgoruled\hrule height1.5pt\relax}%
+
 \newcommand{\algoenname}{Algo.} %算法英文标题
 \newfloatlist[chapter]{algoen}{aen}{\listalgoenname}{\algoenname}
 \newfixedcaption{\algoencaption}{algoen}
 \renewcommand{\thealgoen}{\thechapter-\arabic{algocf}}
-\renewcommand{\@cftmakeaentitle}{\chapter*{\listalgoenname\@mkboth{\bfseries\listalgoenname}{\bfseries\listalgoenname}}
+\renewcommand{\@cftmakeaentitle}{\chapter*{\listalgoenname\@mkboth{\listalgoenname}{\listalgoenname}}
 }
 \renewcommand{\algorithmcfname}{算法}
 \setlength\AlCapSkip{1.2ex}
 \SetAlgoSkip{1pt}
-\renewcommand{\algocf@captiontext}[2]{\wuhao#1\algocf@typo ~ \AlCapFnt{}#2} % text of caption
+\renewcommand{\algocf@captiontext}[2]{\wuhao#1\algocf@typo~\AlCapFnt{}#2} % text of caption
 \expandafter\ifx\csname algocf@within\endcsname\relax% if \algocf@within doesn't exist
 \renewcommand\thealgocf{\@arabic\c@algocf} % and the way it is printed
 \else%                                    else
@@ -62,7 +61,7 @@ Thesis Template Extension]
   \addtolength{\hsize}{-\algomargin}%
 }
 \newcommand{\AlgoBiCaption}[2]{%直接取出自定义的中英文标题条目加入到真正的\caption 中
-   \caption[#1]{\protect\setlength{\baselineskip}{1.5em}#1 \protect \\ Algo. \thealgocf~~ #2} % \algoencaption{#2}
+   \caption[#1]{\protect\setlength{\baselineskip}{1.5em}#1 \protect \\ Algo.\thealgocf~#2} % \algoencaption{#2}
    \addcontentsline{aen}{algoen}{\protect\numberline{\thealgoen}{#2}}
 }