Update (20190610)

* 1.0.0rc preivew
sjtug · Jun 10, 2019 · bec3f55 · bec3f55
1 parent e950f5c
commit bec3f55
Show file tree

Hide file tree

Showing 6 changed files with 139 additions and 84 deletions.
diff --git a/sjtuthesis-bachelor.ltx b/sjtuthesis-bachelor.ltx
@@ -54,14 +54,14 @@
   \def\sjtu@titlemark{\sjtu@value@englishtitle}
   \newcommand\sjtu@fancyhead{%
     \parbox[b]{0.75\textwidth}{%
-      \raggedleft\nouppercase{\footnotesize\kaishu\sjtu@titlemark}}}
+      \raggedleft\nouppercase{\footnotesize\heiti\sjtu@titlemark}}}
   \newcommand\sjtu@fancyfoot[2]{%
     \small --~~Page~~{\bfseries{#1}}~~of~~{\bfseries{#2}}~~--}
 \else
   \def\sjtu@titlemark{\sjtu@value@title}
   \newcommand\sjtu@fancyhead{%
     \parbox[b]{0.75\textwidth}{%
-      \raggedleft\nouppercase{\small\kaishu\sjtu@titlemark}}}
+      \raggedleft\nouppercase{\small\heiti\sjtu@titlemark}}}
   \newcommand\sjtu@fancyfoot[2]{%
     \small 第~{\bfseries{#1}}~页\,共~{\bfseries{#2}}~页}
 \fi
@@ -98,6 +98,7 @@
   subsection/format = \zihao{-4}\normalfont,
 }
 \renewcommand{\cftchapfont}{\normalfont}
+\renewcommand{\cftchapleader}{\normalfont\cftdotfill{\cftdotsep}}
 \renewcommand{\cftchappagefont}{\normalfont}
 \NewDocumentEnvironment{abstract}{}%
 {\cleardoublepage
@@ -106,7 +107,8 @@
     \sjtu@value@title \vskip 2ex
     {\zihao{4}\sjtu@label@abstractChi}
   }
-  \markboth{\sjtu@label@abstractChi}{}
+  \markboth{\sjtu@label@abstractChi}%
+           {\sjtu@label@abstractChi}
 }{%
   \vspace{3ex}\noindent
   {\zihao{-4}\heiti\sjtu@label@keywordsChi}{\zihao{5}\sjtu@value@keywords}
@@ -116,7 +118,8 @@
   \chapter*{%
     \MakeUppercase\sjtu@value@englishtitle \vskip 2ex
     {\zihao{4}\MakeUppercase\sjtu@label@abstractEng}}
-  \markboth{\sjtu@label@abstractEng}{}
+  \markboth{\sjtu@label@abstractEng}%
+           {\sjtu@label@abstractEng}
 }{%
   \vspace{3ex}\noindent
   {\zihao{-4}\bfseries\sjtu@label@keywordsEng}

diff --git a/sjtuthesis-graduate.ltx b/sjtuthesis-graduate.ltx
@@ -89,7 +89,8 @@
     \sjtu@value@title \vskip 2ex
     \sjtu@label@abstractChi
   }
-  \markboth{\sjtu@label@abstractChi}{}
+  \markboth{\sjtu@label@abstractChi}%
+           {\sjtu@label@abstractChi}
   \zihao{4}
 }{%
   \vspace{3ex}\noindent
@@ -100,7 +101,8 @@
   \chapter*{%
     \MakeUppercase\sjtu@value@englishtitle \vskip 2ex
     \MakeUppercase\sjtu@label@abstractEng}
-  \markboth{\sjtu@label@abstractEng}{}
+  \markboth{\sjtu@label@abstractEng}%
+           {\sjtu@label@abstractEng}
   \zihao{4}
 }{%
   \vspace{3ex}\noindent

diff --git a/sjtuthesis.cls b/sjtuthesis.cls
@@ -30,6 +30,7 @@
   setkeys=\kvsetkeys}
 \DeclareStringOption[doctor]{degree}[doctor]
 \DeclareStringOption[chinese]{language}[chinese]
+\DeclareStringOption[gb7714-2015]{bibstyle}[gb7714-2015]
 \DeclareStringOption[5]{zihao}[5]
 \DeclareBoolOption{review}
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}}
@@ -75,7 +76,7 @@
 \RequirePackage{caption}
 \RequirePackage[list=off]{bicaption}
 \RequirePackage{subcaption}
-\RequirePackage[backend=biber,style=gb7714-2015]{biblatex}
+\RequirePackage[backend=biber,style=\sjtu@bibstyle]{biblatex}
 \RequirePackage[titles]{tocloft}
 \RequirePackage[inline]{enumitem}
 \RequirePackage[perpage, bottom]{footmisc}
@@ -226,11 +227,20 @@
 \setcounter{secnumdepth}{3}
 \setcounter{tocdepth}{2}
 \patchcmd\tableofcontents
-{\chapter}
-{\cleardoublepage%
-  \pdfbookmark[0]{\contentsname}{toc}%
-  \chapter}
-{}{}
+  {\chapter}
+  {\pdfbookmark[0]{\contentsname}{toc}%
+   \chapter}
+  {}{}
+\patchcmd\listoffigures
+  {\chapter}
+  {\pdfbookmark[0]{\listfigurename}{lof}%
+   \chapter}
+  {}{}
+\patchcmd\listoftables
+  {\chapter}
+  {\pdfbookmark[0]{\listtablename}{lot}%
+   \chapter}
+  {}{}
 \renewcommand\cftfigpresnum{\sjtu@label@figure~}
 \newlength{\sjtu@cftfignumwidth@tmp}
 \settowidth{\sjtu@cftfignumwidth@tmp}{\cftfigpresnum}
@@ -266,13 +276,13 @@
 \captionsetup[sub]{font=footnotesize}
 \newcommand\sjtu@authconf{%
   \par\hspace{8em}
-  {\heiti 保　密} $\square$，在 \uline{\hspace{3em}}
+  {\heiti 保\quad 密} $\square$，在 \uline{\hspace{3em}}
   年解密后适用本授权书。\par
   本\sjtu@label@thesiscat 属于：
   \par\hspace{8em}
   {\heiti 不保密} $\square$。
   \vskip 1ex
-  （请在以上方框内打钩“$\checkmark$”）
+  （请在以上方框内打“$\checkmark$”）
 }
 \newcommand\sjtu@signbox[1]{%
   \parbox{.45\textwidth}{%
@@ -324,14 +334,17 @@
 }
 \NewDocumentEnvironment{nomenclature}{m}
 {\cleardoublepage
-  \chapter{\sjtu@label@nomenclature}
-  \markboth{\sjtu@label@nomenclature}{}
+  \pdfbookmark[0]{\sjtu@label@nomenclature}{nomenclature}
+  \chapter*{\sjtu@label@nomenclature}
+  \markboth{\sjtu@label@nomenclature}%
+           {\sjtu@label@nomenclature}
   \begin{longtable}{#1}}
 {\end{longtable}}
 \NewDocumentEnvironment{summary}{}{%
   \cleardoublepage
   \chapter*{\sjtu@label@summary}
-  \markboth{\sjtu@label@summary}{}
+  \markboth{\sjtu@label@summary}%
+           {\sjtu@label@summary}
   \addcontentsline{toc}{chapter}{\sjtu@label@summary}
 }{}
 \newcommand\sjtu@acknowledgements[1]{\long\gdef\sjtu@acknowledgements@body{#1}}
@@ -340,7 +353,8 @@
 {\ifsjtu@review\relax\else%
     \cleardoublepage
     \chapter*{\sjtu@label@acknowledgements}
-    \markboth{\sjtu@label@acknowledgements}{}
+    \markboth{\sjtu@label@acknowledgements}%
+             {\sjtu@label@acknowledgements}
     \addcontentsline{toc}{chapter}{\sjtu@label@acknowledgements}
     \sjtu@acknowledgements@body
   \fi}
@@ -351,7 +365,7 @@
       \setlength{\labelsep}{\biblabelsep}%
       \setlength{\leftmargin}{\bibhang}%
       \addtolength{\leftmargin}{\labelwidth}%
-      \setlength{\itemindent}{\bibitemindent}%
+      \setlength{\itemindent}{0pt}%
       \setlength{\itemsep}{\bibitemsep}%
       \setlength{\parsep}{\bibparsep}}%
   \usecounter{enumiv}%
@@ -363,19 +377,22 @@
 \NewDocumentEnvironment{publications}{O{99}}
 {\cleardoublepage
   \chapter{\sjtu@label@publications}
-  \markboth{\sjtu@label@publications}{}
+  \markboth{\sjtu@label@publications}%
+           {\sjtu@label@publications}
   \begin{sjtu@bibliolist}[#1]}
 {\end{sjtu@bibliolist}}
 \NewDocumentEnvironment{patents}{O{99}}
 {\cleardoublepage
   \chapter{\sjtu@label@patents}
-  \markboth{\sjtu@label@patents}{}
+  \markboth{\sjtu@label@patents}%
+           {\sjtu@label@patents}
   \begin{sjtu@bibliolist}[#1]}
 {\end{sjtu@bibliolist}}
 \NewDocumentEnvironment{projects}{O{99}}
 {\cleardoublepage
   \chapter{\sjtu@label@projects}
-  \markboth{\sjtu@label@projects}{}
+  \markboth{\sjtu@label@projects}%
+           {\sjtu@label@projects}
   \begin{sjtu@bibliolist}[#1]}
 {\end{sjtu@bibliolist}}
 \newcommand\sjtu@resume[1]{\long\gdef\sjtu@resume@body{#1}}
@@ -384,7 +401,8 @@
 {\ifsjtu@review\relax\else%
   \cleardoublepage
   \chapter{\sjtu@label@resume}
-  \markboth{\sjtu@label@resume}{}
+  \markboth{\sjtu@label@resume}%
+           {\sjtu@label@resume}
   \sjtu@resume@body
 \fi}
 \AtBeginDocument{
@@ -400,10 +418,10 @@
     }
   \fi
   \hypersetup{%
-    pdftitle    = \sjtu@value@englishtitle,
-    pdfauthor   = \sjtu@value@englishauthor,
-    pdfsubject  = \sjtu@label@subjectEng,
-    pdfkeywords = \sjtu@value@englishkeywords,
+    pdftitle    = \sjtu@value@title,
+    pdfauthor   = \sjtu@value@author,
+    pdfsubject  = \sjtu@label@subjectChi,
+    pdfkeywords = \sjtu@value@keywords,
     pdfcreator  = {LaTeX with SJTUThesis \version}
   }%
 }