diff --git a/CHANGELOG.md b/CHANGELOG.md index 89f55e5..534fd2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 章标题取消加粗（研究生院 2024-12-05 Word 模板修改，[#411](https://github.com/ustctug/ustcthesis/issues/411)）。 - 调整科研成果示例（研究生院 2024-12-05 Word 模板修改，[#411](https://github.com/ustctug/ustcthesis/issues/411)）。 +- 更新专业硕士论文封面：“专业领域”改为“学科专业”，“Advisor”改为“Practice supervisor”（研究生院 2024-12-05 Word 模板修改，[#390](https://github.com/ustctug/ustcthesis/issues/390#issuecomment-2558042581)）。 ## [4.0.0-beta.3] - 2024-12-15 diff --git a/test/testfiles/titlepage-master.tex b/test/testfiles/titlepage-master.tex index ca148ee..e7a7450 100644 --- a/test/testfiles/titlepage-master.tex +++ b/test/testfiles/titlepage-master.tex @@ -3,6 +3,12 @@ \input{info.tex} +\ustcsetup{ + practice-supervisor = {XXX~教授, XXX~教授}, + practice-supervisor* = {Prof.~XXX, Prof.~XXX}, +} + + \begin{document} \START \showoutput diff --git a/test/testfiles/titlepage-master.tlg b/test/testfiles/titlepage-master.tlg index 37f959f..afbe0ce 100644 --- a/test/testfiles/titlepage-master.tlg +++ b/test/testfiles/titlepage-master.tlg @@ -72,7 +72,7 @@ Completed box being shipped out [1] ....\special{color pop} ..\glue 8.2511 ..\glue(\lineskip) 0.0 -..\vbox(700.50723+0.0)x452.96826, glue set 57.81714fil +..\vbox(700.50723+0.0)x452.96826, glue set 26.70424fil ...\write-{} ...\write-{} ...\write-{} @@ -261,12 +261,12 @@ Completed box being shipped out [1] ...\glue(\parskip) 0.0 ...\glue(\parskip) 0.0 ...\glue(\lineskip) 1.0 -...\hbox(66.24788+58.21703)x452.96826, glue set 97.34569fil +...\hbox(81.806+73.77513)x452.96826, glue set 97.34569fil ....\glue(\leftskip) 0.0 plus 1.0fil ....\hbox(0.0+0.0)x0.0 -....\hbox(66.24788+58.21703)x258.2769 +....\hbox(81.806+73.77513)x258.2769 .....\mathon -.....\vbox(66.24788+58.21703)x258.2769 +.....\vbox(81.806+73.77513)x258.2769 ......\hbox(21.78127+9.33496)x258.2769 .......\glue(\tabskip) 0.0 .......\hbox(21.78127+9.33496)x96.36 @@ -307,13 +307,13 @@ Completed box being shipped out [1] .......\hbox(21.78127+9.33496)x96.36 ........\rule(21.78127+9.33496)x0.0 ........\glue 0.00002 -........\TU/FandolHei(0)/m/n/16.06 专 +........\TU/FandolHei(0)/m/n/16.06 学 ........\glue 0.0 plus 0.74417 -........\TU/FandolHei(0)/m/n/16.06 业 +........\TU/FandolHei(0)/m/n/16.06 科 ........\glue 0.0 plus 0.74417 -........\TU/FandolHei(0)/m/n/16.06 领 +........\TU/FandolHei(0)/m/n/16.06 专 ........\glue 0.0 plus 0.74417 -........\TU/FandolHei(0)/m/n/16.06 域 +........\TU/FandolHei(0)/m/n/16.06 业 ........\penalty 10000 ........\TU/FandolHei(0)/m/n/16.06 ： ........\rule(0.0+0.0)x-11.37048 @@ -350,10 +350,62 @@ Completed box being shipped out [1] .......\hbox(21.78127+9.33496)x96.36 ........\rule(21.78127+9.33496)x0.0 ........\glue 0.00002 +........\TU/FandolHei(0)/m/n/16.06 校 +........\glue 0.0 plus 0.74417 +........\TU/FandolHei(0)/m/n/16.06 内 +........\glue 0.0 plus 0.74417 ........\TU/FandolHei(0)/m/n/16.06 导 +........\glue 0.0 plus 0.74417 +........\TU/FandolHei(0)/m/n/16.06 师 +........\penalty 10000 +........\TU/FandolHei(0)/m/n/16.06 ： +........\rule(0.0+0.0)x-11.37048 +........\kern 0.00069 +........\kern -0.00069 +........\kern -0.99649 +........\kern 0.99649 +........\glue 11.37048 minus 8.03 +........\glue 0.0 plus 1.0fil +........\glue 16.06 +.......\glue(\tabskip) 0.0 +.......\hbox(21.78127+9.33496)x161.9169 +........\glue 0.00002 +........\TU/texgyretermes(0)/m/n/16.06 XXX +........\kern -0.0002 +........\kern 0.0002 +........\penalty 10000 +........\glue 4.015 plus 2.00749 minus 1.33833 +........\TU/FandolSong(0)/m/n/16.06 教 +........\glue 0.0 plus 0.74417 +........\TU/FandolSong(0)/m/n/16.06 授 ........\kern -0.00017 ........\kern 0.00017 -........\glue 32.12 +........\glue 16.06 +........\glue 4.015 plus 2.00749 minus 1.33833 +........\TU/texgyretermes(0)/m/n/16.06 XXX +........\kern -0.0002 +........\kern 0.0002 +........\penalty 10000 +........\glue 4.015 plus 2.00749 minus 1.33833 +........\TU/FandolSong(0)/m/n/16.06 教 +........\glue 0.0 plus 0.74417 +........\TU/FandolSong(0)/m/n/16.06 授 +........\kern -0.00018 +........\kern 0.00018 +........\glue 0.0 plus 1.0fil +.......\glue(\tabskip) 0.0 +......\glue(\lineskip) 0.0 +......\hbox(21.78127+9.33496)x258.2769 +.......\glue(\tabskip) 0.0 +.......\hbox(21.78127+9.33496)x96.36 +........\rule(21.78127+9.33496)x0.0 +........\glue 0.00002 +........\TU/FandolHei(0)/m/n/16.06 企 +........\glue 0.0 plus 0.74417 +........\TU/FandolHei(0)/m/n/16.06 业 +........\glue 0.0 plus 0.74417 +........\TU/FandolHei(0)/m/n/16.06 导 +........\glue 0.0 plus 0.74417 ........\TU/FandolHei(0)/m/n/16.06 师 ........\penalty 10000 ........\TU/FandolHei(0)/m/n/16.06 ： @@ -490,7 +542,7 @@ Completed box being shipped out [3] ....\special{color pop} ..\glue 8.2511 ..\glue(\lineskip) 0.0 -..\vbox(700.50723+0.0)x452.96826, glue set 81.73662fil +..\vbox(700.50723+0.0)x452.96826, glue set 51.62737fil ...\glue(\topskip) 12.0 ...\hbox(0.0+11.38092)x452.96826, glue set 226.48413fil ....\glue(\leftskip) 0.0 plus 1.0fil @@ -645,12 +697,12 @@ Completed box being shipped out [3] ...\glue(\parskip) 0.0 ...\glue(\parskip) 0.0 ...\glue(\lineskip) 1.0 -...\hbox(64.24037+56.20952)x452.96826, glue set 63.19945fil +...\hbox(79.29662+71.26575)x452.96826, glue set 63.19945fil ....\glue(\leftskip) 0.0 plus 1.0fil ....\hbox(0.0+0.0)x0.0 -....\hbox(64.24037+56.20952)x326.56937 +....\hbox(79.29662+71.26575)x326.56937 .....\mathon -.....\vbox(64.24037+56.20952)x326.56937 +.....\vbox(79.29662+71.26575)x326.56937 ......\hbox(21.07864+9.03383)x326.56937 .......\glue(\tabskip) 0.0 .......\hbox(21.07864+9.03383)x326.56937, glue set 207.94485fil @@ -713,6 +765,34 @@ Completed box being shipped out [3] ......\glue(\lineskip) 0.0 ......\hbox(21.07864+9.03383)x326.56937 .......\glue(\tabskip) 0.0 +.......\hbox(21.07864+9.03383)x326.56937, glue set 40.79239fil +........\rule(21.07864+9.03383)x0.0 +........\glue 0.00002 +........\TU/texgyretermes(0)/m/n/16.06 Practice +........\glue 4.015 plus 2.00749 minus 1.33833 +........\TU/texgyretermes(0)/m/n/16.06 supervisor: +........\glue 5.35333 plus 4.01498 minus 0.66916 +........\TU/texgyretermes(0)/m/n/16.06 Prof. +........\kern -0.0002 +........\kern 0.0002 +........\penalty 10000 +........\glue 4.015 plus 2.00749 minus 1.33833 +........\TU/texgyretermes(0)/m/n/16.06 XXX, +........\glue 4.015 plus 2.00749 minus 1.33833 +........\glue 4.015 plus 2.00749 minus 1.33833 +........\TU/texgyretermes(0)/m/n/16.06 Prof. +........\kern -0.0002 +........\kern 0.0002 +........\penalty 10000 +........\glue 4.015 plus 2.00749 minus 1.33833 +........\TU/texgyretermes(0)/m/n/16.06 XXX +........\kern -0.0002 +........\kern 0.0002 +........\glue 0.0 plus 1.0fil +.......\glue(\tabskip) 0.0 +......\glue(\lineskip) 0.0 +......\hbox(21.07864+9.03383)x326.56937 +.......\glue(\tabskip) 0.0 .......\hbox(21.07864+9.03383)x326.56937, glue set 128.97784fil ........\rule(21.07864+9.03383)x0.0 ........\glue 0.00002 diff --git a/ustcsetup.tex b/ustcsetup.tex index 7f59be5..025ed08 100644 --- a/ustcsetup.tex +++ b/ustcsetup.tex @@ -1,28 +1,30 @@ % !TeX root = ./main.tex \ustcsetup{ - title = {中国科学技术大学\\学位论文模板示例文档 v\ustcthesisversion}, - title* = {An example of thesis template for University of Science - and Technology of China v\ustcthesisversion}, - author = {李泽平}, - author* = {Li Zeping}, - speciality = {数学与应用数学}, - speciality* = {Mathematics and Applied Mathematics}, - supervisor = {XXX~教授, XXX~教授}, - supervisor* = {Prof. XXX, Prof. XXX}, - % date = {2017-05-01}, % 完成时间，默认为今日 - % professional-type = {专业学位类型}, - % professional-type* = {Professional degree type}, - % department = {数学科学学院}, % 院系，本科生需要填写 - % student-id = {PB11001000}, % 学号，本科生需要填写 - % secret-level = {秘密}, % 绝密|机密|秘密|控阅，注释本行则公开 - % secret-level* = {Secret}, % Top secret | Highly secret | Secret - % secret-year = {10}, % 保密/控阅期限 - % reviewer = true, % 声明页显示“评审专家签名” + title = {中国科学技术大学\\学位论文模板示例文档 v\ustcthesisversion}, + title* = {An example of thesis template for University of Science + and Technology of China v\ustcthesisversion}, + author = {李泽平}, + author* = {Li Zeping}, + speciality = {数学与应用数学}, + speciality* = {Mathematics and Applied Mathematics}, + supervisor = {XXX~教授, XXX~教授}, + supervisor* = {Prof. XXX, Prof. XXX}, + % practice-supervisor = {XXX~教授, XXX~教授}, + % practice-supervisor* = {Prof. XXX, Prof. XXX}, + % date = {2017-05-01}, % 完成时间，默认为今日 + % professional-type = {专业学位类型}, + % professional-type* = {Professional degree type}, + % department = {数学科学学院}, % 院系，本科生需要填写 + % student-id = {PB11001000}, % 学号，本科生需要填写 + % secret-level = {秘密}, % 绝密|机密|秘密|控阅，注释本行则公开 + % secret-level* = {Secret}, % Top secret | Highly secret | Secret + % secret-year = {10}, % 保密/控阅期限 + % reviewer = true, % 声明页显示“评审专家签名” % % 数学字体 - % math-style = GB, % 可选：GB, TeX, ISO - math-font = xits, % 可选：stix, xits, libertinus + % math-style = GB, % 可选：GB, TeX, ISO + math-font = xits, % 可选：stix, xits, libertinus } diff --git a/ustcthesis-doc.tex b/ustcthesis-doc.tex index 5b0397f..0aacd3d 100644 --- a/ustcthesis-doc.tex +++ b/ustcthesis-doc.tex @@ -391,6 +391,7 @@ \subsection{封面与声明} \opt{author} & \opt{author*} & 作者姓名 \\ \opt{speciality} & \opt{speciality*} & 学科专业 \\ \opt{supervisor} & \opt{supervisor*} & 导师 \\ + \opt{supepractice-supervisorrvisor} & \opt{practice-supervisor*} & 导师 \\ \opt{date} & - & 完成时间 \\ \opt{secret-level} & \opt{secret-level*} & 密级 \\ \opt{secret-year} & - & 保密/控阅年限 \\ @@ -403,7 +404,6 @@ \subsection{封面与声明} \item \cs{ustcsetup} 使用 \pkg{kvsetkeys} 机制，配置项之间不能有空行，否则会报错。 \item 其中带 |*| 后缀的选项用于设置英文封面。 \item 导师姓名 \opt{supervisor} 允许多个姓名，使用“,”（西文逗号 U+002C）隔开。 - \item 软件工程专业使用 \opt{advisor} 和 \opt{advisor*} 设置企业导师的姓名。 \item 完成时间 \opt{date} 应使用 ISO 格式（yyyy-mm-dd），默认为当前日期。 \end{itemize} diff --git a/ustcthesis.cls b/ustcthesis.cls index 7bf4bc0..03f179a 100644 --- a/ustcthesis.cls +++ b/ustcthesis.cls @@ -1673,12 +1673,19 @@ default = {Supervisor Name}, name = supervisor@en, }, - advisor = { + practice-supervisor = { default = {}, + name = practice@supervisor, }, - advisor* = { + practice-supervisor* = { default = {}, - name = advisor@en, + name = practice@supervisor@en, + }, + advisor = { + name = practice@supervisor, + }, + advisor* = { + name = practice@supervisor@en, }, date = { default = {\the\year-\two@digits{\month}-\two@digits{\day}}, @@ -1720,8 +1727,8 @@ \newcommand\ustc@supervisor@names{% \ustc@clist@use{\ustc@supervisor}{\quad} } -\newcommand\ustc@advisor@names{% - \ustc@clist@use{\ustc@advisor}{\quad} +\newcommand\ustc@practice@supervisor@names{% + \ustc@clist@use{\ustc@practice@supervisor}{\quad} } \newcounter{ustc@count} \newcommand\ustc@supervisor@en@line{% @@ -1733,14 +1740,14 @@ \fi \space\ustc@clist@use{\ustc@supervisor@en}{, }% } -\newcommand\ustc@advisor@en@line{% - \setcounter{ustc@count}{\ustc@clist@count{\ustc@advisor@en}}% +\newcommand\ustc@practice@supervisor@en@line{% + \setcounter{ustc@count}{\ustc@clist@count{\ustc@practice@supervisor@en}}% \ifnum\c@ustc@count>1\relax - Advisor:% + Practice supervisor:% \else - Advisor:% + Practice supervisor:% \fi - \space\ustc@clist@use{\ustc@advisor@en}{, }% + \space\ustc@clist@use{\ustc@practice@supervisor@en}{, }% } % 输出日期的给定格式：\cs{ustc@format@date}\marg{format}\marg{date}， @@ -1815,7 +1822,6 @@ \fi \fi \ifustc@degree@type@academic - \newcommand\ustc@speciality@name{学科专业} \else \ifustc@degree@doctor \renewcommand\ustc@thesis@name{工程博士学位论文} @@ -1833,7 +1839,6 @@ \providecommand\lishu{\sffamily} \fi \fi - \newcommand\ustc@speciality@name{专业领域} \fi % 定义校徽颜色 @@ -1866,7 +1871,6 @@ % 作者姓名宋体 16 磅，单倍行距； % 注意这里的“单倍行距”的地方开启了“对齐到网格”，所以实际行距有所偏差， % 所以只能使用直尺测量。 -\newcommand\ustc@speciality@sse{软件工程} \newcommand\ustc@title@page@graduate@zh{% \ustcsetup{language=chinese}% \begin{titlepage}% @@ -1909,12 +1913,12 @@ {\fontsize{16bp}{31bp}\selectfont \begin{tabular}{@{}l@{\quad}l@{}}% \textsf{作者姓名：} & \ustc@author \\ - \textsf{\ustc@speciality@name：} & \ustc@speciality \\ - \ifx\ustc@advisor\@empty + \textsf{学科专业：} & \ustc@speciality \\ + \ifx\ustc@practice@supervisor\@empty \textsf{导\hspace{2em}师：} & \ustc@supervisor@names \\ \else \textsf{校内导师：} & \ustc@supervisor@names \\ - \textsf{企业导师：} & \ustc@advisor@names \\ + \textsf{企业导师：} & \ustc@practice@supervisor@names \\ \fi \textsf{完成时间：} & \ustc@date@zh@big \end{tabular}\par}% @@ -1964,9 +1968,9 @@ Author: \ustc@author@en \\ Speciality: \ustc@speciality@en \\ \ustc@supervisor@en@line \\ - \ifx\ustc@advisor\@empty + \ifx\ustc@practice@supervisor@en\@empty \else - \ustc@advisor@en@line \\ + \ustc@practice@supervisor@en@line \\ \fi Completion date: \ustc@date@en \end{tabular}\par}%