更新SJTU模板

Makefile

@@ -3,4 +3,5 @@ pdf:
 
 wordcount:
 	@texcount _book/sjtu-thesis-rmd.tex -inc -ch-only | awk '/total/ {getline; print "纯中文字数\t\t\t:",$$4}'
+	@texcount _book/sjtu-thesis-rmd.tex -inc -char-only | awk '/total/ {getline; print "英文字符数\t\t\t:",$$4}'
 	@texcount _book/sjtu-thesis-rmd.tex -inc -chinese | awk '/total/ {getline; print "总字数（英文单词 + 中文字）\t:",$$4}'

README.md

@@ -1,6 +1,6 @@
 # 上海交通大学学位论文 Bookdown 模板
 
-这是为撰写上海交通大学学士、硕士或博士论文而准备的 Bookdown 模板，非官方出品。详细使用说明参见本模板内容。据最新[2018-11-17]的[上海交通大学学位论文Latex模板](https://github.com/sjtug/SJTUThesis)， 参考[谢益辉Bookdown中文模板](https://github.com/yihui/bookdown-chinese)改写而成。在完全兼容[原交大论文LaTeX模板](https://github.com/sjtug/SJTUThesis)的基础上，通过使用 Markdown，大幅度降低撰写论文的难度，引入 R 语言，提高论文作图、数据处理的能力，真正做到让论文能够随着数据变化而变化，而不是数据错误了，要逐个手动改变。对于无法使用 Rmarkdown 实现的内容，完全复制粘贴 LaTeX 代码也能够运行，可能会多一些括号之类的，请删除。
+这是为撰写上海交通大学学士、硕士或博士论文而准备的 Bookdown 模板，非官方出品。详细使用说明参见本模板内容。据最新[2019-06-11]的[上海交通大学学位论文Latex模板](https://github.com/sjtug/SJTUThesis)， 参考[谢益辉Bookdown中文模板](https://github.com/yihui/bookdown-chinese)改写而成。在完全兼容[原交大论文LaTeX模板](https://github.com/sjtug/SJTUThesis)的基础上，通过使用 Markdown，大幅度降低撰写论文的难度，引入 R 语言，提高论文作图、数据处理的能力，真正做到让论文能够随着数据变化而变化，而不是数据错误了，要逐个手动改变。对于无法使用 Rmarkdown 实现的内容，完全复制粘贴 LaTeX 代码也能够运行，可能会多一些括号之类的，请删除。
 
 **本模板会保持sjtuthesis.cls和sjtuthesis.cfg两个文件跟原论文模板一致。**
 

bib/packages.bib

@@ -9,36 +9,36 @@ @Manual{R-base
 @Manual{R-bookdown,
   title = {bookdown: Authoring Books and Technical Documents with R Markdown},
   author = {Yihui Xie},
-  note = {R package version 0.7.13},
-  url = {https://github.com/rstudio/bookdown},
-  year = {2018},
+  year = {2019},
+  note = {R package version 0.11},
+  url = {https://CRAN.R-project.org/package=bookdown},
 }
 @Manual{R-citr,
   title = {citr: RStudio Add-in to Insert Markdown Citations},
   author = {Frederik Aust},
-  year = {2016},
-  note = {R package version 0.2.0},
+  year = {2018},
+  note = {R package version 0.3.0},
   url = {https://CRAN.R-project.org/package=citr},
 }
 @Manual{R-DT,
   title = {DT: A Wrapper of the JavaScript Library 'DataTables'},
-  author = {Yihui Xie},
-  year = {2018},
-  note = {R package version 0.4},
+  author = {Yihui Xie and Joe Cheng and Xianying Tan},
+  year = {2019},
+  note = {R package version 0.6},
   url = {https://CRAN.R-project.org/package=DT},
 }
 @Manual{R-htmlwidgets,
   title = {htmlwidgets: HTML Widgets for R},
   author = {Ramnath Vaidyanathan and Yihui Xie and JJ Allaire and Joe Cheng and Kenton Russell},
   year = {2018},
-  note = {R package version 1.2},
+  note = {R package version 1.3},
   url = {https://CRAN.R-project.org/package=htmlwidgets},
 }
 @Manual{R-knitr,
   title = {knitr: A General-Purpose Package for Dynamic Report Generation in R},
   author = {Yihui Xie},
-  year = {2018},
-  note = {R package version 1.20},
+  year = {2019},
+  note = {R package version 1.23},
   url = {https://CRAN.R-project.org/package=knitr},
 }
 @Manual{R-miniUI,
@@ -50,9 +50,9 @@ @Manual{R-miniUI
 }
 @Manual{R-rmarkdown,
   title = {rmarkdown: Dynamic Documents for R},
-  author = {JJ Allaire and Yihui Xie and Jonathan McPherson and Javier Luraschi and Kevin Ushey and Aron Atkins and Hadley Wickham and Joe Cheng and Winston Chang},
-  year = {2018},
-  note = {R package version 1.10},
+  author = {JJ Allaire and Yihui Xie and Jonathan McPherson and Javier Luraschi and Kevin Ushey and Aron Atkins and Hadley Wickham and Joe Cheng and Winston Chang and Richard Iannone},
+  year = {2019},
+  note = {R package version 1.13},
   url = {https://CRAN.R-project.org/package=rmarkdown},
 }
 @Manual{R-webshot,

index.Rmd

@@ -9,7 +9,7 @@ options(
 )
 
 # 填上你需要用到的包
-lapply(c('DT', 'citr', 'formatR', 'svglite', 'webshot', 'devtools'), function(pkg) {
+lapply(c('diagram','DT', 'citr', 'formatR', 'svglite', 'webshot', 'devtools', 'shape'), function(pkg) {
   if (system.file(package = pkg) == '') install.packages(pkg)
 })
 

sjtuthesis.cfg

@@ -6,67 +6,110 @@
 \ProvidesFile{sjtuthesis.cfg}[2016/04/06 v0.9 sjtuthesis configuration file]
 
 %% labels in the title page
-\def\sjtu@label@major{专业}
-\def\sjtu@label@title{论文题目}
-\def\sjtu@label@thesis{学位论文}
-\def\sjtu@label@coadvisor{副导师}
-\def\sjtu@label@defenddate{答辩日期}
-\def\sjtu@label@institute{学院(系)}
-\ifsjtu@bachelor
-  \def\sjtu@label@author{学生姓名}
-  \def\sjtu@label@studentnumber{学生学号}
-  \def\sjtu@label@advisor{指导教师}
+\ifsjtu@master
+  \def\sjtu@label@major{学科：}
+  \def\sjtu@label@title{论文题目}
+  \def\sjtu@label@thesis{学位论文}
+  \def\sjtu@label@coadvisor{副导师：}
+  \def\sjtu@label@defenddate{答辩日期：}
+  \def\sjtu@label@institute{所在单位：}
+  \def\sjtu@label@cnacademicdegree{申请学位：}
+  \def\sjtu@label@school{授予学位单位：}
+  \def\sjtu@label@author{硕士研究生：}
+  \def\sjtu@label@studentnumber{学号：}
+  \def\sjtu@label@advisor{导师：}
 \else
-  \def\sjtu@label@author{论文作者}
-  \def\sjtu@label@studentnumber{学号}
-  \def\sjtu@label@advisor{导师}
+  \def\sjtu@label@major{专业}
+  \def\sjtu@label@title{论文题目}
+  \def\sjtu@label@thesis{学位论文}
+  \def\sjtu@label@coadvisor{副导师}
+  \def\sjtu@label@defenddate{答辩日期}
+  \def\sjtu@label@institute{学院(系)}
+  \def\sjtu@label@coursepaper{课程论文}
+  \ifsjtu@bachelor
+    \def\sjtu@label@author{学生姓名}
+    \def\sjtu@label@studentnumber{学生学号}
+    \def\sjtu@label@advisor{指导教师}
+  \else
+    \ifsjtu@coursepaper
+      \def\sjtu@label@author{姓名}
+      \def\sjtu@label@studentnumber{学号}
+      \def\sjtu@label@coursename{课程}
+    \else
+      \def\sjtu@label@author{论文作者}
+      \def\sjtu@label@studentnumber{学号}
+      \def\sjtu@label@advisor{导师}
+    \fi
+  \fi
 \fi
 
 %% string values filled in the title page
 \def\sjtu@value@classification{}
 \def\sjtu@value@confidential{}
 \def\sjtu@value@serialnumber{}
 \def\sjtu@value@school{}
-\ifsjtu@bachelor
-  \def\sjtu@value@chinesedegree{学士}
-  \def\sjtu@value@englishdegree{Bachelor}
+\ifsjtu@coursepaper
+  \def\sjtu@value@chinesedegree{}
+  \def\sjtu@value@englishdegree{}
 \else
-  \ifsjtu@master
-    \def\sjtu@value@chinesedegree{硕士}
-    \def\sjtu@value@englishdegree{Master}
+  \ifsjtu@bachelor
+    \def\sjtu@value@chinesedegree{学士}
+    \def\sjtu@value@englishdegree{Bachelor}
   \else
-    \ifsjtu@doctor
-      \def\sjtu@value@chinesedegree{博士}
-      \def\sjtu@value@englishdegree{Doctor}
+    \ifsjtu@master
+      \def\sjtu@value@chinesedegree{硕士}
+      \def\sjtu@value@englishdegree{Master}
     \else
-      \ClassError{sjtuthesis}%
-      {Unknown value for degree.}{}
-    \fi 
+      \ifsjtu@doctor
+        \def\sjtu@value@chinesedegree{博士}
+        \def\sjtu@value@englishdegree{Doctor}
+      \else
+        \ClassError{sjtuthesis}%
+        {Unknown value for degree.}{}
+      \fi
+    \fi
+  \fi
+  \ifsjtu@master
+    \def\sjtu@label@statement{\sjtu@value@school\sjtu@value@chinesedegree\sjtu@label@thesis}
+  \else
+    \def\sjtu@label@statement{申请\sjtu@value@school\sjtu@value@chinesedegree\sjtu@label@thesis}
   \fi
 \fi
-\def\sjtu@label@statement{申请\sjtu@value@school\sjtu@value@chinesedegree\sjtu@label@thesis} 
 
 %% 论文原创性声明
 \def\sjtu@label@original{学位论文原创性声明}
 \def\sjtu@label@authorization{学位论文版权使用授权书}
 \def\sjtu@label@authorsign{学位论文作者签名：}
 \def\sjtu@label@Supervisorsign{指导教师签名：}
-\def\sjtu@label@originalDate{日\hspace{1em}期：\hrulefill\hrulefill 年 \hrulefill 月 \hrulefill 日}
-\def\sjtu@label@originalcontent{本人郑重声明：所呈交的学位论文，是本人在导师的指导下， 独立进行研究工作所取得的成果。除文中已经注明引用的内容外，本论文不包含任何其他个人或集体已经发表或撰写过的作品成果。对本文的研究做出重要贡献的个人和集体，均已在文中以明确方式标明。本人完全意识到本声明的法律结果由本人承担。
+\def\sjtu@label@originalDate{日期：\hrulefill\hrulefill 年 \hrulefill 月 \hrulefill 日}
+\def\sjtu@label@originalcontent{是本人在导师的指导下， 独立进行研究工作所取得的成果。除文中已经注明引用的内容外，本论文不包含任何其他个人或集体已经发表或撰写过的作品成果。对本文的研究做出重要贡献的个人和集体，均已在文中以明确方式标明。本人完全意识到本声明的法律结果由本人承担。
 }
 \def\sjtu@label@authorizationcontent{本学位论文作者完全了解学校有关保留、使用学位论文的规定，同意学校保留并向国家有关部门或机构送交论文的复印件和电子版，允许论文被查阅和借阅。本人授权上海交通大学可以将本学位论文的全部或部分内容编入有关数据库进行检索，可以采用影印、缩印或扫描等复制手段保存和汇编本学位论文。\par
         本学位论文属于\\
         \hspace*{9em}\textbf{保\hspace{1em}密} $\square$，在~\hrulefill~年解密后适用本授权书。\\
         \hspace*{9em}\textbf{不保密} $\square$。\\
-        （请在以上方框内打$\checked$）
+        （请在以上方框内打“$\checked$”）
 }
 
 %% labels in the english title page
-\def\sjtu@label@englishadvisor{Advisor}
-\def\sjtu@label@englishcoadvisor{Co-advisor}
-\def\sjtu@label@englishstatement{Submitted in total fulfillment
-  of the requirements for the degree of \sjtu@value@englishdegree \\
-  in \sjtu@value@englishmajor}
+\ifsjtu@master
+  \def\sjtu@label@englishadvisor{Supervisor:}
+  \def\sjtu@label@englishcoadvisor{Co-supervisor:}
+  \def\sjtu@label@englishauthor{Candidate:}
+  \def\sjtu@label@englishstudentid{Student ID:}
+  \def\sjtu@label@enacademicdegree{Academic Degree Applied for:}
+  \def\sjtu@label@englishmajor{Speciality:}
+  \def\sjtu@label@englishinstitutemaster{Affiliation:}
+  \def\sjtu@label@englishdate{Date of Defence:}
+  \def\sjtu@label@englishschool{Degree-Conferring-Institution:}
+  \def\sjtu@label@englishstatement{Dissertation Submitted to Shanghai Jiao Tong University \\[8pt] for the Degree of \sjtu@value@englishdegree}
+\else
+  \def\sjtu@label@englishadvisor{Advisor}
+  \def\sjtu@label@englishcoadvisor{Co-advisor}
+  \def\sjtu@label@englishstatement{Submitted in total fulfillment
+    of the requirements for the degree of \sjtu@value@englishdegree \\
+    in \sjtu@value@englishmajor}
+\fi
 
 %% labels in the abstracts
 \def\sjtu@label@chineseabstract{摘~~~~要}
@@ -125,9 +168,14 @@
 \def\sjtu@label@abstract{\sjtu@label@chineseabstract}
 \def\sjtu@contentsname{目~~~~录}
 \def\sjtu@figurename{图}
-\def\sjtu@listfigurename{插图索引}
+\ifsjtu@master
+  \def\sjtu@listfigurename{图~~录}
+  \def\sjtu@listtablename{表~~录}
+\else
+  \def\sjtu@listfigurename{插图索引}
+  \def\sjtu@listtablename{表格索引}
+\fi
 \def\sjtu@tablename{表}
-\def\sjtu@listtablename{表格索引}
 \def\sjtu@algorithmicrequire{输入:}
 \def\sjtu@algorithmicensure{输出:}
 \def\sjtu@listalgorithmname{算法索引}