Update toc format of version 2020-09-18

CHANGELOG.md

@@ -7,6 +7,7 @@
 ## [Unreleased]
 ### Changed
 - 更新摘要的标题格式（研究生 2020-09-18 版）。
+- 更新目录的格式（研究生 2020-09-18 版）。
 
 ### Fixed
 - 修正 “keywords” 的拼写。

testfiles/06-contents.tlg

@@ -83,8 +83,8 @@ Completed box being shipped out [4]
 ...\write-{}
 ...\write1{\protect \FN@pp@footnotehinttrue }
 ...\write-{}
-...\write1{\@writefile{toc}{\protect \contentsline {chapter}{目录}{\thepage }\pro
-tected@file@percent \ETC.}
+...\write1{\@writefile{toc}{\protect \contentsline {chapter}{目\hskip 1em\relax 
+\ETC.}
 ...\write1{\protect \FN@pp@footnotehinttrue }
 ...\write-{}
 ...\glue(\topskip) 12.0
@@ -107,7 +107,7 @@ tected@file@percent \ETC.}
 ....\glue(\rightskip) 0.0 plus 1.0fil
 ...\penalty 10000
 ...\glue 32.12 plus -1.0
-...\mark{{目\protect \hspace  {\ccwd }录}{目\protect \hspace  {\ccwd }录}}
+...\mark{{目\hskip 1em\relax 录}{目\hskip 1em\relax 录}}
 ...\penalty 10000
 ...\penalty 10000
 ...\glue 0.0 plus 0.1
@@ -151,10 +151,10 @@ tected@file@percent \ETC.}
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 379.38625fill
+...\hbox(14.05243+6.02255)x426.79135, glue set 375.6523fill
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\TU/texgyretermes(0)/m/n/12.045 Abstract
+....\TU/texgyreheros(0)/m/n/12.045 Abstract
 ....\kern -0.0002
 ....\kern 0.0002
 ....\rule(14.05243+6.02255)x0.0
@@ -184,11 +184,13 @@ tected@file@percent \ETC.}
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 390.99763fill
+...\hbox(14.05243+6.02255)x426.79135, glue set 378.95264fill
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
 ....\TU/FandolHei(0)/m/n/12.045 目
-....\glue 0.0 plus 0.52307
+....\kern -0.00017
+....\kern 0.00017
+....\glue 12.045
 ....\TU/FandolHei(0)/m/n/12.045 录
 ....\kern -0.00017
 ....\kern 0.00017
@@ -311,18 +313,18 @@ tected@file@percent \ETC.}
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 349.50261fill
-....\glue(\leftskip) 48.18
+...\hbox(14.05243+6.02255)x426.79135, glue set 348.15356fill
+....\glue(\leftskip) 49.52904
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\hbox(9.41919+2.13194)x0.0, glue set - 48.18fil
+....\hbox(9.41919+2.13194)x0.0, glue set - 49.52904fil
 .....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(9.41919+2.13194)x48.18
+.....\hbox(9.41919+2.13194)x49.52904
 ......\special{color push gray 0}
 ......\TU/FandolHei(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
+......\glue 3.34851 plus 1.67426 minus 1.11617
+......\TU/texgyreheros(0)/m/n/12.045 1
+......\glue 3.34851 plus 1.67426 minus 1.11617
 ......\TU/FandolHei(0)/m/n/12.045 章
 ......\kern -0.00017
 ......\kern 0.00017
@@ -918,18 +920,18 @@ tected@file@percent \ETC.}
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 319.39012fill
-....\glue(\leftskip) 48.18
+...\hbox(14.05243+6.02255)x426.79135, glue set 318.04108fill
+....\glue(\leftskip) 49.52904
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\hbox(9.41919+2.13194)x0.0, glue set - 48.18fil
+....\hbox(9.41919+2.13194)x0.0, glue set - 49.52904fil
 .....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(9.41919+2.13194)x48.18
+.....\hbox(9.41919+2.13194)x49.52904
 ......\special{color push gray 0}
 ......\TU/FandolHei(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
+......\glue 3.34851 plus 1.67426 minus 1.11617
+......\TU/texgyreheros(0)/m/n/12.045 2
+......\glue 3.34851 plus 1.67426 minus 1.11617
 ......\TU/FandolHei(0)/m/n/12.045 章
 ......\kern -0.00017
 ......\kern 0.00017
@@ -1880,18 +1882,18 @@ Completed box being shipped out [5]
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 90.53516fill
-....\glue(\leftskip) 48.18
+...\hbox(14.05243+6.02255)x426.79135, glue set 89.18611fill
+....\glue(\leftskip) 49.52904
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\hbox(9.41919+2.13194)x0.0, glue set - 48.18fil
+....\hbox(9.41919+2.13194)x0.0, glue set - 49.52904fil
 .....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(9.41919+2.13194)x48.18
+.....\hbox(9.41919+2.13194)x49.52904
 ......\special{color push gray 0}
 ......\TU/FandolHei(0)/m/n/12.045 第
-......\glue 3.01125 plus 1.50562 minus 1.00374
-......\TU/texgyretermes(0)/m/n/12.045 3
-......\glue 3.01125 plus 1.50562 minus 1.00374
+......\glue 3.34851 plus 1.67426 minus 1.11617
+......\TU/texgyreheros(0)/m/n/12.045 3
+......\glue 3.34851 plus 1.67426 minus 1.11617
 ......\TU/FandolHei(0)/m/n/12.045 章
 ......\kern -0.00017
 ......\kern 0.00017
@@ -2723,18 +2725,18 @@ Completed box being shipped out [5]
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 114.62515fill
-....\glue(\leftskip) 48.18
+...\hbox(14.05243+6.02255)x426.79135, glue set 113.27611fill
+....\glue(\leftskip) 49.52904
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\hbox(9.41919+2.13194)x0.0, glue set - 48.18fil
+....\hbox(9.41919+2.13194)x0.0, glue set - 49.52904fil
 .....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(9.41919+2.13194)x48.18
+.....\hbox(9.41919+2.13194)x49.52904
 ......\special{color push gray 0}
 ......\TU/FandolHei(0)/m/n/12.045 第
-......\glue 3.01125 plus 1.50562 minus 1.00374
-......\TU/texgyretermes(0)/m/n/12.045 4
-......\glue 3.01125 plus 1.50562 minus 1.00374
+......\glue 3.34851 plus 1.67426 minus 1.11617
+......\TU/texgyreheros(0)/m/n/12.045 4
+......\glue 3.34851 plus 1.67426 minus 1.11617
 ......\TU/FandolHei(0)/m/n/12.045 章
 ......\kern -0.00017
 ......\kern 0.00017
@@ -4293,18 +4295,18 @@ Completed box being shipped out [6]
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 144.73764fill
-....\glue(\leftskip) 48.18
+...\hbox(14.05243+6.02255)x426.79135, glue set 143.3886fill
+....\glue(\leftskip) 49.52904
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\hbox(9.41919+2.13194)x0.0, glue set - 48.18fil
+....\hbox(9.41919+2.13194)x0.0, glue set - 49.52904fil
 .....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(9.41919+2.13194)x48.18
+.....\hbox(9.41919+2.13194)x49.52904
 ......\special{color push gray 0}
 ......\TU/FandolHei(0)/m/n/12.045 第
-......\glue 3.01125 plus 1.50562 minus 1.00374
-......\TU/texgyretermes(0)/m/n/12.045 5
-......\glue 3.01125 plus 1.50562 minus 1.00374
+......\glue 3.34851 plus 1.67426 minus 1.11617
+......\TU/texgyreheros(0)/m/n/12.045 5
+......\glue 3.34851 plus 1.67426 minus 1.11617
 ......\TU/FandolHei(0)/m/n/12.045 章
 ......\kern -0.00017
 ......\kern 0.00017
@@ -5418,18 +5420,18 @@ Completed box being shipped out [6]
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 108.60265fill
-....\glue(\leftskip) 48.18
+...\hbox(14.05243+6.02255)x426.79135, glue set 107.2536fill
+....\glue(\leftskip) 49.52904
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\hbox(9.41919+2.13194)x0.0, glue set - 48.18fil
+....\hbox(9.41919+2.13194)x0.0, glue set - 49.52904fil
 .....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(9.41919+2.13194)x48.18
+.....\hbox(9.41919+2.13194)x49.52904
 ......\special{color push gray 0}
 ......\TU/FandolHei(0)/m/n/12.045 第
-......\glue 3.01125 plus 1.50562 minus 1.00374
-......\TU/texgyretermes(0)/m/n/12.045 6
-......\glue 3.01125 plus 1.50562 minus 1.00374
+......\glue 3.34851 plus 1.67426 minus 1.11617
+......\TU/texgyreheros(0)/m/n/12.045 6
+......\glue 3.34851 plus 1.67426 minus 1.11617
 ......\TU/FandolHei(0)/m/n/12.045 章
 ......\kern -0.00017
 ......\kern 0.00017
@@ -6098,18 +6100,18 @@ Completed box being shipped out [7]
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 301.32262fill
-....\glue(\leftskip) 48.18
+...\hbox(14.05243+6.02255)x426.79135, glue set 299.97357fill
+....\glue(\leftskip) 49.52904
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\hbox(9.41919+2.13194)x0.0, glue set - 48.18fil
+....\hbox(9.41919+2.13194)x0.0, glue set - 49.52904fil
 .....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(9.41919+2.13194)x48.18
+.....\hbox(9.41919+2.13194)x49.52904
 ......\special{color push gray 0}
 ......\TU/FandolHei(0)/m/n/12.045 第
-......\glue 3.01125 plus 1.50562 minus 1.00374
-......\TU/texgyretermes(0)/m/n/12.045 7
-......\glue 3.01125 plus 1.50562 minus 1.00374
+......\glue 3.34851 plus 1.67426 minus 1.11617
+......\TU/texgyreheros(0)/m/n/12.045 7
+......\glue 3.34851 plus 1.67426 minus 1.11617
 ......\TU/FandolHei(0)/m/n/12.045 章
 ......\kern -0.00017
 ......\kern 0.00017
@@ -6280,19 +6282,19 @@ Completed box being shipped out [7]
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 108.93991fill
-....\glue(\leftskip) 47.84273
+...\hbox(14.05243+6.02255)x426.79135, glue set 109.26512fill
+....\glue(\leftskip) 47.51752
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\hbox(9.10602+2.07173)x0.0, glue set - 47.84273fil
+....\hbox(9.10602+2.07173)x0.0, glue set - 47.51752fil
 .....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(9.10602+2.07173)x47.84273
+.....\hbox(9.10602+2.07173)x47.51752
 ......\special{color push gray 0}
 ......\TU/FandolHei(0)/m/n/12.045 附
 ......\glue 0.0 plus 0.52307
 ......\TU/FandolHei(0)/m/n/12.045 录
-......\glue 3.01125 plus 1.5041 minus 1.00473
-......\TU/texgyretermes(0)/m/n/12.045 A
+......\glue 3.34851 plus 1.67258 minus 1.11728
+......\TU/texgyreheros(0)/m/n/12.045 A
 ......\kern -0.0002
 ......\kern 0.0002
 ......\glue 12.045
@@ -6367,19 +6369,19 @@ Completed box being shipped out [7]
 ...\glue 6.02249
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\baselineskip) 0.00002
-...\hbox(14.05243+6.02255)x426.79135, glue set 85.51239fill
-....\glue(\leftskip) 47.18025
+...\hbox(14.05243+6.02255)x426.79135, glue set 85.17513fill
+....\glue(\leftskip) 47.51752
 ....\hbox(0.0+0.0)x0.0
 ....\rule(14.05243+6.02255)x0.0
-....\hbox(9.10602+2.07173)x0.0, glue set - 47.18025fil
+....\hbox(9.10602+2.07173)x0.0, glue set - 47.51752fil
 .....\glue 0.0 plus 1.0fil minus 1.0fil
-.....\hbox(9.10602+2.07173)x47.18025
+.....\hbox(9.10602+2.07173)x47.51752
 ......\special{color push gray 0}
 ......\TU/FandolHei(0)/m/n/12.045 附
 ......\glue 0.0 plus 0.52307
 ......\TU/FandolHei(0)/m/n/12.045 录
-......\glue 3.01125 plus 1.5041 minus 1.00473
-......\TU/texgyretermes(0)/m/n/12.045 B
+......\glue 3.34851 plus 1.67258 minus 1.11728
+......\TU/texgyreheros(0)/m/n/12.045 B
 ......\kern -0.0002
 ......\kern 0.0002
 ......\glue 12.045

testfiles/09-main-bachelor.tlg

@@ -1674,7 +1674,7 @@ Completed box being shipped out [5]
 ....\glue(\rightskip) 0.0 plus 1.0fil
 ...\penalty 10000
 ...\glue 20.075 plus -1.0
-...\mark{{目\protect \hspace  {\ccwd }录}{目\protect \hspace  {\ccwd }录}}
+...\mark{{目\hskip 1em\relax 录}{目\hskip 1em\relax 录}}
 ...\penalty 10000
 ...\penalty 10000
 ...\glue 0.0 plus 0.1

thuthesis.dtx

@@ -2290,7 +2290,7 @@
     \def\indexname{索引}%
     \def\thu@acknowledgements@name{致\hspace{\ccwd}谢}%
     \ifthu@degree@bachelor
-      \def\contentsname{目\hspace{\ccwd}录}%
+      \def\contentsname{目\quad 录}%
       \def\listfigurename{插图索引}%
       \def\listtablename{表格索引}%
       \def\thu@list@figure@table@name{插图和附表索引}%
@@ -2305,8 +2305,7 @@
       \def\thu@list@algorithm@name{算法清单}%
       \def\listequationname{公式清单}%
       \ifthu@degree@graduate
-        \def\contentsname{目\hspace{\ccwd}录}%
-        \def\thu@toc@contents@name{目录}%
+        \def\contentsname{目\quad 录}%
         \def\thu@denotation@name{符号和缩略语说明}%
         \def\thu@resume@name{个人简历、在学期间完成的相关学术成果}%
       \else  % degree = postdoc
@@ -2335,7 +2334,6 @@
         \def\thu@resume@name{PUBLICATIONS}%
       \else
         \def\contentsname{Contents}%
-        \def\thu@toc@contents@name{Contents}%
         \def\listfigurename{List of Figures}%
         \def\listtablename{List of Tables}%
         \def\thu@list@figure@table@name{List of Figures and Tables}%
@@ -3042,7 +3040,7 @@
 %    \begin{macrocode}
 \renewcommand\tableofcontents{%
   \ifthu@degree@graduate
-    \thu@chapter*[\thu@toc@contents@name]{\contentsname}%
+    \thu@chapter*{\contentsname}%
   \else
     \thu@chapter*[]{\contentsname}%
   \fi
@@ -3127,13 +3125,7 @@
 %    \begin{macrocode}
   \else
     \titlecontents{chapter}
-      [\z@]{\addvspace{6bp}
-        \ifthu@main@language@chinese
-          \heiti
-        \else
-          \sffamily
-        \fi
-      }
+      [\z@]{\addvspace{6bp}\sffamily}
       {\contentspush{\thecontentslabel\quad}}{}
       {\rmfamily\thu@leaders\thecontentspage}%
     \titlecontents{section}