Skip to content

Commit c9b2467

Browse files
zepingleezepinglee
committed
Shorter figure notes are centered (#414)
1 parent 7cca9a0 commit c9b2467

File tree

10 files changed

+606
-85
lines changed

10 files changed

+606
-85
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
- 调整页眉距边界 2.0 cm（研究生院 2024-12-05 Word 模板修改，[#411](https://github.com/ustctug/ustcthesis/issues/411#issuecomment-2652543582)）。
1313
- 空白页添加页码（研究生院 2024-12-05 Word 模板修改，[#390](https://github.com/ustctug/ustcthesis/issues/390#issuecomment-2652974038)）。
1414
- 修改符号说明的页脚样式（研究生院 2024-12-05 Word 模板修改，[#411](https://github.com/ustctug/ustcthesis/issues/411#issuecomment-2656237617)）。
15+
- 图注较短时居中（[#414](https://github.com/ustctug/ustcthesis/issues/414)）。
1516

1617
## [4.0.0-beta.5] - 2025-02-10
1718

‎chapters/floats.tex‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ \section{插图}
6363
\includegraphics[width=0.3\textwidth]{ustc-badge.pdf}
6464
\caption{图号、图题置于图的下方}
6565
\label{fig:badge}
66-
\figurenote{注：图注的内容不宜放到图题中。}
66+
\figurenote{若有图注，图注置于图题下方。
67+
多个图注则须顺序编号，注序左缩进2字，与注文之间空一字符，续行悬挂缩进左对齐，两端对齐。
68+
注文的字数较少且是短语时，末尾不可加标点，多个图注可以在同一行通过自由选取字符空格将各个图注间隔开来；
69+
注文的字数较多或者甚至需要用句子说明时，该图注可以独立成行。
70+
}
6771
\end{figure}
6872

6973
关于图片的并排，推荐使用较新的 \pkg{subcaption} 宏包，

‎test/support/chapters-bachelor.tex‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ \chapter{插图和表格}
4040
\includegraphics[width=0.3\textwidth]{figures/ustc-badge.pdf}
4141
\caption{图题置于图的下方}
4242
\label{fig:badge}
43-
\figurenote{若有图注，图注置于图题下方。注文的字数较少且是短语时，末尾不可加标点，多个图注可以在同一行通过自由选取字符空格将各个图注间隔开来；注文的字数较多或者甚至需要用句子说明时，该图注可以独立成行。}
43+
\figurenote{若有图注，图注置于图题下方。
44+
多个图注则须顺序编号，注序左缩进2字，与注文之间空一字符，续行悬挂缩进左对齐，两端对齐。
45+
注文的字数较少且是短语时，末尾不可加标点，多个图注可以在同一行通过自由选取字符空格将各个图注间隔开来；
46+
注文的字数较多或者甚至需要用句子说明时，该图注可以独立成行。
47+
}
4448
\end{figure}
4549

4650
不宜将多个插图连续排版，插图与文字论述段落应穿插排版，插图前后与文字段落之间须留有10磅空行。

‎test/support/chapters.tex‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ \chapter{插图和表格}
4848
\includegraphics[width=0.3\textwidth]{figures/ustc-badge.pdf}
4949
\caption{图题置于图的下方}
5050
\label{fig:badge}
51-
\figurenote{若有图注，图注置于图题下方。注文的字数较少且是短语时，末尾不可加标点，多个图注可以在同一行通过自由选取字符空格将各个图注间隔开来；注文的字数较多或者甚至需要用句子说明时，该图注可以独立成行。}
51+
\figurenote{若有图注，图注置于图题下方。
52+
多个图注则须顺序编号，注序左缩进2字，与注文之间空一字符，续行悬挂缩进左对齐，两端对齐。
53+
注文的字数较少且是短语时，末尾不可加标点，多个图注可以在同一行通过自由选取字符空格将各个图注间隔开来；
54+
注文的字数较多或者甚至需要用句子说明时，该图注可以独立成行。
55+
}
5256
\end{figure}
5357

5458
不宜将多个插图连续排版，插图与文字论述段落应穿插排版，插图前后与文字段落之间须留有10磅空行。

‎test/testfiles-crossref/main-bachelor-arabic.tlg‎

Lines changed: 116 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ Completed box being shipped out [3]
14281428
....\special{color pop}
14291429
..\glue 1.0
14301430
..\glue(\lineskip) 0.0
1431-
..\vbox(700.50723+0.0)x417.11752, glue set 133.87115fil
1431+
..\vbox(700.50723+0.0)x417.11752, glue set 120.15038fil
14321432
...\write-{}
14331433
...\write1{\@writefile{toc}{\protect \addvspace {12bp}}}
14341434
...\write1{\pp@pagectr{footnote}{2}{\theabspage }{\thepage }}
@@ -1712,9 +1712,9 @@ Completed box being shipped out [3]
17121712
...\penalty 0
17131713
...\glue 10.03749
17141714
...\glue 0.0
1715-
...\vbox(190.30031+0.0)x417.11752
1715+
...\vbox(204.02255+0.0)x417.11752
17161716
....\special{color push Black}
1717-
....\vbox(190.30031+0.0)x417.11752
1717+
....\vbox(204.02255+0.0)x417.11752
17181718
.....\hbox(125.13368+0.0)x417.11752, glue set 145.99051fil
17191719
......\glue(\leftskip) 0.0 plus 1.0fil
17201720
......\hbox(0.0+0.0)x0.0
@@ -1791,12 +1791,12 @@ Completed box being shipped out [3]
17911791
.....\glue(\parskip) 6.02249
17921792
.....\glue(\parskip) 0.0
17931793
.....\glue(\lineskip) 1.0
1794-
.....\hbox(21.46896+16.19872)x417.11752
1794+
.....\hbox(28.33008+23.05984)x417.11752
17951795
......\glue(\leftskip) 0.0 plus 1.0fil
17961796
......\hbox(0.0+0.0)x0.0
17971797
......\mathon
1798-
......\vbox(21.46896+16.19872)x417.11752
1799-
.......\hbox(8.23125+2.03409)x417.11752, glue set - 0.21146
1798+
......\vbox(28.33008+23.05984)x417.11752
1799+
.......\hbox(8.25232+2.03409)x417.11752, glue set - 0.19519
18001800
........\hbox(0.0+0.0)x0.0
18011801
........\TU/FandolSong(0)/m/n/10.53937 若
18021802
........\glue 0.0 plus 0.44923
@@ -1830,6 +1830,107 @@ Completed box being shipped out [3]
18301830
........\rule(0.0+0.0)x-6.78735
18311831
........\glue 6.78735 minus 5.26968
18321832
........\glue 0.0 plus 0.44923
1833+
........\TU/FandolSong(0)/m/n/10.53937 多
1834+
........\glue 0.0 plus 0.44923
1835+
........\TU/FandolSong(0)/m/n/10.53937 个
1836+
........\glue 0.0 plus 0.44923
1837+
........\TU/FandolSong(0)/m/n/10.53937 图
1838+
........\glue 0.0 plus 0.44923
1839+
........\TU/FandolSong(0)/m/n/10.53937 注
1840+
........\glue 0.0 plus 0.44923
1841+
........\TU/FandolSong(0)/m/n/10.53937 则
1842+
........\glue 0.0 plus 0.44923
1843+
........\TU/FandolSong(0)/m/n/10.53937 须
1844+
........\glue 0.0 plus 0.44923
1845+
........\TU/FandolSong(0)/m/n/10.53937 顺
1846+
........\glue 0.0 plus 0.44923
1847+
........\TU/FandolSong(0)/m/n/10.53937 序
1848+
........\glue 0.0 plus 0.44923
1849+
........\TU/FandolSong(0)/m/n/10.53937 编
1850+
........\glue 0.0 plus 0.44923
1851+
........\TU/FandolSong(0)/m/n/10.53937 号
1852+
........\penalty 10000
1853+
........\TU/FandolSong(0)/m/n/10.53937 ，
1854+
........\rule(0.0+0.0)x-7.29324
1855+
........\glue 7.29324 minus 5.26968
1856+
........\glue 0.0 plus 0.44923
1857+
........\TU/FandolSong(0)/m/n/10.53937 注
1858+
........\glue 0.0 plus 0.44923
1859+
........\TU/FandolSong(0)/m/n/10.53937 序
1860+
........\glue 0.0 plus 0.44923
1861+
........\TU/FandolSong(0)/m/n/10.53937 左
1862+
........\glue 0.0 plus 0.44923
1863+
........\TU/FandolSong(0)/m/n/10.53937 缩
1864+
........\glue 0.0 plus 0.44923
1865+
........\TU/FandolSong(0)/m/n/10.53937 进
1866+
........\glue 2.63484 plus 1.31741 minus 0.87828
1867+
........\TU/texgyretermes(0)/m/n/10.53937 2
1868+
........\glue 2.63484 plus 1.31741 minus 0.87828
1869+
........\TU/FandolSong(0)/m/n/10.53937 字
1870+
........\penalty 10000
1871+
........\TU/FandolSong(0)/m/n/10.53937 ，
1872+
........\rule(0.0+0.0)x-7.29324
1873+
........\glue 7.29324 minus 5.26968
1874+
........\glue 0.0 plus 0.44923
1875+
........\TU/FandolSong(0)/m/n/10.53937 与
1876+
........\glue 0.0 plus 0.44923
1877+
........\TU/FandolSong(0)/m/n/10.53937 注
1878+
........\glue 0.0 plus 0.44923
1879+
........\TU/FandolSong(0)/m/n/10.53937 文
1880+
........\glue 0.0 plus 0.44923
1881+
........\TU/FandolSong(0)/m/n/10.53937 之
1882+
........\glue 0.0 plus 0.44923
1883+
........\TU/FandolSong(0)/m/n/10.53937 间
1884+
........\glue 0.0 plus 0.44923
1885+
........\TU/FandolSong(0)/m/n/10.53937 空
1886+
........\glue 0.0 plus 0.44923
1887+
........\TU/FandolSong(0)/m/n/10.53937 一
1888+
........\glue(\rightskip) 0.0
1889+
.......\penalty 10000
1890+
.......\glue(\baselineskip) 3.43584
1891+
.......\hbox(8.23125+2.03409)x417.11752, glue set - 0.16916
1892+
........\TU/FandolSong(0)/m/n/10.53937 字
1893+
........\glue 0.0 plus 0.44923
1894+
........\TU/FandolSong(0)/m/n/10.53937 符
1895+
........\penalty 10000
1896+
........\TU/FandolSong(0)/m/n/10.53937 ，
1897+
........\rule(0.0+0.0)x-7.29324
1898+
........\glue 7.29324 minus 5.26968
1899+
........\glue 0.0 plus 0.44923
1900+
........\TU/FandolSong(0)/m/n/10.53937 续
1901+
........\glue 0.0 plus 0.44923
1902+
........\TU/FandolSong(0)/m/n/10.53937 行
1903+
........\glue 0.0 plus 0.44923
1904+
........\TU/FandolSong(0)/m/n/10.53937 悬
1905+
........\glue 0.0 plus 0.44923
1906+
........\TU/FandolSong(0)/m/n/10.53937 挂
1907+
........\glue 0.0 plus 0.44923
1908+
........\TU/FandolSong(0)/m/n/10.53937 缩
1909+
........\glue 0.0 plus 0.44923
1910+
........\TU/FandolSong(0)/m/n/10.53937 进
1911+
........\glue 0.0 plus 0.44923
1912+
........\TU/FandolSong(0)/m/n/10.53937 左
1913+
........\glue 0.0 plus 0.44923
1914+
........\TU/FandolSong(0)/m/n/10.53937 对
1915+
........\glue 0.0 plus 0.44923
1916+
........\TU/FandolSong(0)/m/n/10.53937 齐
1917+
........\penalty 10000
1918+
........\TU/FandolSong(0)/m/n/10.53937 ，
1919+
........\rule(0.0+0.0)x-7.29324
1920+
........\glue 7.29324 minus 5.26968
1921+
........\glue 0.0 plus 0.44923
1922+
........\TU/FandolSong(0)/m/n/10.53937 两
1923+
........\glue 0.0 plus 0.44923
1924+
........\TU/FandolSong(0)/m/n/10.53937 端
1925+
........\glue 0.0 plus 0.44923
1926+
........\TU/FandolSong(0)/m/n/10.53937 对
1927+
........\glue 0.0 plus 0.44923
1928+
........\TU/FandolSong(0)/m/n/10.53937 齐
1929+
........\penalty 10000
1930+
........\TU/FandolSong(0)/m/n/10.53937 。
1931+
........\rule(0.0+0.0)x-6.78735
1932+
........\glue 6.78735 minus 5.26968
1933+
........\glue 0.0 plus 0.44923
18331934
........\TU/FandolSong(0)/m/n/10.53937 注
18341935
........\glue 0.0 plus 0.44923
18351936
........\TU/FandolSong(0)/m/n/10.53937 文
@@ -1877,18 +1978,17 @@ Completed box being shipped out [3]
18771978
........\glue 7.29324 minus 5.26968
18781979
........\glue 0.0 plus 0.44923
18791980
........\TU/FandolSong(0)/m/n/10.53937 多
1880-
........\glue 0.0 plus 0.44923
1981+
........\glue(\rightskip) 0.0
1982+
.......\glue(\baselineskip) 3.43584
1983+
.......\hbox(8.23125+1.98138)x417.11752, glue set 0.36592
18811984
........\TU/FandolSong(0)/m/n/10.53937 个
18821985
........\glue 0.0 plus 0.44923
18831986
........\TU/FandolSong(0)/m/n/10.53937 图
18841987
........\glue 0.0 plus 0.44923
18851988
........\TU/FandolSong(0)/m/n/10.53937 注
18861989
........\glue 0.0 plus 0.44923
18871990
........\TU/FandolSong(0)/m/n/10.53937 可
1888-
........\glue(\rightskip) 0.0
1889-
.......\penalty 10000
1890-
.......\glue(\baselineskip) 3.43584
1891-
.......\hbox(8.23125+1.98138)x417.11752, glue set 0.36592
1991+
........\glue 0.0 plus 0.44923
18921992
........\TU/FandolSong(0)/m/n/10.53937 以
18931993
........\glue 0.0 plus 0.44923
18941994
........\TU/FandolSong(0)/m/n/10.53937 在
@@ -1960,18 +2060,18 @@ Completed box being shipped out [3]
19602060
........\TU/FandolSong(0)/m/n/10.53937 者
19612061
........\glue 0.0 plus 0.44923
19622062
........\TU/FandolSong(0)/m/n/10.53937 甚
1963-
........\glue 0.0 plus 0.44923
2063+
........\glue(\rightskip) 0.0
2064+
.......\penalty 150
2065+
.......\glue(\baselineskip) 3.52016
2066+
.......\hbox(8.19963+2.03409)x417.11752, glue set 213.11752fil
19642067
........\TU/FandolSong(0)/m/n/10.53937 至
19652068
........\glue 0.0 plus 0.44923
19662069
........\TU/FandolSong(0)/m/n/10.53937 需
19672070
........\glue 0.0 plus 0.44923
19682071
........\TU/FandolSong(0)/m/n/10.53937 要
19692072
........\glue 0.0 plus 0.44923
19702073
........\TU/FandolSong(0)/m/n/10.53937 用
1971-
........\glue(\rightskip) 0.0
1972-
.......\penalty 150
1973-
.......\glue(\baselineskip) 3.52016
1974-
.......\hbox(8.19963+2.03409)x417.11752, glue set 255.275fil
2074+
........\glue 0.0 plus 0.44923
19752075
........\TU/FandolSong(0)/m/n/10.53937 句
19762076
........\glue 0.0 plus 0.44923
19772077
........\TU/FandolSong(0)/m/n/10.53937 子

0 commit comments

Comments
 (0)