From 972d45f1937a806a6171518ab64dda33597fd52f Mon Sep 17 00:00:00 2001
From: Zeping Lee <zepinglee@gmail.com>
Date: Sun, 22 Dec 2019 12:27:05 +0800
Subject: [PATCH] fix font of chapter in toc

closes #431
---
 CHANGELOG.md                   |   3 +
 testfiles/07-main-bachelor.tlg | 124 ++++++++++++++++-----------------
 thuthesis.dtx                  |  38 +++-------
 3 files changed, 76 insertions(+), 89 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 502234d9..4351bffb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - 修正本科生的文献引用样式。
 - 修改 `shuji` 为 `spine`。
 
+### Fixed
+- 修正本科生目录章标题的字体。
+
 ## [v5.5.2] - 2019-04-21
 ### Changed
 - 使用 XITS 数学字体。
diff --git a/testfiles/07-main-bachelor.tlg b/testfiles/07-main-bachelor.tlg
index 965db487..4e28cb65 100644
--- a/testfiles/07-main-bachelor.tlg
+++ b/testfiles/07-main-bachelor.tlg
@@ -135,24 +135,24 @@ Completed box being shipped out [1]
 ....\mark{{目\protect \hspace  {\ccwd }录}{目\protect \hspace  {\ccwd }录}}....\penalty 10000
 ....\glue 6.02249 plus 1.0
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.13048
-....\hbox(9.35896+2.21626)x415.41025, glue set 337.11775fill
+....\glue(\baselineskip) 8.07025
+....\hbox(9.41919+2.13194)x415.41025, glue set 337.11775fill
 .....\glue(\leftskip) 48.18
 .....\hbox(0.0+0.0)x0.0
 .....\glue -48.18
 .....\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/H/I/C[1 0 0]/A<</S/G\ETC.}
-.....\hbox(9.35896+2.21626)x48.18, glue set 12.045fil
-......\TU/FandolSong-Regular(0)/m/n/12.045 第
+.....\hbox(9.41919+2.13194)x48.18, glue set 12.045fil
+......\TU/FandolHei-Regular(0)/m/n/12.045 第
 ......\glue 3.01125 plus 1.50562 minus 1.00374
 ......\TU/texgyretermes(0)/m/n/12.045 1
 ......\glue 3.01125 plus 1.50562 minus 1.00374
-......\TU/FandolSong-Regular(0)/m/n/12.045 章
+......\TU/FandolHei-Regular(0)/m/n/12.045 章
 ......\kern -0.00017
 ......\kern 0.00017
 ......\glue 0.0 plus 1.0fil
-.....\TU/FandolSong-Regular(0)/m/n/12.045 引
+.....\TU/FandolHei-Regular(0)/m/n/12.045 引
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 言
+.....\TU/FandolHei-Regular(0)/m/n/12.045 言
 .....\kern -0.00017
 .....\kern 0.00017
 .....\special{pdf:eann}
@@ -178,7 +178,7 @@ Completed box being shipped out [1]
 ....\penalty 301
 ....\glue 0.0 plus 0.2
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.46774
+....\glue(\baselineskip) 8.55206
 ....\hbox(9.3951+2.09581)x415.41025, glue set 323.8682fill
 .....\glue(\leftskip) 37.33955
 .....\hbox(0.0+0.0)x12.045
@@ -340,30 +340,30 @@ Completed box being shipped out [1]
 ....\penalty -301
 ....\glue 6.02249 plus 1.0
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.49184
-....\hbox(9.35896+2.21626)x415.41025, glue set 300.98276fill
+....\glue(\baselineskip) 8.41957
+....\hbox(9.43123+2.16809)x415.41025, glue set 300.98276fill
 .....\glue(\leftskip) 48.18
 .....\hbox(0.0+0.0)x0.0
 .....\glue -48.18
 .....\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/H/I/C[1 0 0]/A<</S/G\ETC.}
-.....\hbox(9.35896+2.21626)x48.18, glue set 12.045fil
-......\TU/FandolSong-Regular(0)/m/n/12.045 第
+.....\hbox(9.41919+2.13194)x48.18, glue set 12.045fil
+......\TU/FandolHei-Regular(0)/m/n/12.045 第
 ......\glue 3.01125 plus 1.50562 minus 1.00374
 ......\TU/texgyretermes(0)/m/n/12.045 2
 ......\glue 3.01125 plus 1.50562 minus 1.00374
-......\TU/FandolSong-Regular(0)/m/n/12.045 章
+......\TU/FandolHei-Regular(0)/m/n/12.045 章
 ......\kern -0.00017
 ......\kern 0.00017
 ......\glue 0.0 plus 1.0fil
-.....\TU/FandolSong-Regular(0)/m/n/12.045 资
+.....\TU/FandolHei-Regular(0)/m/n/12.045 资
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 料
+.....\TU/FandolHei-Regular(0)/m/n/12.045 料
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 与
+.....\TU/FandolHei-Regular(0)/m/n/12.045 与
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 试
+.....\TU/FandolHei-Regular(0)/m/n/12.045 试
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 验
+.....\TU/FandolHei-Regular(0)/m/n/12.045 验
 .....\kern -0.00017
 .....\kern 0.00017
 .....\special{pdf:eann}
@@ -389,7 +389,7 @@ Completed box being shipped out [1]
 ....\penalty 301
 ....\glue 0.0 plus 0.2
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.55205
+....\glue(\baselineskip) 8.60022
 ....\hbox(9.31079+2.09581)x415.41025, glue set 323.8682fill
 .....\glue(\leftskip) 37.33955
 .....\hbox(0.0+0.0)x12.045
@@ -500,19 +500,19 @@ Completed box being shipped out [1]
 ....\penalty -301
 ....\glue 6.02249 plus 1.0
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.6725
-....\hbox(9.2867+2.05968)x415.41025, glue set 361.20775fill
+....\glue(\baselineskip) 8.76886
+....\hbox(9.19034+2.03558)x415.41025, glue set 361.20775fill
 .....\glue(\leftskip) 48.18
 .....\hbox(0.0+0.0)x0.0
 .....\glue -48.18
 .....\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/H/I/C[1 0 0]/A<</S/G\ETC.}
-.....\TU/FandolSong-Regular(0)/m/n/12.045 插
+.....\TU/FandolHei-Regular(0)/m/n/12.045 插
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 图
+.....\TU/FandolHei-Regular(0)/m/n/12.045 图
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 索
+.....\TU/FandolHei-Regular(0)/m/n/12.045 索
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 引
+.....\TU/FandolHei-Regular(0)/m/n/12.045 引
 .....\kern -0.00017
 .....\kern 0.00017
 .....\special{pdf:eann}
@@ -539,19 +539,19 @@ Completed box being shipped out [1]
 ....\penalty -301
 ....\glue 6.02249 plus 1.0
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.6725
-....\hbox(9.34692+2.09581)x415.41025, glue set 361.20775fill
+....\glue(\baselineskip) 8.68456
+....\hbox(9.35896+2.16809)x415.41025, glue set 361.20775fill
 .....\glue(\leftskip) 48.18
 .....\hbox(0.0+0.0)x0.0
 .....\glue -48.18
 .....\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/H/I/C[1 0 0]/A<</S/G\ETC.}
-.....\TU/FandolSong-Regular(0)/m/n/12.045 表
+.....\TU/FandolHei-Regular(0)/m/n/12.045 表
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 格
+.....\TU/FandolHei-Regular(0)/m/n/12.045 格
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 索
+.....\TU/FandolHei-Regular(0)/m/n/12.045 索
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 引
+.....\TU/FandolHei-Regular(0)/m/n/12.045 引
 .....\kern -0.00017
 .....\kern 0.00017
 .....\special{pdf:eann}
@@ -578,19 +578,19 @@ Completed box being shipped out [1]
 ....\penalty -301
 ....\glue 6.02249 plus 1.0
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.64842
-....\hbox(9.33487+2.1199)x415.41025, glue set 361.20775fill
+....\glue(\baselineskip) 8.45569
+....\hbox(9.45532+2.26445)x415.41025, glue set 361.20775fill
 .....\glue(\leftskip) 48.18
 .....\hbox(0.0+0.0)x0.0
 .....\glue -48.18
 .....\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/H/I/C[1 0 0]/A<</S/G\ETC.}
-.....\TU/FandolSong-Regular(0)/m/n/12.045 参
+.....\TU/FandolHei-Regular(0)/m/n/12.045 参
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 考
+.....\TU/FandolHei-Regular(0)/m/n/12.045 考
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 文
+.....\TU/FandolHei-Regular(0)/m/n/12.045 文
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 献
+.....\TU/FandolHei-Regular(0)/m/n/12.045 献
 .....\kern -0.00017
 .....\kern 0.00017
 .....\special{pdf:eann}
@@ -617,17 +617,17 @@ Completed box being shipped out [1]
 ....\penalty -301
 ....\glue 6.02249 plus 1.0
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.63637
-....\hbox(9.32283+2.09581)x415.41025, glue set 373.25275fill
+....\glue(\baselineskip) 8.49182
+....\hbox(9.32283+2.20422)x415.41025, glue set 373.25275fill
 .....\glue(\leftskip) 48.18
 .....\hbox(0.0+0.0)x0.0
 .....\glue -48.18
 .....\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/H/I/C[1 0 0]/A<</S/G\ETC.}
-.....\TU/FandolSong-Regular(0)/m/n/12.045 致
+.....\TU/FandolHei-Regular(0)/m/n/12.045 致
 .....\kern -0.00017
 .....\kern 0.00017
 .....\glue 12.045
-.....\TU/FandolSong-Regular(0)/m/n/12.045 谢
+.....\TU/FandolHei-Regular(0)/m/n/12.045 谢
 .....\kern -0.00017
 .....\kern 0.00017
 .....\special{pdf:eann}
@@ -654,17 +654,17 @@ Completed box being shipped out [1]
 ....\penalty -301
 ....\glue 6.02249 plus 1.0
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.74478
-....\hbox(9.23851+2.21626)x415.41025, glue set 373.25275fill
+....\glue(\baselineskip) 8.52795
+....\hbox(9.34692+2.15604)x415.41025, glue set 373.25275fill
 .....\glue(\leftskip) 48.18
 .....\hbox(0.0+0.0)x0.0
 .....\glue -48.18
 .....\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/H/I/C[1 0 0]/A<</S/G\ETC.}
-.....\TU/FandolSong-Regular(0)/m/n/12.045 声
+.....\TU/FandolHei-Regular(0)/m/n/12.045 声
 .....\kern -0.00017
 .....\kern 0.00017
 .....\glue 12.045
-.....\TU/FandolSong-Regular(0)/m/n/12.045 明
+.....\TU/FandolHei-Regular(0)/m/n/12.045 明
 .....\kern -0.00017
 .....\kern 0.00017
 .....\special{pdf:eann}
@@ -691,42 +691,42 @@ Completed box being shipped out [1]
 ....\penalty -301
 ....\glue 6.02249 plus 1.0
 ....\glue(\parskip) 0.0 plus 1.0
-....\glue(\baselineskip) 8.52797
-....\hbox(9.33487+2.19217)x415.41025, glue set 222.69028fill
+....\glue(\baselineskip) 8.47978
+....\hbox(9.44328+2.16809)x415.41025, glue set 222.69028fill
 .....\glue(\leftskip) 48.18
 .....\hbox(0.0+0.0)x0.0
 .....\glue -48.18
 .....\special{pdf:bann<</Type/Annot/Subtype/Link/Border[0 0 0]/H/I/C[1 0 0]/A<</S/G\ETC.}
-.....\hbox(9.14215+1.99945)x48.18, glue set 12.38226fil
-......\TU/FandolSong-Regular(0)/m/n/12.045 附
+.....\hbox(9.10602+2.07173)x48.18, glue set 12.38226fil
+......\TU/FandolHei-Regular(0)/m/n/12.045 附
 ......\glue 0.0 plus 0.56017
-......\TU/FandolSong-Regular(0)/m/n/12.045 录
+......\TU/FandolHei-Regular(0)/m/n/12.045 录
 ......\glue 3.01125 plus 1.5041 minus 1.00473
 ......\TU/texgyretermes(0)/m/n/12.045 A
 ......\kern -0.0002
 ......\kern 0.0002
 ......\glue 0.0 plus 1.0fil
-.....\TU/FandolSong-Regular(0)/m/n/12.045 外
+.....\TU/FandolHei-Regular(0)/m/n/12.045 外
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 文
+.....\TU/FandolHei-Regular(0)/m/n/12.045 文
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 资
+.....\TU/FandolHei-Regular(0)/m/n/12.045 资
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 料
+.....\TU/FandolHei-Regular(0)/m/n/12.045 料
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 的
+.....\TU/FandolHei-Regular(0)/m/n/12.045 的
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 调
+.....\TU/FandolHei-Regular(0)/m/n/12.045 调
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 研
+.....\TU/FandolHei-Regular(0)/m/n/12.045 研
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 阅
+.....\TU/FandolHei-Regular(0)/m/n/12.045 阅
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 读
+.....\TU/FandolHei-Regular(0)/m/n/12.045 读
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 报
+.....\TU/FandolHei-Regular(0)/m/n/12.045 报
 .....\glue 0.0 plus 0.56017
-.....\TU/FandolSong-Regular(0)/m/n/12.045 告
+.....\TU/FandolHei-Regular(0)/m/n/12.045 告
 .....\kern -0.00017
 .....\kern 0.00017
 .....\special{pdf:eann}
@@ -751,7 +751,7 @@ Completed box being shipped out [1]
 .....\glue(\rightskip) 24.09
 ....\penalty 301
 ....\write1{\protect \FN@pp@footnotehinttrue }
-....\glue -2.19217
+....\glue -2.16809
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ....\glue 0.0 plus 0.0001fil
diff --git a/thuthesis.dtx b/thuthesis.dtx
index 754bc2a1..dcd7c5be 100644
--- a/thuthesis.dtx
+++ b/thuthesis.dtx
@@ -329,17 +329,6 @@
 % 是 \option{openany}。}。这两个选项不用设置，\thuthesis\ 会根据当前论文类型自动选
 % 择。
 %
-% \DescribeOption{tocarialchapter}
-% 章目录项（内容和页码）是否用 \textsf{Arial} 字体。如果想分别控制内容和页码的字体，
-% 用下面两个开关。
-%
-% \DescribeOption{tocarialchapterentry}
-% 章目录项内容中的英文和数字是否用 \textsf{Arial} 字体。中文强制黑体，为了协调这个选
-% 项应该默认打开，不过从目前的反馈来看各学院的标准不一致。
-%
-% \DescribeOption{tocarialchapterpage}
-% 章目录项页码是否用 \textsf{Arial} 字体。
-%
 % \subsection{引用方式}
 % \label{sec:citestyle}
 % 模板支持两种引用方式，分别为理工科常用的“数字式 [1]”和文科常用
@@ -1073,14 +1062,6 @@
 }
 %    \end{macrocode}
 %
-% 章目录中的英文是否用 Arial 字体（默认关闭），可以分别控制内容和页码部分。
-%    \begin{macrocode}
-\DeclareBoolOption{tocarialchapter}
-\DeclareBoolOption{tocarialchapterentry}
-\DeclareBoolOption{tocarialchapterpage}
-%    \end{macrocode}
-%
-%
 % \option{raggedbottom} 选项（默认打开）
 %    \begin{macrocode}
 \DeclareBoolOption[true]{raggedbottom}
@@ -2122,11 +2103,6 @@
 \def\@pnumwidth{2em}
 \def\@tocrmarg{\@pnumwidth}
 \def\@dotsep{1}
-\ifthu@tocarialchapter
-  \thu@tocarialchapterentrytrue\thu@tocarialchapterpagetrue
-\fi
-\def\thu@toc@chapter@entry@font{\ifthu@tocarialchapterentry\sffamily\fi}
-\def\thu@toc@chapter@page@font{\ifthu@tocarialchapterpage\sffamily\fi}
 \renewcommand*\l@chapter[2]{%
   \ifnum \c@tocdepth >\m@ne
     \addpenalty{-\@highpenalty}%
@@ -2138,9 +2114,18 @@
       \leavevmode
       \advance\leftskip\@tempdima
       \hskip -\leftskip
-      {\thu@toc@chapter@entry@font #1}%
+      \begingroup
+        \ifthu@graduate
+          \sffamily
+        \else
+          \ifthu@bachelor
+            \heiti
+          \fi
+        \fi
+        #1%
+      \endgroup
       \leaders\hbox{$\m@th\mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill%
-      \nobreak{\thu@toc@chapter@page@font #2}\par
+      \nobreak #2\par
       \penalty\@highpenalty
     \endgroup
   \fi}
@@ -2150,7 +2135,6 @@
 % 汉字符，二级节标题行缩进 2 个汉字符（但示例文件中为 1.5 个汉字符）。本科生指
 % 南中未作明确规定，示例文件中对于一级和二级节标题分别缩进 1 和 1.5 个汉字符。
 %    \begin{macrocode}
-% \patchcmd{\@dottedtocline}{#4}{\csname thu@toc@font\endcsname #4}{}{}
 \patchcmd{\@dottedtocline}{\hb@xt@\@pnumwidth}{\hbox}{}{}
 \renewcommand*\l@section{%
   \@dottedtocline{1}{\ccwd}{2.1em}}