diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fa6cd1..4fc4b68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - 修正了与 `chapterbib` 宏包的兼容性。 - 去掉 `notoccite` 宏包，防止造成 PDF 书签中页码的错误（#293）。 +- 修正了表题的字体（#295）。 ## [v3.3.0] - 2021-03-18 diff --git a/chapters/floats.tex b/chapters/floats.tex index 8a8acd5..c0b806d 100644 --- a/chapters/floats.tex +++ b/chapters/floats.tex @@ -5,8 +5,8 @@ \chapter{浮动体} \section{三线表} 三线表是《撰写手册》推荐使用的格式，如表~\ref{tab:exampletable}。 -\begin{table}[htb] - \centering\small +\begin{table}[h] + \centering \caption{表号和表题在表的正上方} \label{tab:exampletable} \begin{tabular}{cl} @@ -35,7 +35,7 @@ \section{插图} 事实上，这种做法已经过时。 而且每次编译时都要要调用外部工具解析 eps，导致降低编译速度。 所以我们推荐矢量图直接使用 pdf 格式，位图使用 jpeg 或 png 格式。 -\begin{figure}[htb] +\begin{figure}[h] \centering \includegraphics[width=0.3\textwidth]{ustc-badge.pdf} \caption{图号、图题置于图的下方} @@ -53,8 +53,7 @@ \section{算法环境} 模板中使用 \pkg{algorithm2e} 宏包实现算法环境。关于该宏包的具体用法， 请阅读宏包的官方文档。 -\begin{algorithm}[htb] - \small +\begin{algorithm}[h] \SetAlgoLined \KwData{this text} \KwResult{how to write algorithm with \LaTeX2e } diff --git a/test/testfiles-toc/main-lof.tlg b/test/testfiles-toc/main-lof.tlg index 087ca5e..0b6dd8f 100644 --- a/test/testfiles-toc/main-lof.tlg +++ b/test/testfiles-toc/main-lof.tlg @@ -600,7 +600,7 @@ Completed box being shipped out [1] ....\special{color pop} ..\glue 8.2511 ..\glue(\lineskip) 0.0 -..\vbox(700.50723+0.0)x417.11752, glue set 518.18315fil +..\vbox(700.50723+0.0)x417.11752, glue set 511.7096fil ...\write1{\protect \FN@pp@footnotehinttrue } ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} @@ -632,20 +632,21 @@ Completed box being shipped out [1] ...\penalty 10000 ...\glue 18.06749 ...\penalty 10000 -...\glue 6.02249 -...\vbox(29.61058+0.0)x417.11752 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(29.61058+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline \ETC.} .....\special{color push Black} .....\rule(0.0+0.0)x* .....\glue 6.02249 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 167.05473fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 167.05473fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 ........\TU/FandolSong(0)/b/n/10.53937 图 @@ -657,7 +658,7 @@ Completed box being shipped out [1] ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 ........\TU/texgyretermes(0)/b/n/10.53937 Figure @@ -668,36 +669,39 @@ Completed box being shipped out [1] ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\glue 6.02249 +.....\glue 0.0 .....\special{color pop} .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 +...\glue -12.045 ...\penalty 0 -...\glue 6.02249 -...\vbox(29.61058+0.0)x417.11752 +...\glue 12.045 +...\penalty 0 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(29.61058+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline \ETC.} .....\special{color push Black} .....\rule(0.0+0.0)x* .....\glue 6.02249 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 53.32439fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 53.32439fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 ........\TU/FandolSong(0)/b/n/10.53937 图 @@ -709,7 +713,7 @@ Completed box being shipped out [1] ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 ........\TU/texgyretermes(0)/b/n/10.53937 Figure @@ -760,36 +764,39 @@ Completed box being shipped out [1] ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\glue 6.02249 +.....\glue 0.0 .....\special{color pop} .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 +...\glue -12.045 ...\penalty 0 -...\glue 6.02249 -...\vbox(29.61058+0.0)x417.11752 +...\glue 12.045 +...\penalty 0 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(29.61058+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline \ETC.} .....\special{color push Black} .....\rule(0.0+0.0)x* .....\glue 6.02249 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 167.05473fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 167.05473fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 ........\TU/FandolSong(0)/b/n/10.53937 图 @@ -801,7 +808,7 @@ Completed box being shipped out [1] ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 ........\TU/texgyretermes(0)/b/n/10.53937 Figure @@ -812,21 +819,20 @@ Completed box being shipped out [1] ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\glue 6.02249 +.....\glue 0.0 .....\special{color pop} .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 ...\write1{\protect \FN@pp@footnotehinttrue } ...\glue 0.0 plus 1.0fil ...\glue 0.0 @@ -930,7 +936,7 @@ Completed box being shipped out [2] ....\special{color pop} ..\glue 8.2511 ..\glue(\lineskip) 0.0 -..\vbox(700.50723+0.0)x417.11752, glue set 518.18315fil +..\vbox(700.50723+0.0)x417.11752, glue set 511.7096fil ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} ...\mark{{第2章\hskip 1em\relax \protect \ustc@spacetitle {Bar}}{}} @@ -961,20 +967,21 @@ Completed box being shipped out [2] ...\penalty 10000 ...\glue 18.06749 ...\penalty 10000 -...\glue 6.02249 -...\vbox(29.61058+0.0)x417.11752 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(29.61058+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline \ETC.} .....\special{color push Black} .....\rule(0.0+0.0)x* .....\glue 6.02249 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 167.05473fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 167.05473fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 ........\TU/FandolSong(0)/b/n/10.53937 图 @@ -986,7 +993,7 @@ Completed box being shipped out [2] ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 ........\TU/texgyretermes(0)/b/n/10.53937 Figure @@ -997,36 +1004,39 @@ Completed box being shipped out [2] ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\glue 6.02249 +.....\glue 0.0 .....\special{color pop} .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 +...\glue -12.045 ...\penalty 0 -...\glue 6.02249 -...\vbox(29.61058+0.0)x417.11752 +...\glue 12.045 +...\penalty 0 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(29.61058+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline \ETC.} .....\special{color push Black} .....\rule(0.0+0.0)x* .....\glue 6.02249 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 166.0166fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 166.0166fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 ........\TU/FandolSong(0)/b/n/10.53937 图 @@ -1038,7 +1048,7 @@ Completed box being shipped out [2] ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 ........\TU/texgyretermes(0)/b/n/10.53937 Figure @@ -1049,36 +1059,39 @@ Completed box being shipped out [2] ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\glue 6.02249 +.....\glue 0.0 .....\special{color pop} .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 +...\glue -12.045 ...\penalty 0 -...\glue 6.02249 -...\vbox(29.61058+0.0)x417.11752 +...\glue 12.045 +...\penalty 0 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(29.61058+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lof}{\protect \contentsline {figure}{\protect \numberline \ETC.} .....\special{color push Black} .....\rule(0.0+0.0)x* .....\glue 6.02249 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 167.05473fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 167.05473fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 ........\TU/FandolSong(0)/b/n/10.53937 图 @@ -1090,7 +1103,7 @@ Completed box being shipped out [2] ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 ........\TU/texgyretermes(0)/b/n/10.53937 Figure @@ -1101,21 +1114,20 @@ Completed box being shipped out [2] ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil ......\penalty 10000 ......\glue(\parfillskip) 0.0 plus 1.0fil ......\glue(\rightskip) 0.0 -.....\glue 6.02249 +.....\glue 0.0 .....\special{color pop} .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 ...\write1{\protect \FN@pp@footnotehinttrue } ...\glue 0.0 plus 1.0fil ...\glue 0.0 diff --git a/test/testfiles-toc/main-lot.tlg b/test/testfiles-toc/main-lot.tlg index b7b7109..63e280d 100644 --- a/test/testfiles-toc/main-lot.tlg +++ b/test/testfiles-toc/main-lot.tlg @@ -560,7 +560,7 @@ Completed box being shipped out [1] ....\special{color pop} ..\glue 8.2511 ..\glue(\lineskip) 0.0 -..\vbox(700.50723+0.0)x417.11752, glue set 536.24869fil +..\vbox(700.50723+0.0)x417.11752, glue set 511.7096fil ...\write1{\protect \FN@pp@footnotehinttrue } ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} @@ -592,42 +592,43 @@ Completed box being shipped out [1] ...\penalty 10000 ...\glue 18.06749 ...\penalty 10000 -...\glue 6.02249 -...\vbox(23.58809+0.0)x417.11752 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(23.58809+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline \ETC.} .....\special{color push Black} .....\glue 0.0 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 169.3892fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 166.25374fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 -........\TU/FandolSong(0)/b/n/10.53937 表 +........\TU/FandolHei(0)/b/n/10.53937 表 ........\kern -0.00017 ........\kern 0.00017 ........\penalty 10000 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 1.1 +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 1.1 ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 -........\TU/texgyretermes(0)/b/n/10.53937 Table +........\TU/texgyreheros(0)/b/n/10.53937 Table ........\kern -0.00021 ........\kern 0.00021 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 foo +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 foo ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil @@ -640,46 +641,49 @@ Completed box being shipped out [1] .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 +...\glue -12.045 ...\penalty 0 -...\glue 6.02249 -...\vbox(23.58809+0.0)x417.11752 +...\glue 12.045 +...\penalty 0 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(23.58809+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline \ETC.} .....\special{color push Black} .....\glue 0.0 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 168.35107fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 166.19577fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 -........\TU/FandolSong(0)/b/n/10.53937 表 +........\TU/FandolHei(0)/b/n/10.53937 表 ........\kern -0.00017 ........\kern 0.00017 ........\penalty 10000 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 1.2 +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 1.2 ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 -........\TU/texgyretermes(0)/b/n/10.53937 Table +........\TU/texgyreheros(0)/b/n/10.53937 Table ........\kern -0.00021 ........\kern 0.00021 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 bar +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 bar ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil @@ -692,46 +696,49 @@ Completed box being shipped out [1] .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 +...\glue -12.045 +...\penalty 0 +...\glue 12.045 ...\penalty 0 -...\glue 6.02249 -...\vbox(23.58809+0.0)x417.11752 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(23.58809+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline \ETC.} .....\special{color push Black} .....\glue 0.0 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 169.3892fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 166.25374fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 -........\TU/FandolSong(0)/b/n/10.53937 表 +........\TU/FandolHei(0)/b/n/10.53937 表 ........\kern -0.00017 ........\kern 0.00017 ........\penalty 10000 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 1.3 +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 1.3 ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 -........\TU/texgyretermes(0)/b/n/10.53937 Table +........\TU/texgyreheros(0)/b/n/10.53937 Table ........\kern -0.00021 ........\kern 0.00021 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 foo +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 foo ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil @@ -744,9 +751,8 @@ Completed box being shipped out [1] .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 ...\write1{\protect \FN@pp@footnotehinttrue } ...\glue 0.0 plus 1.0fil ...\glue 0.0 @@ -850,7 +856,7 @@ Completed box being shipped out [2] ....\special{color pop} ..\glue 8.2511 ..\glue(\lineskip) 0.0 -..\vbox(700.50723+0.0)x417.11752, glue set 536.24869fil +..\vbox(700.50723+0.0)x417.11752, glue set 511.7096fil ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} ...\mark{{第2章\hskip 1em\relax \protect \ustc@spacetitle {Bar}}{}} @@ -881,42 +887,43 @@ Completed box being shipped out [2] ...\penalty 10000 ...\glue 18.06749 ...\penalty 10000 -...\glue 6.02249 -...\vbox(23.58809+0.0)x417.11752 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(23.58809+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline \ETC.} .....\special{color push Black} .....\glue 0.0 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 169.3892fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 166.25374fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 -........\TU/FandolSong(0)/b/n/10.53937 表 +........\TU/FandolHei(0)/b/n/10.53937 表 ........\kern -0.00017 ........\kern 0.00017 ........\penalty 10000 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 2.1 +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 2.1 ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 -........\TU/texgyretermes(0)/b/n/10.53937 Table +........\TU/texgyreheros(0)/b/n/10.53937 Table ........\kern -0.00021 ........\kern 0.00021 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 foo +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 foo ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil @@ -929,46 +936,49 @@ Completed box being shipped out [2] .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 +...\glue -12.045 ...\penalty 0 -...\glue 6.02249 -...\vbox(23.58809+0.0)x417.11752 +...\glue 12.045 +...\penalty 0 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(23.58809+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline \ETC.} .....\special{color push Black} .....\glue 0.0 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 168.35107fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 166.19577fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 -........\TU/FandolSong(0)/b/n/10.53937 表 +........\TU/FandolHei(0)/b/n/10.53937 表 ........\kern -0.00017 ........\kern 0.00017 ........\penalty 10000 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 2.2 +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 2.2 ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 -........\TU/texgyretermes(0)/b/n/10.53937 Table +........\TU/texgyreheros(0)/b/n/10.53937 Table ........\kern -0.00021 ........\kern 0.00021 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 bar +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 bar ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil @@ -981,46 +991,49 @@ Completed box being shipped out [2] .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 +...\glue -12.045 +...\penalty 0 +...\glue 12.045 ...\penalty 0 -...\glue 6.02249 -...\vbox(23.58809+0.0)x417.11752 +...\glue 12.045 +...\glue 0.0 +...\vbox(19.72365+0.0)x417.11752 ....\special{color push Black} -....\vbox(23.58809+0.0)x417.11752 +....\vbox(19.72365+0.0)x417.11752 .....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline \ETC.} .....\special{color push Black} .....\glue 0.0 .....\glue(\parskip) 0.0 -.....\hbox(12.29587+5.26973)x417.11752 +.....\hbox(9.59077+4.11038)x417.11752 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(12.29587+5.26973)x417.11752 -.......\hbox(12.29587+5.26973)x417.11752, glue set 169.3892fil +......\vbox(9.59077+4.11038)x417.11752 +.......\hbox(9.59077+4.11038)x417.11752, glue set 166.25374fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 -........\TU/FandolSong(0)/b/n/10.53937 表 +........\TU/FandolHei(0)/b/n/10.53937 表 ........\kern -0.00017 ........\kern 0.00017 ........\penalty 10000 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 2.3 +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 2.3 ........\kern -0.0002 ........\kern 0.0002 ........\glue 10.53937 -........\rule(12.29587+*)x0.0 +........\rule(9.59077+*)x0.0 ........\penalty 10000 ........\glue 0.0 -........\TU/texgyretermes(0)/b/n/10.53937 Table +........\TU/texgyreheros(0)/b/n/10.53937 Table ........\kern -0.00021 ........\kern 0.00021 -........\glue 2.63484 plus 1.31741 minus 0.87828 -........\TU/texgyretermes(0)/b/n/10.53937 foo +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/b/n/10.53937 foo ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+5.26973)x0.0 +........\rule(0.0+4.11038)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil @@ -1033,9 +1046,8 @@ Completed box being shipped out [2] .....\glue 0.0 ....\special{color pop} ...\penalty 0 -...\glue 6.02249 -...\glue 0.0 ...\penalty 10000 +...\glue 12.045 ...\write1{\protect \FN@pp@footnotehinttrue } ...\glue 0.0 plus 1.0fil ...\glue 0.0 diff --git a/ustcthesis.cls b/ustcthesis.cls index 613e335..7b807a5 100644 --- a/ustcthesis.cls +++ b/ustcthesis.cls @@ -611,66 +611,20 @@ \belowdisplayshortskip 6.5bp \@plus3.5bp \@minus3bp% \belowdisplayskip \abovedisplayskip \let\@listi\@listI}% - \normalsize - \ifx\MakeRobust\@undefined \else - \MakeRobust\normalsize - \fi % % 注意第~\ref{sec:list} 节去掉了列表的间距，所以不再修改 \cs{@listi}。 - \DeclareRobustCommand\small{% - \@setfontsize\small{10.5bp}{17.5bp}% - \abovedisplayskip 10.5bp \@plus3bp \@minus6bp% - \abovedisplayshortskip \z@ \@plus3bp% - \belowdisplayshortskip 6.5bp \@plus3.5bp \@minus3bp% - \belowdisplayskip \abovedisplayskip - }% - \DeclareRobustCommand\footnotesize{% - \@setfontsize\footnotesize{9bp}{15bp}% - \abovedisplayskip 9bp \@plus2bp \@minus5bp% - \abovedisplayshortskip \z@ \@plus3bp% - \belowdisplayshortskip 6bp \@plus3bp \@minus3bp% - \belowdisplayskip \abovedisplayskip - }% - \DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize{7.5bp}{12.5bp}}% - \DeclareRobustCommand\tiny{\@setfontsize\tiny{6.5bp}{10.83bp}}% - \DeclareRobustCommand\large{\@setfontsize\large{15bp}{25bp}}% - \DeclareRobustCommand\Large{\@setfontsize\Large{18bp}{30bp}}% - \DeclareRobustCommand\LARGE{\@setfontsize\LARGE{22bp}{36.67bp}}% - \DeclareRobustCommand\huge{\@setfontsize\huge{24bp}{40bp}}% - \DeclareRobustCommand\Huge{\@setfontsize\Huge{26bp}{43.33bp}}% \else - \DeclareRobustCommand\normalsize{% + \renewcommand\normalsize{% \@setfontsize\normalsize{12bp}{22bp}% \abovedisplayskip 12bp \@plus3bp \@minus7bp% \abovedisplayshortskip \z@ \@plus3bp% \belowdisplayshortskip 6.5bp \@plus3.5bp \@minus3bp% \belowdisplayskip \abovedisplayskip \let\@listi\@listI}% - \normalsize - \ifx\MakeRobust\@undefined \else - \MakeRobust\normalsize - \fi - \DeclareRobustCommand\small{% - \@setfontsize\small{10.5bp}{19.25bp}% - \abovedisplayskip 10.5bp \@plus3bp \@minus6bp% - \abovedisplayshortskip \z@ \@plus3bp% - \belowdisplayshortskip 6.5bp \@plus3.5bp \@minus3bp% - \belowdisplayskip \abovedisplayskip - }% - \DeclareRobustCommand\footnotesize{% - \@setfontsize\footnotesize{9bp}{16.5bp}% - \abovedisplayskip 9bp \@plus2bp \@minus5bp% - \abovedisplayshortskip \z@ \@plus3bp% - \belowdisplayshortskip 6bp \@plus3bp \@minus3bp% - \belowdisplayskip \abovedisplayskip - }% - \DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize{7.5bp}{13.75bp}}% - \DeclareRobustCommand\tiny{\@setfontsize\tiny{6.5bp}{11.92bp}}% - \DeclareRobustCommand\large{\@setfontsize\large{15bp}{27.5bp}}% - \DeclareRobustCommand\Large{\@setfontsize\Large{18bp}{33bp}}% - \DeclareRobustCommand\LARGE{\@setfontsize\LARGE{22bp}{40.33bp}}% - \DeclareRobustCommand\huge{\@setfontsize\huge{24bp}{44bp}}% - \DeclareRobustCommand\Huge{\@setfontsize\Huge{26bp}{47.67bp}}% + \fi + \normalsize + \ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize \fi } \ustc@set@font@size @@ -2470,8 +2424,8 @@ \setcounter{dbltopnumber}{9} % 修改默认的浮动体描述符为 |htb|。 -\def\fps@figure{htb} -\def\fps@table{htb} +\def\fps@figure{h} +\def\fps@table{h} % 用 \pkg{caption} 宏包设置图、表的格式： @@ -2479,44 +2433,98 @@ % 图号与图题文字之间空一字，图号、图题加粗。 % 图注位于图的下方，左缩进两字，续行悬挂缩进左对齐，两端对齐。 -% 表号、表题置于表的上方，宋体 10.5 磅居中，单倍行距，段前 6 磅，段后 6 磅， +% 表号、表题置于表的上方，黑体 10.5 磅居中，单倍行距，段前 6 磅，段后 6 磅， % 表号与表题文字之间空一字，表号、表题加粗。 % 表注左缩进两字，续行悬挂缩进左对齐，两端对齐。 \setlength{\floatsep}{6bp} \setlength{\textfloatsep}{6bp} -\setlength{\intextsep}{6bp} -\DeclareCaptionLabelSeparator{zhspace}{\hspace{\ccwd}} +\setlength{\intextsep}{12bp} + +% 由于 LaTeX2e kernel 的问题，图表等浮动体与文字前后的距离不一致，需要进行 patch。 +% 参考 \href{https://github.com/tuna/thuthesis/issues/614}{tuna/thuthesis/issues\#614}、 +% \url{https://www.zhihu.com/question/46618031} 和 +% \url{https://tex.stackexchange.com/a/40363/82731}。 +% \begin{macrocode} +\patchcmd{\@addtocurcol}% + {\vskip \intextsep}% + {\edef\save@first@penalty{\the\lastpenalty}\unpenalty + \ifnum \lastpenalty = \@M % hopefully the OR penalty + \unpenalty + \else + \penalty \save@first@penalty \relax % put it back + \fi + \ifnum\outputpenalty <-\@Mii + \addvspace\intextsep + \vskip\parskip + \else + \addvspace\intextsep + \fi}% + {}{\ustc@patch@error{\@addtocurcol}} +\patchcmd{\@addtocurcol}% + {\vskip\intextsep \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi}% + {\ifnum\outputpenalty <-\@Mii + \aftergroup\vskip\aftergroup\intextsep + \aftergroup\nointerlineskip + \else + \vskip\intextsep + \fi}% + {}{\ustc@patch@error{\@addtocurcol}} +\patchcmd{\@getpen}{\@M}{\@Mi} + {}{\ustc@patch@error{\@getpen}} + +\DeclareCaptionFont{ustc}{% + \ifustc@language@chinese + \fontsize{10.5bp}{13.65bp}\selectfont + \else + \fontsize{10.5bp}{12.075bp}\selectfont + \fi +} + \captionsetup{ - format = hang, - font = small, - labelsep = zhspace, + font = ustc, + labelsep = quad, skip = 6bp, figureposition = bottom, tableposition = top, } \ifustc@degree@graduate \captionsetup{font+=bf} + \captionsetup[table]{font+=sf} \fi -\captionsetup[figure]{ - belowskip = 6bp, -} % 新定义了 \cs{note} 来生成图表的附注。 % 如果用 \cs{caption} 生成图表的附注会导致图表的序号有误； % 如果用 \cs{bicaption} 会导致表注无法置于表后，而且对齐方式不对。 \newcommand\note[1]{% \begingroup - \captionsetup{ - format = plain, - font = small, - justification = justified, - margin = 2\ccwd, - position = bottom, - }% - \caption*{#1}% + \captionsetup{ + font = ustc, + margin = 2\ccwd, + position = bottom, + }% + \caption*{#1}% \endgroup } +% 表格默认字号略小 +\patchcmd\@floatboxreset{% + \normalsize +}{% + \small +}{}{\ustc@patch@error{\@floatboxreset}} + +% 对 \pkg{longtable} 跨页表格进行相同的设置。 +% +% 在 Word 模板中按照正确的设置（需要去掉文档网格）， +% 中文模板每页能装下 1 行标题、1 行表头、30 行表身， +% 英文模板每页能装下 1 行标题、1 行表头、33 行表身。 +% \begin{macrocode} +\AtEndOfPackageFile*{longtable}{ + \AtBeginEnvironment{longtable}{% + \small + } +} + % \subsection{参考文献}