diff --git a/chapters/Environments.tex b/chapters/Environments.tex
index 5b95ae7efa5a5c3bbfd0a4e4a446dca12dd41f87..450b6a2633da4bbd056e0837baf92324df4df575 100644
--- a/chapters/Environments.tex
+++ b/chapters/Environments.tex
@@ -2,6 +2,17 @@
\textbf{鐗瑰埆鎻愰啋锛氭湰绔犳枃瀛椾粎渚涙牸寮忕ず渚嬶紝鍐呭宸插仠姝㈢淮鎶わ紝璇峰弬鑰冨畯鍖呮墜鍐岃繘琛岃缃畗
+\section{鏈湴缂栬瘧}
+
+\subsection{瀹夎\hologo{TeX}鍙戣鐗坿
+
+棣栧厛闇€瑕佷笅杞絓hologo{TeX}杞欢鍙戣鐗堬紝鏍″洯缃戠幆澧冧腑浣跨敤\href{https://mirror.nju.edu.cn/download/app/TeX%20%E6%8E%92%E7%89%88%E7%B3%BB%E7%BB%9F}{鍗楀ぇ闀滃儚绔檥鍙互鑾峰緱鏈€濂界殑浣撻獙銆俓textbf{鎺ㄨ崘浣跨敤鏈€鏂扮殑\hologo{TeX}\,Live 2021鎴栬€匼hologo{MiKTeX} 21浠ラ伩鍏嶆綔鍦ㄧ殑鍏煎鎬ч棶棰樸€倉
+
+\begin{itemize}
+ \item 涓轰簡閬垮厤涓嶅繀瑕佺殑楹荤儲锛岃灏藉彲鑳戒笅杞� full 鐗堟湰锛屽 texlive-full銆傜畝鑰岃█涔嬶紝涓嬭浇澶х殑閭ｄ釜銆�
+ \item 骞朵笖锛屽敖鍙兘浣跨敤鏈€鏂扮増锛堟埅鑷崇洰鍓嶆槸 2021锛夈€�2020 鍙婁箣鍓嶇増鏈娇鐢� PDF 鏍煎紡鐨勫浘鐗囧彲鑳戒細鍑虹幇鍔犵矖闂銆�
+\end{itemize}
+
涓嬭〃鏄洰鍓嶇粡杩囨祴璇曠殑鐜銆傚鏋滄湁鍏朵粬鍙敤涓嶅彲鐢ㄧ殑鐜锛屾杩庤ˉ鍏呫€�
\begin{table}[ht]
@@ -16,23 +27,10 @@
Windows 10 & \hologo{TeX}\,Live 2020 & cref瀛樺湪鏍煎紡闂 \\
macOS 10.15 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\
Ubuntu 20.04 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\
- 鍗楀ぇ\hologo{TeX} & \hologo{TeX}\,Live 2021 & 閫氳繃 \\
- Overleaf & \hologo{TeX}\,Live 2020 & cref瀛樺湪鏍煎紡闂 \\
\bottomrule
\end{tabular}
\end{table}
-\section{鏈湴缂栬瘧}
-
-\subsection{瀹夎\hologo{TeX}鍙戣鐗坿
-
-棣栧厛闇€瑕佷笅杞絓hologo{TeX}杞欢鍙戣鐗堬紝鏍″洯缃戠幆澧冧腑浣跨敤\href{https://mirror.nju.edu.cn/download/app/TeX%20%E6%8E%92%E7%89%88%E7%B3%BB%E7%BB%9F}{鍗楀ぇ闀滃儚绔檥鍙互鑾峰緱鏈€濂界殑浣撻獙銆俓textbf{鎺ㄨ崘浣跨敤鏈€鏂扮殑\hologo{TeX}\,Live 2021鎴栬€匼hologo{MiKTeX} 21浠ラ伩鍏嶆綔鍦ㄧ殑鍏煎鎬ч棶棰樸€倉
-
-\begin{itemize}
- \item 涓轰簡閬垮厤涓嶅繀瑕佺殑楹荤儲锛岃灏藉彲鑳戒笅杞� full 鐗堟湰锛屽 texlive-full銆傜畝鑰岃█涔嬶紝涓嬭浇澶х殑閭ｄ釜銆�
- \item 骞朵笖锛屽敖鍙兘浣跨敤鏈€鏂扮増锛堟埅鑷崇洰鍓嶆槸 2021锛夈€�2020 鍙婁箣鍓嶇増鏈娇鐢� PDF 鏍煎紡鐨勫浘鐗囧彲鑳戒細鍑虹幇鍔犵矖闂銆�
-\end{itemize}
-
\subsection{閫夋嫨缂栬緫鍣▆
閰嶇疆瀹岀紪璇戝櫒鍚庯紝杩橀渶瑕佷竴涓猏textbf{鏂囨湰缂栬緫鍣▆浣滀负鍓嶇鏉ュ畬鎴怽texttt{.tex}鏂囦欢鍐呭鐨勫啓浣溿€�
diff --git a/njuthesis-sample.tex b/njuthesis-sample.tex
index e02e6995e3ad516f8737c70f5530515a8f161155..2e8472b778d58fec513a0451cf1a8a32f6388d46 100644
--- a/njuthesis-sample.tex
+++ b/njuthesis-sample.tex
@@ -92,8 +92,11 @@
\input{chapters/Preface.tex}
\tableofcontents % 鐢熸垚鐩綍
+\cleardoublepage
\listoffigures % 鐢熸垚鍥剧墖娓呭崟
+\cleardoublepage
\listoftables % 鐢熸垚琛ㄦ牸娓呭崟
+\cleardoublepage
%-------------------------------------------------
% 姝ｆ枃閮ㄥ垎
diff --git a/njuthesis.dtx b/njuthesis.dtx
index bdd272a9f73a2e6f5ef5ed2fff40a1b04d25096e..eadf6ad27ed91aade86d6c539d7cfff479bba993 100644
--- a/njuthesis.dtx
+++ b/njuthesis.dtx
@@ -276,12 +276,13 @@ through XeTeX.
% \item 鏉ㄦ枃鍗氾紙\href{http://yangwenbo.com/}{@solrex}锛夌殑\href{https://github.com/solrex/njuthesis}{鍗椾含澶у瀛︿綅璁烘枃\hologo{LaTeX}妯℃澘}锛�2010锛�
% \item \href{https://github.com/fireblue}{@fireblue}鍩轰簬solrex妯℃澘鐨勭殑\href{https://github.com/fireblue/NJUThesis}{鍗椾含澶у瀛︿綅璁烘枃\hologo{LaTeX}妯℃澘}锛�2013锛�
% \item \href{https://github.com/wenhai-zheng}{@wenhai-zheng}鐨刓href{https://github.com/wenhai-zheng/NJUThesis}{NJUThesis}锛�2013锛�
+% \item 鏇瑰涔愶紙\href{https://github.com/ZLCao}{@ZLCao}锛夌殑\href{https://github.com/ZLCao/NJUBachelor}{NJUBachelor}锛�2013-2016锛�
% \item 鑳℃捣鏄燂紙\href{http://haixing-hu.github.io/}{@Haixing-Hu}锛夌殑\href{https://github.com/Haixing-Hu/nju-thesis}{NJU-Thesis}锛�2013 - 2018锛�
% \item 寮犳鐝╋紙\href{https://github.com/zhangchuheng123}{@zhangchuheng123}锛夊熀浜庤儭娴锋槦妯℃澘鐨刓href{https://github.com/zhangchuheng123/NJUThesis}{NJUThesis}锛�2016锛�
% \item 钂嬬値宀╋紙\href{http://ics.nju.edu.cn/~jyy/}{@jiangyy}锛夌殑\href{https://github.com/jiangyy/njuthesis}{鍗椾含澶у灞卞\hologo{LyX}鐮旂┒鐢熸瘯涓氳鏂囨ā鏉縸锛�2017锛�
-% \item 楗跺畨閫革紙\href{https://anyirao.com/}{@AnyiRao}锛夊熀浜庤儭娴锋槦妯℃澘鐨刓href{https://github.com/jiangyy/njuthesis}{NJU-Thesis}锛�2018锛�
% \item \href{https://github.com/njuHan}{@njuHan}鍩轰簬鑳℃捣鏄熸ā鏉跨殑\href{https://github.com/njuHan/njuthesis-nju-thesis-template/}{NJU-Thesis}锛�2018 - 2021锛�
-% \item 璧垫嚳鏅紙\href{https://fengchendian.github.io/about.html}{@FengChendian}锛夊熀浜嶢nyiRao妯℃澘鐨刓href{https://github.com/FengChendian/NJUThesis2021}{NJU Thesis 2021}锛�2021锛�
+% \item 楗跺畨閫革紙\href{https://anyirao.com/}{@AnyiRao}锛夊熀浜庡紶妤氱彥妯℃澘鐨刓href{https://github.com/AnyiRao/NJUThesis2018/}{NJU Thesis 2018}锛�2018锛�
+% \item 璧垫嚳鏅紙\href{https://fengchendian.github.io/about.html}{@FengChendian}锛夊熀浜庨ザ瀹夐€告ā鏉跨殑\href{https://github.com/FengChendian/NJUThesis2021}{NJU Thesis 2021}锛�2021锛�
% \end{enumerate}
% 鑷充簬涓嶅垢鑰屾湭杩涜浠ｇ爜鐗堟湰绠＄悊鐨勶紝鐢氳嚦浜庤浠ュ帇缂╁寘褰㈠紡娴佷紶浜庡悇浜虹‖鐩樹腑鐨勶紝灏辨洿涓嶅彲璁℃暟浜嗐€�
%
@@ -979,7 +980,6 @@ through XeTeX.
%
% \begin{macrocode}
\RequirePackage{xparse}
-\RequirePackage{titletoc} % 淇敼鐩綍鍐呮爣棰樻牸寮�
\RequirePackage[hyphens]{url} % generate better linebreaks in the url
\RequirePackage{dashundergaps}
\RequirePackage{setspace}
@@ -1443,15 +1443,10 @@ through XeTeX.
}
% \end{macrocode}
%
-%
+% 绔犺妭鏍囬鏍煎紡
% \begin{macrocode}
-% ctex鏍煎紡璁剧疆
-% 鐩綍鏍囬 涓夊彿瀹嬩綋鍔犵矖
-% 鍚勯儴鍒嗘爣棰� 鍥涘彿榛戜綋
+%
\ctexset{
- contentsname = 鐩綍,
- listfigurename = 鎻掑浘娓呭崟,
- listtablename = 琛ㄦ牸娓呭崟,
chapter/format = \zihao{4}\heiti\centering,
chapter/beforeskip = 10pt,
chapter/afterskip = 60pt,
@@ -1459,78 +1454,65 @@ through XeTeX.
subsection/format = \zihao{4}\heiti\raggedright,
subsubsection/format = \zihao{4}\heiti\raggedright
}
-
-% 閲嶅畾涔夌洰褰曚腑绔犺妭鏍囬鏍峰紡
-% 鐩綍鍐呭涓珷鐨勬爣棰� 鍥涘彿榛戜綋
-% 鐩綍涓叾浠栧唴瀹� 灏忓洓鍙峰畫浣�
-\titlecontents{chapter}% 鏍囬绾у埆
- [5em]% 鏍囬宸﹂棿璺�
- {\heiti\zihao{4}\vspace{10pt}}% 鏍囬鏍煎紡
- {\contentslabel{4em}}% 鏍囬鏍囧織
- {\hspace*{-4em}}% 鏃犲簭鍙锋爣棰�
- {~\titlerule*[0.6pc]{$.$}~\contentspage}% 鎸囧紩绾夸笌椤电爜
-
- \titlecontents{section}
- [5em]
- {\zihao{-4}\vspace{0pt}}
- {\contentslabel{2.5em}}
- {\hspace*{-4em}}
- {~\titlerule*[0.6pc]{$.$}~\contentspage}
-
-\titlecontents{subsection}
- [8em]
- {\zihao{-4}\vspace{0pt}}
- {\contentslabel{3em}}
- {\hspace*{-4em}}
- {~\titlerule*[0.6pc]{$.$}~\contentspage}
% \end{macrocode}
%
-%
-% \begin{macro}{\@@_toc_pagestyle:nnn}
-% 鐩綍椤甸潰鏍煎紡淇敼
-%
+% 鐩綍鏍囬鍚嶇О
% \begin{macrocode}
-\cs_new_protected:Npn \@@_toc_pagestyle:nnn #1 #2 #3
-{
- \newpage
- \hspace{0pt}
- \vskip 10pt
- \begin{center}
- \mbox{\songti\bf\zihao{3}{#1}} % 鐩綍椤甸潰鏍囬
- \phantomsection
- \addcontentsline{toc}{chapter}{#2} % 鎻掑叆鐩綍
- \end{center}
- \vskip 40pt
- \@starttoc{#3}%
- \cleardoublepage
+\ctexset{
+ contentsname = 鐩綍,
+ listfigurename = 鎻掑浘娓呭崟,
+ listtablename = 琛ㄦ牸娓呭崟,
}
% \end{macrocode}
-% \end{macro}
+%
+% \pkg{tocloft}瀹氬埗鐩綍鏂囧瓧鏍煎紡
+% \begin{macrocode}
+\RequirePackage[]{tocloft}
+\cftsetpnumwidth{2em}
+\setlength{\cftbeforetoctitleskip}{10pt}
+\setlength{\cftaftertoctitleskip}{40pt}
+\renewcommand{\cfttoctitlefont}{\hfill\centering\songti\bf\zihao{3}}
+\renewcommand{\cftaftertoctitle}{\hfill}
+
+\setlength{\cftbeforeloftitleskip}{10pt}
+\setlength{\cftafterloftitleskip}{40pt}
+\renewcommand{\cftloftitlefont}{\hfill\centering\songti\bf\zihao{3}}
+\renewcommand{\cftafterloftitle}{
+ \hfill\phantomsection
+ \addcontentsline{toc}{chapter}{\listfigurename}}
+
+\setlength{\cftbeforelottitleskip}{10pt}
+\setlength{\cftafterlottitleskip}{40pt}
+\renewcommand{\cftlottitlefont}{\hfill\centering\songti\bf\zihao{3}}
+\renewcommand{\cftafterlottitle}{
+ \hfill\phantomsection
+ \addcontentsline{toc}{chapter}{\listtablename}}
+
+\renewcommand{\cftchapfont}{\heiti\zihao{4}}
+\renewcommand{\cftchapleader}{\cftdotfill{\cftchapdotsep}}
+\renewcommand{\cftchapdotsep}{\cftdotsep}
+
+\setlength{\cftsecindent}{2em}
+\setlength{\cftsubsecindent}{52pt}
+\setlength{\cftsubsecnumwidth}{2em}
+% \end{macrocode}
+%
%
+%
+% \pkg{tocbibind}灏嗙洰褰曟彃鍏ヤ功绛�
% \begin{macrocode}
-\tl_set:Nn \tableofcontents
-{
- \@@_toc_pagestyle:nnn {鐩甛hspace{2em}褰晑{\contentsname}{toc}
-}
-\tl_set:Nn \listoffigures
-{
- \@@_toc_pagestyle:nnn {\listfigurename}{\listfigurename}{lof}
-}
-\tl_set:Nn \listoftables
-{
- \@@_toc_pagestyle:nnn {\listtablename}{\listtablename}{lot}
-}
+\RequirePackage{tocbibind}
% \end{macrocode}
%
% \begin{environment}{preface}
-%
+%
+% 鍗曠嫭鍒朵綔鐨勫墠瑷€椤点€�
% \begin{macrocode}
-% 瀹氬埗鍓嶈█銆佽嚧璋㈢幆澧�
\NewDocumentEnvironment{preface}{}
{%
\chapter*{鍓嶈█}
\addcontentsline{toc}{chapter}{鍓嶈█}
-}{}
+}{\cleardoublepage}
% \end{macrocode}
% \end{environment}
%
@@ -1541,13 +1523,13 @@ through XeTeX.
{%
\chapter*{鑷磋阿}
\addcontentsline{toc}{chapter}{鑷磋阿}
-}{}
+}{\cleardoublepage}
% \end{macrocode}
% \end{environment}
%
%
-% \begin{macrocode}
% biblatex璁剧疆
+% \begin{macrocode}
\RequirePackage[
style=gb7714-2015,
%style=numeric-comp,