Add option "professional-field" and "engineering-field" (#840)

tuna · May 2, 2023 · 61c553c · 61c553c
1 parent 87bb22b
commit 61c553c
Show file tree

Hide file tree

Showing 16 changed files with 173 additions and 112 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,16 +8,18 @@
 
 ### Added
 
-- 允许本科生附录翻译的摘要中使用 `\thusetup{keywords = *}` 设置关键词。
-- 添加选项 `degree-category` 和 `degree-category*` 设置学科门类。
+- 允许本科生附录翻译的摘要中使用 `\thusetup{keywords = *}` 设置关键词（[#865](https://github.com/tuna/thuthesis/issues/865)）。
+- 添加选项 `degree-category` 和 `degree-category*` 设置学科门类（[#840](https://github.com/tuna/thuthesis/issues/840)）。
+- 添加选项 `professional-field` 和 `professional-field*` 设置专业领域（[#840](https://github.com/tuna/thuthesis/issues/840)）。
+- 添加选项 `engineering-field` 和 `engineering-field*` 设置专业领域（[#840](https://github.com/tuna/thuthesis/issues/840)）。
 
 ### Changed
 
 - 专业学位的“工程领域”改为“专业领域”，同步《指南》2023 年 3 月版的更改（[#862](https://github.com/tuna/thuthesis/issues/862)）。
 
 ### Deprecated
 
-- 选项 `degree-name` 和 `degree-name*` 已经过时。
+- 选项 `degree-name` 和 `degree-name*` 已经过时（[#840](https://github.com/tuna/thuthesis/issues/840)）。
 
 ### Fixed
 

diff --git a/testfiles/01-title-page-en/01-title-page-professional-master-engineering-1.tex b/testfiles/01-title-page-en/01-title-page-professional-master-engineering-1.tex
@@ -2,14 +2,14 @@
 \documentclass[degree=master,degree-type=professional,language=english]{thuthesis}
 
 \thusetup{
-  title           = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
-  title*          = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
-  degree-category = {工程硕士},
-  department      = {某某学院/系},
-  discipline      = {某某工程},
-  author          = {Your Name},
-  supervisor      = {某某某, 教授},
-  date            = {2020-11-01},
+  title              = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
+  title*             = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
+  degree-category    = {工程硕士},
+  department         = {某某学院/系},
+  professional-field = {某某工程},
+  author             = {Your Name},
+  supervisor         = {某某某, 教授},
+  date               = {2020-11-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page-en/01-title-page-professional-master-engineering-2.tex b/testfiles/01-title-page-en/01-title-page-professional-master-engineering-2.tex
@@ -6,7 +6,7 @@
   title*               = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
   degree-category      = {工程硕士},
   department           = {某某学院/系},
-  discipline           = {某某工程},
+  professional-field   = {某某工程},
   author               = {Your Name},
   supervisor           = {某某某, 教授},
   associate-supervisor = {某某某, 教授},

diff --git a/testfiles/01-title-page-en/01-title-page-professional-master-engineering-3.tex b/testfiles/01-title-page-en/01-title-page-professional-master-engineering-3.tex
@@ -2,15 +2,15 @@
 \documentclass[degree=master,degree-type=professional,language=english]{thuthesis}
 
 \thusetup{
-  title           = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
-  title*          = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
-  degree-category = {工程硕士},
-  department      = {某某学院/系},
-  discipline      = {某某工程},
-  author          = {Your Name},
-  supervisor      = {某某某, 教授},
-  co-supervisor   = {某某某, 教授},
-  date            = {2020-11-01},
+  title              = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
+  title*             = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
+  degree-category    = {工程硕士},
+  department         = {某某学院/系},
+  professional-field = {某某工程},
+  author             = {Your Name},
+  supervisor         = {某某某, 教授},
+  co-supervisor      = {某某某, 教授},
+  date               = {2020-11-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page-en/02-title-page-professional-master-engineering-1.tex b/testfiles/01-title-page-en/02-title-page-professional-master-engineering-1.tex
@@ -2,12 +2,12 @@
 \documentclass[degree=master,degree-type=professional,language=english]{thuthesis}
 
 \thusetup{
-  title*           = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
-  degree-category* = {Master of Engineering},
-  discipline*      = {Mechanical Engineering},
-  author*          = {Your Name},
-  supervisor*      = {Professor XX XXXX},
-  date             = {2020-11-01},
+  title*              = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
+  degree-category*    = {Master of Engineering},
+  professional-field* = {Mechanical Engineering},
+  author*             = {Your Name},
+  supervisor*         = {Professor XX XXXX},
+  date                = {2020-11-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page-en/02-title-page-professional-master-engineering-2.tex b/testfiles/01-title-page-en/02-title-page-professional-master-engineering-2.tex
@@ -4,7 +4,7 @@
 \thusetup{
   title*                = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
   degree-category*      = {Master of Engineering},
-  discipline*           = {Mechanical Engineering},
+  professional-field*   = {Mechanical Engineering},
   author*               = {Your Name},
   supervisor*           = {Professor XX XXXX},
   associate-supervisor* = {Professor XX XXXX},

diff --git a/testfiles/01-title-page-en/02-title-page-professional-master-engineering-3.tex b/testfiles/01-title-page-en/02-title-page-professional-master-engineering-3.tex
@@ -2,13 +2,13 @@
 \documentclass[degree=master,degree-type=professional,language=english]{thuthesis}
 
 \thusetup{
-  title*           = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
-  degree-category* = {Master of Engineering},
-  discipline*      = {Mechanical Engineering},
-  author*          = {Your Name},
-  supervisor*      = {Professor XX XXXX},
-  co-supervisor*   = {Professor XX XXXX},
-  date             = {2020-11-01},
+  title*              = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
+  degree-category*    = {Master of Engineering},
+  professional-field* = {Mechanical Engineering},
+  author*             = {Your Name},
+  supervisor*         = {Professor XX XXXX},
+  co-supervisor*      = {Professor XX XXXX},
+  date                = {2020-11-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page/01-title-page-master-1-5.tex b/testfiles/01-title-page/01-title-page-master-1-5.tex
@@ -2,14 +2,14 @@
 \documentclass[degree=master, degree-type=professional]{thuthesis}
 
 \thusetup{
-  title           = {透水性混凝土路面材料的研究},
-  degree-category = {资源与环境硕士},
-  department      = {环境学院},
-  discipline      = {环境工程},
-  author          = {李某},
-  supervisor      = {某某某, 教授},
-  co-supervisor   = {某某某, 教授},
-  date            = {2023-03-01},
+  title              = {透水性混凝土路面材料的研究},
+  degree-category    = {资源与环境硕士},
+  department         = {环境学院},
+  professional-field = {环境工程},
+  author             = {李某},
+  supervisor         = {某某某, 教授},
+  co-supervisor      = {某某某, 教授},
+  date               = {2023-03-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page/01-title-page-master-1-6.tex b/testfiles/01-title-page/01-title-page-master-1-6.tex
@@ -2,16 +2,16 @@
 \documentclass[degree=master, degree-type=professional]{thuthesis}
 
 \thusetup{
-  title           = {透水性混凝土路面材料的研究},
-  degree-category = {资源与环境硕士},
-  department      = {环境学院},
-  discipline      = {环境工程},
-  author          = {李某},
-  supervisor      = {某某某, 教授},
-  co-supervisor   = {某某某, 教授},
-  date            = {2016-03-01},
-  secret-level    = {秘密},
-  secret-year     = {10},
+  title              = {透水性混凝土路面材料的研究},
+  degree-category    = {资源与环境硕士},
+  department         = {环境学院},
+  professional-field = {环境工程},
+  author             = {李某},
+  supervisor         = {某某某, 教授},
+  co-supervisor      = {某某某, 教授},
+  date               = {2016-03-01},
+  secret-level       = {秘密},
+  secret-year        = {10},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page/01-title-page-master-1-7.tex b/testfiles/01-title-page/01-title-page-master-1-7.tex
@@ -2,14 +2,14 @@
 \documentclass[degree=master, degree-type=professional]{thuthesis}
 
 \thusetup{
-  title           = {透水性混凝土路面材料的研究},
-  degree-category = {工程硕士},
-  department      = {土木工程系},
-  discipline      = {建筑与土木工程},
-  author          = {李某},
-  supervisor      = {某某某, 教授},
-  co-supervisor   = {某某某, 教授},
-  date            = {2016-03-01},
+  title             = {透水性混凝土路面材料的研究},
+  degree-category   = {工程硕士},
+  department        = {土木工程系},
+  engineering-field = {建筑与土木工程},
+  author            = {李某},
+  supervisor        = {某某某, 教授},
+  co-supervisor     = {某某某, 教授},
+  date              = {2016-03-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page/01-title-page-master-1-7.tlg b/testfiles/01-title-page/01-title-page-master-1-7.tlg
@@ -268,13 +268,13 @@ Completed box being shipped out [1]
 ..........\rule(21.78127+9.33496)x0.0
 ..........\glue 6.0
 ..........\glue 0.00002
-..........\hbox(12.79982+2.8426)x86.82437, glue set 5.52063fil
-...........\hbox(12.79982+2.8426)x81.30374
+..........\hbox(12.51074+2.8426)x86.82437, glue set 5.52063fil
+...........\hbox(12.51074+2.8426)x81.30374
 ............\special{color push gray 0}
-............\hbox(12.79982+2.8426)x81.30374, glue set 2.84396filll
-.............\TU/FandolFang(0)/m/n/16.06 专
+............\hbox(12.51074+2.8426)x81.30374, glue set 2.84396filll
+.............\TU/FandolFang(0)/m/n/16.06 工
 .............\glue 0.0 plus 2.0filll minus 1.0filll
-.............\TU/FandolFang(0)/m/n/16.06 业
+.............\TU/FandolFang(0)/m/n/16.06 程
 .............\glue 0.0 plus 2.0filll minus 1.0filll
 .............\TU/FandolFang(0)/m/n/16.06 领
 .............\glue 0.0 plus 2.0filll minus 1.0filll

diff --git a/testfiles/01-title-page/01-title-page-master-1-8.tex b/testfiles/01-title-page/01-title-page-master-1-8.tex
@@ -2,15 +2,15 @@
 \documentclass[degree=master, degree-type=professional]{thuthesis}
 
 \thusetup{
-  title           = {透水性混凝土路面材料的研究},
-  degree-category = {工程硕士},
-  department      = {土木工程系},
-  discipline      = {建筑与土木工程},
-  author          = {李某},
-  supervisor      = {某某某, 教授},
-  co-supervisor   = {某某某, 教授},
-  date            = {2016-03-01},
-  secret-level    = {秘密},
+  title             = {透水性混凝土路面材料的研究},
+  degree-category   = {工程硕士},
+  department        = {土木工程系},
+  engineering-field = {建筑与土木工程},
+  author            = {李某},
+  supervisor        = {某某某, 教授},
+  co-supervisor     = {某某某, 教授},
+  date              = {2016-03-01},
+  secret-level      = {秘密},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page/01-title-page-master-1-8.tlg b/testfiles/01-title-page/01-title-page-master-1-8.tlg
@@ -280,13 +280,13 @@ Completed box being shipped out [1]
 ..........\rule(21.78127+9.33496)x0.0
 ..........\glue 6.0
 ..........\glue 0.00002
-..........\hbox(12.79982+2.8426)x86.82437, glue set 5.52063fil
-...........\hbox(12.79982+2.8426)x81.30374
+..........\hbox(12.51074+2.8426)x86.82437, glue set 5.52063fil
+...........\hbox(12.51074+2.8426)x81.30374
 ............\special{color push gray 0}
-............\hbox(12.79982+2.8426)x81.30374, glue set 2.84396filll
-.............\TU/FandolFang(0)/m/n/16.06 专
+............\hbox(12.51074+2.8426)x81.30374, glue set 2.84396filll
+.............\TU/FandolFang(0)/m/n/16.06 工
 .............\glue 0.0 plus 2.0filll minus 1.0filll
-.............\TU/FandolFang(0)/m/n/16.06 业
+.............\TU/FandolFang(0)/m/n/16.06 程
 .............\glue 0.0 plus 2.0filll minus 1.0filll
 .............\TU/FandolFang(0)/m/n/16.06 领
 .............\glue 0.0 plus 2.0filll minus 1.0filll

diff --git a/testfiles/01-title-page/01-title-page-master-2-3.tex b/testfiles/01-title-page/01-title-page-master-2-3.tex
@@ -3,7 +3,7 @@
 
 \thusetup{
   title*                = {Research on the Theory and Application of Unit Root, Cointegration and\\Structural Change},
-  discipline*           = {Environmental Engineering},
+  professional-field*   = {Environmental Engineering},
   degree-category*      = {Master of Resources and Environmental Engineering},
   author*               = {Wang Shaoping},
   supervisor*           = {Professor Li Zinai},

diff --git a/thusetup.tex b/thusetup.tex
@@ -48,17 +48,20 @@
   department = {计算机科学与技术系},
   %
   % 学科
-  %   1. 学术型学位
-  %      获得一级学科授权的学科填写一级学科名称，其他填写二级学科名称
-  %   2. 专业学位
-  %      (a) 设置专业领域的专业学位，填写专业领域名称
-  %      (b) 2019 级及之前工程硕士学位，在 `engineering-field` 填写工程领域名称
-  %      (c) 其他专业学位，无需此信息
-  %   3. 本科生填写专业名称，第二学位论文需标注“（第二学位）”
+  %   1. 研究生学术型学位，获得一级学科授权的学科填写一级学科名称，其他填写二级学科名称
+  %   2. 本科生填写专业名称，第二学位论文需标注“（第二学位）”
   %
   discipline  = {计算机科学与技术},
   discipline* = {Computer Science and Technology},
   %
+  % 专业领域
+  %   1. 设置专业领域的专业学位类别，填写相应专业领域名称
+  %   2. 2019 级及之前工程硕士学位论文，在 `engineering-field` 填写相应工程领域名称
+  %   3. 其他专业学位类别的学位论文无需此信息
+  %
+  % professional-field  = {计算机技术},
+  % professional-field* = {Computer Technology},
+  %
   % 姓名
   %
   author  = {薛瑞尼},