From f1e6cf7773993e72ed004b8c18702c60ff221d8c Mon Sep 17 00:00:00 2001
From: atxy <181850195@smail.nju.edu.cn>
Date: Mon, 13 Sep 2021 16:18:32 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E7=9B=AE=E5=BD=95=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 njuthesis.tex        |   2 +-
 profile/abstract.sty |   4 +-
 profile/cover.sty    |   2 +-
 profile/font.sty     |  12 ++++-
 profile/page.sty     | 124 +++++++++++--------------------------------
 5 files changed, 45 insertions(+), 99 deletions(-)

diff --git a/njuthesis.tex b/njuthesis.tex
index b5382bc..ad2a9c3 100755
--- a/njuthesis.tex
+++ b/njuthesis.tex
@@ -91,7 +91,7 @@
 \input{chapters/Abstract.tex}
 \input{chapters/Preface.tex}
 
-\tableofcontents
+\tableofcontents % 鐢熸垚鐩綍
 \listoffigures % 鐢熸垚鍥剧墖娓呭崟
 \listoftables % 鐢熸垚琛ㄦ牸娓呭崟
 
diff --git a/profile/abstract.sty b/profile/abstract.sty
index a20f137..3abeac4 100644
--- a/profile/abstract.sty
+++ b/profile/abstract.sty
@@ -6,8 +6,8 @@
   % 鏈鎽樿鐜
   \NewDocumentEnvironment{abstract} {}
   {%
-    \pagestyle{plain}
-    \pagenumbering{Roman}
+    % \pagestyle{plain}
+    % \pagenumbering{Roman}
     % \phantomsection\addcontentsline{toc}{chapter}{涓枃鎽樿} % 灏嗘憳瑕佹彃鍏ョ洰褰曞拰pdf涔︾
     \pdfbookmark[0]{涓枃鎽樿}{涓枃鎽樿} % 灏嗘憳瑕佹彃鍏df涔︾锛屼笌涓婁竴琛屼笉鍙叡瀛�
     \begin{center}
diff --git a/profile/cover.sty b/profile/cover.sty
index 320eaaf..34b0aaa 100644
--- a/profile/cover.sty
+++ b/profile/cover.sty
@@ -293,7 +293,7 @@
   \end{center}
   \end{spacing}
   \cleardoublepage
-  \vfill
+  % \vfill
   % \newpage
 }
 
diff --git a/profile/font.sty b/profile/font.sty
index d939fb4..4e94790 100644
--- a/profile/font.sty
+++ b/profile/font.sty
@@ -64,7 +64,17 @@
   \setCJKfamilyfont{zhsong}{Songti~SC~Light}[BoldFont=Songti~SC~Bold]
   \setCJKfamilyfont{zhhei}{Heiti~SC~Light}[BoldFont=Heiti~SC~Medium]
   \setCJKfamilyfont{zhfs}{STFangsong}
-  \setCJKfamilyfont{zhkai}{Kaiti~SC}[BoldFont=Kaiti~SC~Bold]
+  \setCJKfamilyfont{zhkai}{Kaiti~SC}
+    [
+      BoldFont=Kaiti~SC~Bold,      
+      % 鍙傝€僀TeX鎵嬪唽绗�9鑺� LuaLATEX 涓嬬殑涓枃鏀寔鏂瑰紡
+      % AlternateFont =
+      %   {
+      %   {鉄╟haracter range1鉄﹠ {鉄╝lternate font name1鉄﹠ 
+      %   {鉄╝lternate font features2鉄﹠ ,
+      %   ......
+      %   }
+    ]
   \setCJKfamilyfont{zhnewhei}{PingFang~SC}
 }
 
diff --git a/profile/page.sty b/profile/page.sty
index 958b57c..065509b 100644
--- a/profile/page.sty
+++ b/profile/page.sty
@@ -36,6 +36,8 @@
 % 鍚勯儴鍒嗘爣棰� 鍥涘彿榛戜綋
 \ctexset{
     contentsname = 鐩綍,
+    listfigurename = 鎻掑浘娓呭崟, 
+    listtablename = 琛ㄦ牸娓呭崟,
     chapter/format = \zihao{4}\heiti\centering,
     chapter/beforeskip = 10pt,
     chapter/afterskip = 60pt,
@@ -54,7 +56,7 @@
                 {\hspace*{-4em}}% 鏃犲簭鍙锋爣棰�
                 {~\titlerule*[0.6pc]{$.$}~\contentspage}% 鎸囧紩绾夸笌椤电爜
 
-\titlecontents{section}
+                \titlecontents{section}
                 [5em]
                 {\zihao{-4}\vspace{0pt}}
                 {\contentslabel{2.5em}}
@@ -68,105 +70,39 @@
                 {\hspace*{-4em}}
                 {~\titlerule*[0.6pc]{$.$}~\contentspage}
 
-% TODO: 绠€鍖栫洰褰曟牸寮忎慨鏀�
-\tl_set:Nn \tableofcontents 
-{%
-  \if@twocolumn
-    \@restonecoltrue\onecolumn
-  \else
-    \@restonecolfalse
-  \fi
+\cs_set:Npn \CTEX@addtocline #1#2
+{ 
+  \addcontentsline { toc } {#1} 
+  { \use:c { CTEX@#1@tocline } {#1} {#2} } 
+}
 
-  % 淇敼鐩綍鏍囬瀛椾綋
-  \ctexset{
-    chapter = {
-      format = \songti\bf\zihao{3}\centering,
-      beforeskip = 10pt,
-      afterskip = 40pt,
-    }
-  }
+% 鐩綍椤甸潰鏍煎紡淇敼
+\cs_new:Npn \nju_tocpagestyle: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
+}
 
-  \chapter*{鐩甛hspace{2em}褰晑%
-  % \pdfbookmark[0]{鐩綍}{鐩綍} % 灏嗙洰褰曢〉鎻掑叆pdf涔︾
-  \addcontentsline{toc}{chapter}{\contentsname}
-  % \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
-  \@starttoc{toc}%
-  \if@restonecol\twocolumn\fi
-  
-  % 鎭㈠姝e父绔犺妭鏍囬瀛椾綋
-  \ctexset{
-    chapter = {
-      format = \zihao{4}\heiti\centering,
-      beforeskip = 10pt,
-      afterskip = 60pt,
-    }
-  }
+\tl_set:Nn \tableofcontents 
+{
+  \nju_tocpagestyle:nnn {鐩甛hspace{2em}褰晑{\contentsname}{toc}
 }
 \tl_set:Nn \listoffigures
-{%
-  \if@twocolumn
-    \@restonecoltrue\onecolumn
-  \else
-    \@restonecolfalse
-  \fi
-
-  % 淇敼鐩綍鏍囬瀛椾綋
-  \ctexset{
-    chapter = {
-      format = \songti\bf\zihao{3}\centering,
-      beforeskip = 10pt,
-      afterskip = 40pt,
-    }
-  }
-
-  \chapter*{鎻掑浘娓呭崟}%
-  % \pdfbookmark[0]{鐩綍}{鐩綍} % 灏嗙洰褰曢〉鎻掑叆pdf涔︾
-  \addcontentsline{toc}{chapter}{\listfigurename}
-  % \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
-  \@starttoc{lot}%
-  \if@restonecol\twocolumn\fi
-  
-  % 鎭㈠姝e父绔犺妭鏍囬瀛椾綋
-  \ctexset{
-    chapter = {
-      format = \zihao{4}\heiti\centering,
-      beforeskip = 10pt,
-      afterskip = 60pt,
-    }
-  }
+{
+  \nju_tocpagestyle:nnn {\listfigurename}{\listfigurename}{lof}
 }
 \tl_set:Nn \listoftables 
-{%
-  \if@twocolumn
-    \@restonecoltrue\onecolumn
-  \else
-    \@restonecolfalse
-  \fi
-
-  % 淇敼鐩綍鏍囬瀛椾綋
-  \ctexset{
-    chapter = {
-      format = \songti\bf\zihao{3}\centering,
-      beforeskip = 10pt,
-      afterskip = 40pt,
-    }
-  }
-
-  \chapter*{琛ㄦ牸娓呭崟}%
-  % \pdfbookmark[0]{鐩綍}{鐩綍} % 灏嗙洰褰曢〉鎻掑叆pdf涔︾
-  \addcontentsline{toc}{chapter}{\listtablename}
-  % \@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
-  \@starttoc{lot}%
-  \if@restonecol\twocolumn\fi
-  
-  % 鎭㈠姝e父绔犺妭鏍囬瀛椾綋
-  \ctexset{
-    chapter = {
-      format = \zihao{4}\heiti\centering,
-      beforeskip = 10pt,
-      afterskip = 60pt,
-    }
-  }
+{
+  \nju_tocpagestyle:nnn {\listtablename}{\listtablename}{lot}
 }
 
 % 瀹氬埗鍓嶈█銆佽嚧璋㈢幆澧�
-- 
GitLab