Skip to content

Commit 5abd93b

Browse files
zepingleezepinglee
committed
Update the title page of professional degrees
1 parent c597fe8 commit 5abd93b

File tree

6 files changed

+145
-52
lines changed

6 files changed

+145
-52
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515

1616
- 章标题取消加粗（研究生院 2024-12-05 Word 模板修改，[#411](https://github.com/ustctug/ustcthesis/issues/411)）。
1717
- 调整科研成果示例（研究生院 2024-12-05 Word 模板修改，[#411](https://github.com/ustctug/ustcthesis/issues/411)）。
18+
- 更新专业硕士论文封面：“专业领域”改为“学科专业”，“Advisor”改为“Practice supervisor”（研究生院 2024-12-05 Word 模板修改，[#390](https://github.com/ustctug/ustcthesis/issues/390#issuecomment-2558042581)）。
1819

1920
## [4.0.0-beta.3] - 2024-12-15
2021

‎test/testfiles/titlepage-master.tex‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
\input{info.tex}
55

6+
\ustcsetup{
7+
practice-supervisor = {XXX~教授, XXX~教授},
8+
practice-supervisor* = {Prof.~XXX, Prof.~XXX},
9+
}
10+
11+
612
\begin{document}
713
\START
814
\showoutput

‎test/testfiles/titlepage-master.tlg‎

Lines changed: 93 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Completed box being shipped out [1]
7272
....\special{color pop}
7373
..\glue 8.2511
7474
..\glue(\lineskip) 0.0
75-
..\vbox(700.50723+0.0)x452.96826, glue set 57.81714fil
75+
..\vbox(700.50723+0.0)x452.96826, glue set 26.70424fil
7676
...\write-{}
7777
...\write-{}
7878
...\write-{}
@@ -261,12 +261,12 @@ Completed box being shipped out [1]
261261
...\glue(\parskip) 0.0
262262
...\glue(\parskip) 0.0
263263
...\glue(\lineskip) 1.0
264-
...\hbox(66.24788+58.21703)x452.96826, glue set 97.34569fil
264+
...\hbox(81.806+73.77513)x452.96826, glue set 97.34569fil
265265
....\glue(\leftskip) 0.0 plus 1.0fil
266266
....\hbox(0.0+0.0)x0.0
267-
....\hbox(66.24788+58.21703)x258.2769
267+
....\hbox(81.806+73.77513)x258.2769
268268
.....\mathon
269-
.....\vbox(66.24788+58.21703)x258.2769
269+
.....\vbox(81.806+73.77513)x258.2769
270270
......\hbox(21.78127+9.33496)x258.2769
271271
.......\glue(\tabskip) 0.0
272272
.......\hbox(21.78127+9.33496)x96.36
@@ -307,13 +307,13 @@ Completed box being shipped out [1]
307307
.......\hbox(21.78127+9.33496)x96.36
308308
........\rule(21.78127+9.33496)x0.0
309309
........\glue 0.00002
310-
........\TU/FandolHei(0)/m/n/16.06 专
310+
........\TU/FandolHei(0)/m/n/16.06 学
311311
........\glue 0.0 plus 0.74417
312-
........\TU/FandolHei(0)/m/n/16.06 业
312+
........\TU/FandolHei(0)/m/n/16.06 科
313313
........\glue 0.0 plus 0.74417
314-
........\TU/FandolHei(0)/m/n/16.06 领
314+
........\TU/FandolHei(0)/m/n/16.06 专
315315
........\glue 0.0 plus 0.74417
316-
........\TU/FandolHei(0)/m/n/16.06 域
316+
........\TU/FandolHei(0)/m/n/16.06 业
317317
........\penalty 10000
318318
........\TU/FandolHei(0)/m/n/16.06 ：
319319
........\rule(0.0+0.0)x-11.37048
@@ -350,10 +350,62 @@ Completed box being shipped out [1]
350350
.......\hbox(21.78127+9.33496)x96.36
351351
........\rule(21.78127+9.33496)x0.0
352352
........\glue 0.00002
353+
........\TU/FandolHei(0)/m/n/16.06 校
354+
........\glue 0.0 plus 0.74417
355+
........\TU/FandolHei(0)/m/n/16.06 内
356+
........\glue 0.0 plus 0.74417
353357
........\TU/FandolHei(0)/m/n/16.06 导
358+
........\glue 0.0 plus 0.74417
359+
........\TU/FandolHei(0)/m/n/16.06 师
360+
........\penalty 10000
361+
........\TU/FandolHei(0)/m/n/16.06 ：
362+
........\rule(0.0+0.0)x-11.37048
363+
........\kern 0.00069
364+
........\kern -0.00069
365+
........\kern -0.99649
366+
........\kern 0.99649
367+
........\glue 11.37048 minus 8.03
368+
........\glue 0.0 plus 1.0fil
369+
........\glue 16.06
370+
.......\glue(\tabskip) 0.0
371+
.......\hbox(21.78127+9.33496)x161.9169
372+
........\glue 0.00002
373+
........\TU/texgyretermes(0)/m/n/16.06 XXX
374+
........\kern -0.0002
375+
........\kern 0.0002
376+
........\penalty 10000
377+
........\glue 4.015 plus 2.00749 minus 1.33833
378+
........\TU/FandolSong(0)/m/n/16.06 教
379+
........\glue 0.0 plus 0.74417
380+
........\TU/FandolSong(0)/m/n/16.06 授
354381
........\kern -0.00017
355382
........\kern 0.00017
356-
........\glue 32.12
383+
........\glue 16.06
384+
........\glue 4.015 plus 2.00749 minus 1.33833
385+
........\TU/texgyretermes(0)/m/n/16.06 XXX
386+
........\kern -0.0002
387+
........\kern 0.0002
388+
........\penalty 10000
389+
........\glue 4.015 plus 2.00749 minus 1.33833
390+
........\TU/FandolSong(0)/m/n/16.06 教
391+
........\glue 0.0 plus 0.74417
392+
........\TU/FandolSong(0)/m/n/16.06 授
393+
........\kern -0.00018
394+
........\kern 0.00018
395+
........\glue 0.0 plus 1.0fil
396+
.......\glue(\tabskip) 0.0
397+
......\glue(\lineskip) 0.0
398+
......\hbox(21.78127+9.33496)x258.2769
399+
.......\glue(\tabskip) 0.0
400+
.......\hbox(21.78127+9.33496)x96.36
401+
........\rule(21.78127+9.33496)x0.0
402+
........\glue 0.00002
403+
........\TU/FandolHei(0)/m/n/16.06 企
404+
........\glue 0.0 plus 0.74417
405+
........\TU/FandolHei(0)/m/n/16.06 业
406+
........\glue 0.0 plus 0.74417
407+
........\TU/FandolHei(0)/m/n/16.06 导
408+
........\glue 0.0 plus 0.74417
357409
........\TU/FandolHei(0)/m/n/16.06 师
358410
........\penalty 10000
359411
........\TU/FandolHei(0)/m/n/16.06 ：
@@ -490,7 +542,7 @@ Completed box being shipped out [3]
490542
....\special{color pop}
491543
..\glue 8.2511
492544
..\glue(\lineskip) 0.0
493-
..\vbox(700.50723+0.0)x452.96826, glue set 81.73662fil
545+
..\vbox(700.50723+0.0)x452.96826, glue set 51.62737fil
494546
...\glue(\topskip) 12.0
495547
...\hbox(0.0+11.38092)x452.96826, glue set 226.48413fil
496548
....\glue(\leftskip) 0.0 plus 1.0fil
@@ -645,12 +697,12 @@ Completed box being shipped out [3]
645697
...\glue(\parskip) 0.0
646698
...\glue(\parskip) 0.0
647699
...\glue(\lineskip) 1.0
648-
...\hbox(64.24037+56.20952)x452.96826, glue set 63.19945fil
700+
...\hbox(79.29662+71.26575)x452.96826, glue set 63.19945fil
649701
....\glue(\leftskip) 0.0 plus 1.0fil
650702
....\hbox(0.0+0.0)x0.0
651-
....\hbox(64.24037+56.20952)x326.56937
703+
....\hbox(79.29662+71.26575)x326.56937
652704
.....\mathon
653-
.....\vbox(64.24037+56.20952)x326.56937
705+
.....\vbox(79.29662+71.26575)x326.56937
654706
......\hbox(21.07864+9.03383)x326.56937
655707
.......\glue(\tabskip) 0.0
656708
.......\hbox(21.07864+9.03383)x326.56937, glue set 207.94485fil
@@ -713,6 +765,34 @@ Completed box being shipped out [3]
713765
......\glue(\lineskip) 0.0
714766
......\hbox(21.07864+9.03383)x326.56937
715767
.......\glue(\tabskip) 0.0
768+
.......\hbox(21.07864+9.03383)x326.56937, glue set 40.79239fil
769+
........\rule(21.07864+9.03383)x0.0
770+
........\glue 0.00002
771+
........\TU/texgyretermes(0)/m/n/16.06 Practice
772+
........\glue 4.015 plus 2.00749 minus 1.33833
773+
........\TU/texgyretermes(0)/m/n/16.06 supervisor:
774+
........\glue 5.35333 plus 4.01498 minus 0.66916
775+
........\TU/texgyretermes(0)/m/n/16.06 Prof.
776+
........\kern -0.0002
777+
........\kern 0.0002
778+
........\penalty 10000
779+
........\glue 4.015 plus 2.00749 minus 1.33833
780+
........\TU/texgyretermes(0)/m/n/16.06 XXX,
781+
........\glue 4.015 plus 2.00749 minus 1.33833
782+
........\glue 4.015 plus 2.00749 minus 1.33833
783+
........\TU/texgyretermes(0)/m/n/16.06 Prof.
784+
........\kern -0.0002
785+
........\kern 0.0002
786+
........\penalty 10000
787+
........\glue 4.015 plus 2.00749 minus 1.33833
788+
........\TU/texgyretermes(0)/m/n/16.06 XXX
789+
........\kern -0.0002
790+
........\kern 0.0002
791+
........\glue 0.0 plus 1.0fil
792+
.......\glue(\tabskip) 0.0
793+
......\glue(\lineskip) 0.0
794+
......\hbox(21.07864+9.03383)x326.56937
795+
.......\glue(\tabskip) 0.0
716796
.......\hbox(21.07864+9.03383)x326.56937, glue set 128.97784fil
717797
........\rule(21.07864+9.03383)x0.0
718798
........\glue 0.00002

‎ustcsetup.tex‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
% !TeX root = ./main.tex
22

33
\ustcsetup{
4-
title = {中国科学技术大学\\学位论文模板示例文档 v\ustcthesisversion},
5-
title* = {An example of thesis template for University of Science
6-
and Technology of China v\ustcthesisversion},
7-
author = {李泽平},
8-
author* = {Li Zeping},
9-
speciality = {数学与应用数学},
10-
speciality* = {Mathematics and Applied Mathematics},
11-
supervisor = {XXX~教授, XXX~教授},
12-
supervisor* = {Prof. XXX, Prof. XXX},
13-
% date = {2017-05-01}, % 完成时间，默认为今日
14-
% professional-type = {专业学位类型},
15-
% professional-type* = {Professional degree type},
16-
% department = {数学科学学院}, % 院系，本科生需要填写
17-
% student-id = {PB11001000}, % 学号，本科生需要填写
18-
% secret-level = {秘密}, % 绝密|机密|秘密|控阅，注释本行则公开
19-
% secret-level* = {Secret}, % Top secret | Highly secret | Secret
20-
% secret-year = {10}, % 保密/控阅期限
21-
% reviewer = true, % 声明页显示“评审专家签名”
4+
title = {中国科学技术大学\\学位论文模板示例文档 v\ustcthesisversion},
5+
title* = {An example of thesis template for University of Science
6+
and Technology of China v\ustcthesisversion},
7+
author = {李泽平},
8+
author* = {Li Zeping},
9+
speciality = {数学与应用数学},
10+
speciality* = {Mathematics and Applied Mathematics},
11+
supervisor = {XXX~教授, XXX~教授},
12+
supervisor* = {Prof. XXX, Prof. XXX},
13+
% practice-supervisor = {XXX~教授, XXX~教授},
14+
% practice-supervisor* = {Prof. XXX, Prof. XXX},
15+
% date = {2017-05-01}, % 完成时间，默认为今日
16+
% professional-type = {专业学位类型},
17+
% professional-type* = {Professional degree type},
18+
% department = {数学科学学院}, % 院系，本科生需要填写
19+
% student-id = {PB11001000}, % 学号，本科生需要填写
20+
% secret-level = {秘密}, % 绝密|机密|秘密|控阅，注释本行则公开
21+
% secret-level* = {Secret}, % Top secret | Highly secret | Secret
22+
% secret-year = {10}, % 保密/控阅期限
23+
% reviewer = true, % 声明页显示“评审专家签名”
2224
%
2325
% 数学字体
24-
% math-style = GB, % 可选：GB, TeX, ISO
25-
math-font = xits, % 可选：stix, xits, libertinus
26+
% math-style = GB, % 可选：GB, TeX, ISO
27+
math-font = xits, % 可选：stix, xits, libertinus
2628
}
2729

2830

‎ustcthesis-doc.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ \subsection{封面与声明}
391391
\opt{author} & \opt{author*} & 作者姓名 \\
392392
\opt{speciality} & \opt{speciality*} & 学科专业 \\
393393
\opt{supervisor} & \opt{supervisor*} & 导师 \\
394+
\opt{supepractice-supervisorrvisor} & \opt{practice-supervisor*} & 导师 \\
394395
\opt{date} & - & 完成时间 \\
395396
\opt{secret-level} & \opt{secret-level*} & 密级 \\
396397
\opt{secret-year} & - & 保密/控阅年限 \\
@@ -403,7 +404,6 @@ \subsection{封面与声明}
403404
\item \cs{ustcsetup} 使用 \pkg{kvsetkeys} 机制，配置项之间不能有空行，否则会报错。
404405
\item 其中带 |*| 后缀的选项用于设置英文封面。
405406
\item 导师姓名 \opt{supervisor} 允许多个姓名，使用“,”（西文逗号 U+002C）隔开。
406-
\item 软件工程专业使用 \opt{advisor} 和 \opt{advisor*} 设置企业导师的姓名。
407407
\item 完成时间 \opt{date} 应使用 ISO 格式（yyyy-mm-dd），默认为当前日期。
408408
\end{itemize}
409409

‎ustcthesis.cls‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,12 +1673,19 @@
16731673
default = {Supervisor Name},
16741674
name = supervisor@en,
16751675
},
1676-
advisor = {
1676+
practice-supervisor = {
16771677
default = {},
1678+
name = practice@supervisor,
16781679
},
1679-
advisor* = {
1680+
practice-supervisor* = {
16801681
default = {},
1681-
name = advisor@en,
1682+
name = practice@supervisor@en,
1683+
},
1684+
advisor = {
1685+
name = practice@supervisor,
1686+
},
1687+
advisor* = {
1688+
name = practice@supervisor@en,
16821689
},
16831690
date = {
16841691
default = {\the\year-\two@digits{\month}-\two@digits{\day}},
@@ -1720,8 +1727,8 @@
17201727
\newcommand\ustc@supervisor@names{%
17211728
\ustc@clist@use{\ustc@supervisor}{\quad}
17221729
}
1723-
\newcommand\ustc@advisor@names{%
1724-
\ustc@clist@use{\ustc@advisor}{\quad}
1730+
\newcommand\ustc@practice@supervisor@names{%
1731+
\ustc@clist@use{\ustc@practice@supervisor}{\quad}
17251732
}
17261733
\newcounter{ustc@count}
17271734
\newcommand\ustc@supervisor@en@line{%
@@ -1733,14 +1740,14 @@
17331740
\fi
17341741
\space\ustc@clist@use{\ustc@supervisor@en}{, }%
17351742
}
1736-
\newcommand\ustc@advisor@en@line{%
1737-
\setcounter{ustc@count}{\ustc@clist@count{\ustc@advisor@en}}%
1743+
\newcommand\ustc@practice@supervisor@en@line{%
1744+
\setcounter{ustc@count}{\ustc@clist@count{\ustc@practice@supervisor@en}}%
17381745
\ifnum\c@ustc@count>1\relax
1739-
Advisor:%
1746+
Practice supervisor:%
17401747
\else
1741-
Advisor:%
1748+
Practice supervisor:%
17421749
\fi
1743-
\space\ustc@clist@use{\ustc@advisor@en}{, }%
1750+
\space\ustc@clist@use{\ustc@practice@supervisor@en}{, }%
17441751
}
17451752

17461753
% 输出日期的给定格式：\cs{ustc@format@date}\marg{format}\marg{date}，
@@ -1815,7 +1822,6 @@
18151822
\fi
18161823
\fi
18171824
\ifustc@degree@type@academic
1818-
\newcommand\ustc@speciality@name{学科专业}
18191825
\else
18201826
\ifustc@degree@doctor
18211827
\renewcommand\ustc@thesis@name{工程博士学位论文}
@@ -1833,7 +1839,6 @@
18331839
\providecommand\lishu{\sffamily}
18341840
\fi
18351841
\fi
1836-
\newcommand\ustc@speciality@name{专业领域}
18371842
\fi
18381843

18391844
% 定义校徽颜色
@@ -1866,7 +1871,6 @@
18661871
% 作者姓名宋体 16 磅，单倍行距；
18671872
% 注意这里的“单倍行距”的地方开启了“对齐到网格”，所以实际行距有所偏差，
18681873
% 所以只能使用直尺测量。
1869-
\newcommand\ustc@speciality@sse{软件工程}
18701874
\newcommand\ustc@title@page@graduate@zh{%
18711875
\ustcsetup{language=chinese}%
18721876
\begin{titlepage}%
@@ -1909,12 +1913,12 @@
19091913
{\fontsize{16bp}{31bp}\selectfont
19101914
\begin{tabular}{@{}l@{\quad}l@{}}%
19111915
\textsf{作者姓名：} & \ustc@author \\
1912-
\textsf{\ustc@speciality@name：} & \ustc@speciality \\
1913-
\ifx\ustc@advisor\@empty
1916+
\textsf{学科专业：} & \ustc@speciality \\
1917+
\ifx\ustc@practice@supervisor\@empty
19141918
\textsf{导\hspace{2em}师：} & \ustc@supervisor@names \\
19151919
\else
19161920
\textsf{校内导师：} & \ustc@supervisor@names \\
1917-
\textsf{企业导师：} & \ustc@advisor@names \\
1921+
\textsf{企业导师：} & \ustc@practice@supervisor@names \\
19181922
\fi
19191923
\textsf{完成时间：} & \ustc@date@zh@big
19201924
\end{tabular}\par}%
@@ -1964,9 +1968,9 @@
19641968
Author: \ustc@author@en \\
19651969
Speciality: \ustc@speciality@en \\
19661970
\ustc@supervisor@en@line \\
1967-
\ifx\ustc@advisor\@empty
1971+
\ifx\ustc@practice@supervisor@en\@empty
19681972
\else
1969-
\ustc@advisor@en@line \\
1973+
\ustc@practice@supervisor@en@line \\
19701974
\fi
19711975
Completion date: \ustc@date@en
19721976
\end{tabular}\par}%

0 commit comments

Comments
 (0)