Rename option "degree-name" to "degree-category" (#840)

tuna · Apr 23, 2024 · 9dac7b5 · 9dac7b5
1 parent 0ce9a50
commit 9dac7b5
Show file tree

Hide file tree

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

diff --git a/testfiles/01-title-page-en/01-title-page-academic-doctor-1.tex b/testfiles/01-title-page-en/01-title-page-academic-doctor-1.tex
@@ -2,14 +2,14 @@
 \documentclass[degree=doctor,language=english]{thuthesis}
 
 \thusetup{
-  title       = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
-  title*      = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
-  degree-name = {理学博士},
-  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      = {某某学院/系},
+  discipline      = {某某学},
+  author          = {Your Name},
+  supervisor      = {某某某, 教授},
+  date            = {2020-11-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page-en/01-title-page-academic-doctor-2.tex b/testfiles/01-title-page-en/01-title-page-academic-doctor-2.tex
@@ -4,7 +4,7 @@
 \thusetup{
   title                = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
   title*               = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
-  degree-name          = {理学博士},
+  degree-category      = {理学博士},
   department           = {某某学院/系},
   discipline           = {某某学},
   author               = {Your Name},

diff --git a/testfiles/01-title-page-en/01-title-page-academic-doctor-3.tex b/testfiles/01-title-page-en/01-title-page-academic-doctor-3.tex
@@ -2,15 +2,15 @@
 \documentclass[degree=doctor,language=english]{thuthesis}
 
 \thusetup{
-  title         = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
-  title*        = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
-  degree-name   = {理学博士},
-  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      = {某某学院/系},
+  discipline      = {某某学},
+  author          = {Your Name},
+  supervisor      = {某某某, 教授},
+  co-supervisor   = {某某某, 教授},
+  date            = {2020-11-01},
 }
 
 \begin{document}

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

diff --git a/testfiles/01-title-page-en/01-title-page-academic-master-2.tex b/testfiles/01-title-page-en/01-title-page-academic-master-2.tex
@@ -4,7 +4,7 @@
 \thusetup{
   title                = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
   title*               = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
-  degree-name          = {理学硕士},
+  degree-category      = {理学硕士},
   department           = {某某学院/系},
   discipline           = {某某学},
   author               = {Your Name},

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

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

diff --git a/testfiles/01-title-page-en/01-title-page-professional-doctor-2.tex b/testfiles/01-title-page-en/01-title-page-professional-doctor-2.tex
@@ -4,7 +4,7 @@
 \thusetup{
   title                = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
   title*               = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
-  degree-name          = {教育博士},
+  degree-category      = {教育博士},
   department           = {某某学院/系},
   author               = {Your Name},
   supervisor           = {某某某, 教授},

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

diff --git a/testfiles/01-title-page-en/01-title-page-professional-master-1.tex b/testfiles/01-title-page-en/01-title-page-professional-master-1.tex
@@ -2,13 +2,13 @@
 \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-name = {公共管理硕士},
-  department  = {某某学院/系},
-  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      = {某某学院/系},
+  author          = {Your Name},
+  supervisor      = {某某某, 教授},
+  date            = {2020-11-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page-en/01-title-page-professional-master-2.tex b/testfiles/01-title-page-en/01-title-page-professional-master-2.tex
@@ -4,7 +4,7 @@
 \thusetup{
   title                = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
   title*               = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
-  degree-name          = {公共管理硕士},
+  degree-category      = {公共管理硕士},
   department           = {某某学院/系},
   author               = {Your Name},
   supervisor           = {某某某, 教授},

diff --git a/testfiles/01-title-page-en/01-title-page-professional-master-3.tex b/testfiles/01-title-page-en/01-title-page-professional-master-3.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-name   = {公共管理硕士},
-  department    = {某某学院/系},
-  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      = {某某学院/系},
+  author          = {Your Name},
+  supervisor      = {某某某, 教授},
+  co-supervisor   = {某某某, 教授},
+  date            = {2020-11-01},
 }
 
 \begin{document}

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-name = {工程硕士},
-  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      = {某某学院/系},
+  discipline      = {某某工程},
+  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
@@ -4,7 +4,7 @@
 \thusetup{
   title                = {此处填入学位论文中文题目且\\长度不得超过二十五个汉字},
   title*               = {Type the English Title of Your Thesis \\ Here and Keep it Concise and \\ Accurate},
-  degree-name          = {工程硕士},
+  degree-category      = {工程硕士},
   department           = {某某学院/系},
   discipline           = {某某工程},
   author               = {Your Name},

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-name   = {工程硕士},
-  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      = {某某学院/系},
+  discipline      = {某某工程},
+  author          = {Your Name},
+  supervisor      = {某某某, 教授},
+  co-supervisor   = {某某某, 教授},
+  date            = {2020-11-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page-en/02-title-page-academic-doctor-1.tex b/testfiles/01-title-page-en/02-title-page-academic-doctor-1.tex
@@ -2,12 +2,12 @@
 \documentclass[degree=doctor,language=english]{thuthesis}
 
 \thusetup{
-  title*       = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
-  degree-name* = {Doctor of Philosophy},
-  discipline*  = {Applied Economics},
-  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* = {Doctor of Philosophy},
+  discipline*      = {Applied Economics},
+  author*          = {Your Name},
+  supervisor*      = {Professor XX XXXX},
+  date             = {2020-11-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page-en/02-title-page-academic-doctor-2.tex b/testfiles/01-title-page-en/02-title-page-academic-doctor-2.tex
@@ -3,7 +3,7 @@
 
 \thusetup{
   title*                = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
-  degree-name*          = {Doctor of Philosophy},
+  degree-category*      = {Doctor of Philosophy},
   discipline*           = {Applied Economics},
   author*               = {Your Name},
   supervisor*           = {Professor XX XXXX},

diff --git a/testfiles/01-title-page-en/02-title-page-academic-doctor-3.tex b/testfiles/01-title-page-en/02-title-page-academic-doctor-3.tex
@@ -2,13 +2,13 @@
 \documentclass[degree=doctor,language=english]{thuthesis}
 
 \thusetup{
-  title*         = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
-  degree-name*   = {Doctor of Philosophy},
-  discipline*    = {Applied Economics},
-  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* = {Doctor of Philosophy},
+  discipline*      = {Applied Economics},
+  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-en/02-title-page-academic-master-1.tex b/testfiles/01-title-page-en/02-title-page-academic-master-1.tex
@@ -2,12 +2,12 @@
 \documentclass[degree=master,language=english]{thuthesis}
 
 \thusetup{
-  title*       = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
-  degree-name* = {Master of Science},
-  discipline*  = {Applied Economics},
-  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 Science},
+  discipline*      = {Applied Economics},
+  author*          = {Your Name},
+  supervisor*      = {Professor XX XXXX},
+  date             = {2020-11-01},
 }
 
 \begin{document}

diff --git a/testfiles/01-title-page-en/02-title-page-academic-master-2.tex b/testfiles/01-title-page-en/02-title-page-academic-master-2.tex
@@ -3,7 +3,7 @@
 
 \thusetup{
   title*                = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
-  degree-name*          = {Master of Science},
+  degree-category*      = {Master of Science},
   discipline*           = {Applied Economics},
   author*               = {Your Name},
   supervisor*           = {Professor XX XXXX},

diff --git a/testfiles/01-title-page-en/02-title-page-academic-master-3.tex b/testfiles/01-title-page-en/02-title-page-academic-master-3.tex
@@ -2,13 +2,13 @@
 \documentclass[degree=master,language=english]{thuthesis}
 
 \thusetup{
-  title*         = {TType the English Title of Your Thesis Here and Keep it Concise and Accurate},
-  degree-name*   = {Master of Science},
-  discipline*    = {Applied Economics},
-  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 Science},
+  discipline*      = {Applied Economics},
+  author*          = {Your Name},
+  supervisor*      = {Professor XX XXXX},
+  co-supervisor*   = {Professor XX XXXX},
+  date             = {2020-11-01},
 }
 
 \begin{document}