Revert "Allow degree setup in preamble"

This reverts commit 237b44b.
heheda12345 · Jan 3, 2020 · ddfd163 · ddfd163
1 parent b863e15
commit ddfd163
Show file tree

Hide file tree

Showing 52 changed files with 161 additions and 344 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,7 +7,7 @@ about: 报告模板中的 bug
 ## 编译环境
 编译的系统：macOS 10.14 / Windows 10 / Ubuntu 18.04 / Overleaf
 TeX 发行版：TeX Live 2019 / MacTeX 2019 / MiKTeX 2.9.6753
-模板版本：v6.0
+模板版本：v5.5.2
 模板类型：doctor / master / bachelor
 
 ## 描述问题
@@ -18,7 +18,7 @@ TeX 发行版：TeX Live 2019 / MacTeX 2019 / MiKTeX 2.9.6753
 
 复现上述问题的代码：
 ```TeX
-\documentclass{thuthesis}
+\documentclass[degree=doctor]{thuthesis}
 \begin{document}
 abc
 \end{document}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,7 +19,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - 附录使用 `\appendix` 命令开始，不再使用 `appendix` 环境。
 - 修改 `shuji` 为 `spine`。
 - `acknowledgement` 环境改为 `acknowledgments`。
-- 允许在导言区中设置 `degree` 和 `langauge`。
 
 ## Removed
 - 移除 `secret` 选项。

diff --git a/main.tex b/main.tex
@@ -2,7 +2,12 @@
 % !TeX program = xelatex
 % !TeX spellcheck = en_US
 
-\documentclass{thuthesis}
+\documentclass[degree=master]{thuthesis}
+  % 学位 degree:
+  %   doctor | master | bachelor | postdoc
+  % 学位类型 degree-type:
+  %   academic（默认）| professional
+
 
 % 加载宏包、所有的设置
 \input{thusetup.tex}

diff --git a/spine.tex b/spine.tex
@@ -1,7 +1,6 @@
-\documentclass{thuthesis}
+\documentclass[degree=master]{thuthesis}
 
 \thusetup{
-  degree = master,
   author = {薛瑞尼},
   title  = {没有英文的中文标题}
 }

diff --git a/testfiles/01-cover/bachelor-english.tex b/testfiles/01-cover/bachelor-english.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=bachelor]{thuthesis}
 
 \thusetup{
-  degree      = bachelor,
   language    = english,
   title       = {中国计算机科学研究生学术论文写作中引用行为的研究},
   title*      = {Citation Behaviors of Chinese Computer Science Graduate Students in Research Paper Writing},

diff --git a/testfiles/01-cover/bachelor-english.tlg b/testfiles/01-cover/bachelor-english.tlg
@@ -33,7 +33,7 @@ Don't change this file in any respect.
 * (1in=72.27pt=25.4mm, 1cm=28.453pt)
 File: tsinghua.pdf Graphic file (type pdf)
 <use tsinghua.pdf>
-Underfull \hbox (badness 10000) in paragraph at lines 22--22
+Underfull \hbox (badness 10000) in paragraph at lines 21--21
 \hbox(0.0+0.0)x417.11752
 .\glue(\leftskip) 71.13188
 .\glue(\rightskip) 0.0

diff --git a/testfiles/01-cover/bachelor-secret.tex b/testfiles/01-cover/bachelor-secret.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=bachelor]{thuthesis}
 
 \thusetup{
-  degree       = bachelor,
   title        = {气候变化对冬小麦产量影响的数值模拟研究},
   department   = {水利水电工程系},
   discipline   = {水利水电工程},

diff --git a/testfiles/01-cover/bachelor-secret.tlg b/testfiles/01-cover/bachelor-secret.tlg
@@ -33,7 +33,7 @@ Don't change this file in any respect.
 * (1in=72.27pt=25.4mm, 1cm=28.453pt)
 File: tsinghua.pdf Graphic file (type pdf)
 <use tsinghua.pdf>
-Underfull \hbox (badness 10000) in paragraph at lines 22--22
+Underfull \hbox (badness 10000) in paragraph at lines 21--21
 \hbox(0.0+0.0)x417.11752
 .\glue(\leftskip) 71.13188
 .\glue(\rightskip) 0.0

diff --git a/testfiles/01-cover/bachelor.tex b/testfiles/01-cover/bachelor.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=bachelor]{thuthesis}
 
 \thusetup{
-  degree     = bachelor,
   title      = {气候变化对冬小麦产量影响的数值模拟研究},
   department = {水利水电工程系},
   discipline = {水利水电工程},

diff --git a/testfiles/01-cover/bachelor.tlg b/testfiles/01-cover/bachelor.tlg
@@ -33,7 +33,7 @@ Don't change this file in any respect.
 * (1in=72.27pt=25.4mm, 1cm=28.453pt)
 File: tsinghua.pdf Graphic file (type pdf)
 <use tsinghua.pdf>
-Underfull \hbox (badness 10000) in paragraph at lines 20--20
+Underfull \hbox (badness 10000) in paragraph at lines 19--19
 \hbox(0.0+0.0)x417.11752
 .\glue(\leftskip) 71.13188
 .\glue(\rightskip) 0.0

diff --git a/testfiles/01-cover/doctor-1-1.tex b/testfiles/01-cover/doctor-1-1.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor]{thuthesis}
 
 \thusetup{
-  degree      = doctor,
   title       = {单位根和协整及其结构突变的\\理论与应用研究},
   degree-name = {经济学博士},
   department  = {经济管理学院},

diff --git a/testfiles/01-cover/doctor-1-2.tex b/testfiles/01-cover/doctor-1-2.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor]{thuthesis}
 
 \thusetup{
-  degree               = doctor,
   title                = {N-磷酰化氨基酸成态及多肽 C 端保护基的酶促脱除},
   degree-name          = {理学博士},
   department           = {化学系},

diff --git a/testfiles/01-cover/doctor-1-3.tex b/testfiles/01-cover/doctor-1-3.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor]{thuthesis}
 
 \thusetup{
-  degree      = doctor,
   title       = {碳纳米管若干力学问题的研究},
   degree-name = {工学博士},
   department  = {航空航天学院},

diff --git a/testfiles/01-cover/doctor-1-4.tex b/testfiles/01-cover/doctor-1-4.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor]{thuthesis}
 
 \thusetup{
-  degree               = doctor,
   title                = {电流变机理及应用研究},
   degree-name          = {工学博士},
   department           = {精密仪器与机械学系},

diff --git a/testfiles/01-cover/doctor-1-5.tex b/testfiles/01-cover/doctor-1-5.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor]{thuthesis}
 
 \thusetup{
-  degree       = doctor,
   title        = {单位根和协整及其结构突变的\\理论与应用研究},
   degree-name  = {经济学博士},
   department   = {经济管理学院},

diff --git a/testfiles/01-cover/doctor-1-6.tex b/testfiles/01-cover/doctor-1-6.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor]{thuthesis}
 
 \thusetup{
-  degree           = doctor,
   title            = {若干低维小体系中的量子特性研究},
   degree-name      = {理学博士},
   department       = {物理系},

diff --git a/testfiles/01-cover/doctor-1-7.tex b/testfiles/01-cover/doctor-1-7.tex
@@ -1,10 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor, degree-type=professional]{thuthesis}
 
 \thusetup{
-  degree      = doctor,
-  degree-type = professional,
   title       = {行政审批制度研究\\——以深圳市为例},
   degree-name = {教育博士},
   department  = {教育研究院},

diff --git a/testfiles/01-cover/doctor-1-8.tex b/testfiles/01-cover/doctor-1-8.tex
@@ -1,10 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor, degree-type=professional]{thuthesis}
 
 \thusetup{
-  degree       = doctor,
-  degree-type  = professional,
   title        = {行政审批制度研究\\——以深圳市为例},
   degree-name  = {教育博士},
   department   = {教育研究院},

diff --git a/testfiles/01-cover/doctor-2-1.tex b/testfiles/01-cover/doctor-2-1.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor]{thuthesis}
 
 \thusetup{
-  degree                = doctor,
   title*                = {Research on the Theory and Application of Unit Root, Cointegration and Structural Change},
   degree-name*          = {Doctor of Philosophy},
   discipline*           = {Applied Economics},

diff --git a/testfiles/01-cover/doctor-2-2.tex b/testfiles/01-cover/doctor-2-2.tex
@@ -1,10 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=doctor, degree-type=professional]{thuthesis}
 
 \thusetup{
-  degree                = doctor,
-  degree-type           = professional,
   title*                = {Research on the Theory and Application of Unit Root, Cointegration and Structural Change},
   degree-name*          = {Doctor of Education},
   author*               = {Wang Shaoping},

diff --git a/testfiles/01-cover/master-1-1.tex b/testfiles/01-cover/master-1-1.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=master]{thuthesis}
 
 \thusetup{
-  degree            = master,
   title            = {两层次物流中心规划模型\\理论分析和算法研究},
   degree-name      = {工学硕士},
   department       = {工业工程系},

diff --git a/testfiles/01-cover/master-1-2.tex b/testfiles/01-cover/master-1-2.tex
@@ -1,10 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=master, degree-type=professional]{thuthesis}
 
 \thusetup{
-  degree           = master,
-  degree-type      = professional,
   title            = {透水性混凝土路面材料的研究},
   degree-name      = {工程硕士},
   department       = {土木工程系},

diff --git a/testfiles/01-cover/master-1-3.tex b/testfiles/01-cover/master-1-3.tex
@@ -1,10 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=master, degree-type=professional]{thuthesis}
 
 \thusetup{
-  degree           = master,
-  degree-type      = professional,
   title            = {行政审批制度研究\\——以深圳市为例},
   degree-name      = {公共管理硕士},
   department       = {公共管理学院},

diff --git a/testfiles/01-cover/master-1-4.tex b/testfiles/01-cover/master-1-4.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=master]{thuthesis}
 
 \thusetup{
-  degree           = master,
   title            = {两层次物流中心规划模型\\理论分析和算法研究},
   degree-name      = {工学硕士},
   department       = {工业工程系},

diff --git a/testfiles/01-cover/master-1-5.tex b/testfiles/01-cover/master-1-5.tex
@@ -1,10 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=master, degree-type=professional]{thuthesis}
 
 \thusetup{
-  degree           = master,
-  degree-type      = professional,
   title            = {透水性混凝土路面材料的研究},
   degree-name      = {工程硕士},
   department       = {土木工程系},

diff --git a/testfiles/01-cover/master-1-6.tex b/testfiles/01-cover/master-1-6.tex
@@ -1,10 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=master, degree-type=professional]{thuthesis}
 
 \thusetup{
-  degree           = master,
-  degree-type      = professional,
   title            = {行政审批制度研究\\——以深圳市为例},
   degree-name      = {公共管理硕士},
   department       = {公共管理学院},

diff --git a/testfiles/01-cover/master-2-1.tex b/testfiles/01-cover/master-2-1.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=master]{thuthesis}
 
 \thusetup{
-  degree                = master,
   title*                = {Research on the Theory and Application of Unit Root, Cointegration and Structural Change},
   degree-name*          = {Master of Science},
   discipline*           = {Applied Economics},

diff --git a/testfiles/01-cover/master-2-2.tex b/testfiles/01-cover/master-2-2.tex
@@ -1,10 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=master, degree-type=professional]{thuthesis}
 
 \thusetup{
-  degree                = master,
-  degree-type           = professional,
   title*                = {Research on the Theory and Application of Unit Root, Cointegration and Structural Change},
   discipline*           = {Mechanical Engineering},
   degree-name*          = {Master of Engineering},

diff --git a/testfiles/01-cover/postdoc-1.tex b/testfiles/01-cover/postdoc-1.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=postdoc]{thuthesis}
 
 \thusetup{
-  degree     = postdoc,
   title      = {新型有机非线性光学材料的探索\\——从分子到晶体的材料化学过程},
   author     = {方奇},
   date       = {1994-04-01},

diff --git a/testfiles/01-cover/postdoc-2.tex b/testfiles/01-cover/postdoc-2.tex
@@ -1,9 +1,8 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
+\documentclass[degree=postdoc]{thuthesis}
 
 \thusetup{
-  degree        = postdoc,
   title         = {新型有机非线性光学材料的探索\\——从分子到晶体的材料化学过程},
   title*        = {THE EXPLORATION FOR NEW ORGANIC NLO\\
                    —MATERIALS TIIE MATERIALS CIIEMISTRY PROCESS\\

diff --git a/testfiles/02-copyright-bachelor.tex b/testfiles/02-copyright-bachelor.tex
@@ -1,10 +1,6 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
-
-\thusetup{
-  degree = bachelor,
-}
+\documentclass[degree=bachelor]{thuthesis}
 
 \begin{document}
 \START

diff --git a/testfiles/02-copyright-doctor.tex b/testfiles/02-copyright-doctor.tex
@@ -1,10 +1,6 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
-
-\thusetup{
-  degree = doctor,
-}
+\documentclass[degree=doctor]{thuthesis}
 
 \begin{document}
 \START

diff --git a/testfiles/02-copyright-doctor.tlg b/testfiles/02-copyright-doctor.tlg
@@ -548,8 +548,10 @@ Completed box being shipped out [1]
 ....\TU/FandolSong-Regular(0)/m/n/14.05249 容
 ....\penalty 10000
 ....\TU/FandolSong-Regular(0)/m/n/14.05249 ；
+....\rule(0.0+0.0)x-9.71027
 ....\penalty 10000
-....\glue -7.02625 plus 7.02625 minus 8.90929
+....\glue 11.5933 plus 7.02625 minus 8.90929
+....\rule(0.0+0.0)x-8.90929
 ....\TU/FandolSong-Regular(0)/m/n/14.05249 （
 ....\penalty 10000
 ....\glue 0.0

diff --git a/testfiles/02-copyright-master.tex b/testfiles/02-copyright-master.tex
@@ -1,10 +1,6 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
-
-\thusetup{
-  degree = master,
-}
+\documentclass[degree=master]{thuthesis}
 
 \begin{document}
 \START

diff --git a/testfiles/03-abstract-bachelor.tex b/testfiles/03-abstract-bachelor.tex
@@ -1,10 +1,6 @@
 \input{regression-test.tex}
 \input{fontset.tex}
-\documentclass{thuthesis}
-
-\thusetup{
-  degree = bachelor,
-}
+\documentclass[degree=bachelor]{thuthesis}
 
 \begin{document}
 \START