uestcthesis (16mar14)

git-svn-id: svn://tug.org/texlive/trunk@33194 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 654 insertions, 178 deletions

diff --git a/Master/texmf-dist/tex/latex/uestcthesis/uestcthesis.cls b/Master/texmf-dist/tex/latex/uestcthesis/uestcthesis.cls
index cbb3ee47ef0..c4e1bceb2db 100644
--- a/Master/texmf-dist/tex/latex/uestcthesis/uestcthesis.cls
+++ b/Master/texmf-dist/tex/latex/uestcthesis/uestcthesis.cls
@@ -29,8 +29,11 @@
 
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \ProvidesClass{uestcthesis}
-    [2013/06/07 v0.4.8 UESTC thesis class]
+    [2014/03/12 v1.0.0 UESTC thesis class]
 \LoadClass[cs4size,UTF8,fancyhdr,hyperref,fntef,openany]{ctexbook}[2011/03/11]
+\RequirePackage{mathptmx}
+\DeclareSymbolFont{symbols} {OMS}{cmsy}{m}{n}
+\renewcommand{\ttfamily}{\CTEX@save@ttfamily \CJKfamily {\CTEX@rm@family }}
 \RequirePackage{etoolbox}[2011/01/03]
 \RequirePackage{ifthen}
 \newcommand{\bachelor@uestcthesis}{
@@ -61,6 +64,9 @@
 \newcommand{\thesisname@english}{Master Thesis of University of Electronic Science and Technology of China}
 
 \newcommand{\chapternumberformat@uestcthesis}{\chinese{chapter}}
+\renewcommand{\firsttitlepage}{\firsttitlepage@master}
+\renewcommand{\secondtitlepage}{\secondtitlepage@Academic}
+\renewcommand{\thirdtitlepage}{\thirdtitlepage@Master}
 }
 \newcommand{\doctor@uestcthesis}{
 \newcommand{\degree@uestcthesis}{doctor}
@@ -79,6 +85,9 @@
 \newcommand{\thesisname@english}{Doctor Thesis of University of Electronic Science and Technology of China}
 
 \newcommand{\chapternumberformat@uestcthesis}{\chinese{chapter}}
+\renewcommand{\firsttitlepage}{\firsttitlepage@doctor}
+\renewcommand{\secondtitlepage}{\secondtitlepage@Academic}
+\renewcommand{\thirdtitlepage}{\thirdtitlepage@Doctor}
 }
 \newcommand{\tocname@uestcthesis}{\zihao{5}目\enspace 录}
 \newcommand{\chaptername@uestcthesis}{
@@ -91,9 +100,15 @@
 }
 \newcommand{\acknowledgementsname@uestcthesis}{致\enspace 谢}
 \newcommand{\glossaryname@uestcthesis}{主要符号表}
-\newcommand{\entryname@uestcthesis}{符号或术语}
+\newcommand{\acronymname@uestcthesis}{缩略词表}
+\newcommand{\entryname@uestcthesis}{符号}
 \newcommand{\descriptionname@uestcthesis}{说明}
-\newcommand{\glspageheader@uestcthesis}{页码}
+\newcommand{\pagelistname@uestcthesis}{页码}
+\newcommand{\acronymheader@uestcthesis}{缩略词}
+\newcommand{\acronymfull@uestcthesis}{英文全称}
+\newcommand{\acronymtranslation@uestcthesis}{中文全称}
+\renewcommand{\listfigurename}{图目录}
+\renewcommand{\listtablename}{表目录}
 \newcommand{\english@uestcthesis}{
 \renewcommand{\tocname@uestcthesis}{\zihao{5}Contents}
 \renewcommand{\chaptername@uestcthesis}{
@@ -111,26 +126,96 @@
 \renewcommand{\CTEX@figurename}{Figure}
 \renewcommand{\CTEX@tablename}{Table}
 \renewcommand{\glossaryname@uestcthesis}{Glossary}
+\renewcommand{\acronymname@uestcthesis}{Acronyms}
 \renewcommand{\entryname@uestcthesis}{Notation}
 \renewcommand{\descriptionname@uestcthesis}{Description}
-\renewcommand{\glspageheader@uestcthesis}{Page}
+\renewcommand{\pagelistname@uestcthesis}{Page List}
+\renewcommand{\acronymheader@uestcthesis}{Acronym}
+\renewcommand{\acronymfull@uestcthesis}{Full Name}
+\renewcommand{\acronymtranslation@uestcthesis}{Chinese}
 \renewcommand{\CTEX@appendixname}{Appendix~}
+\renewcommand{\listfigurename}{List of Figures}
+\renewcommand{\listtablename}{List of Tables}
 }
+\newcommand{\firsttitlepage}{\newpage 错误：没有指定封面！}
+\newcommand{\secondtitlepage}{\newpage 错误：没有指定中文扉页！}
+\newcommand{\thirdtitlepage}{\newpage 错误：没有指定英文扉页！}
 \DeclareOption{bachelor}{\bachelor@uestcthesis}
 \DeclareOption{master}{\master@uestcthesis}
 \DeclareOption{doctor}{\doctor@uestcthesis}
 \DeclareOption{english}{\english@uestcthesis}
+\DeclareOption{engineeringmaster}{%
+\master@uestcthesis
+\renewcommand{\secondtitlepage}{\secondtitlepage@Engineering}
+}
+\DeclareOption{engineeringdoctor}{%
+\doctor@uestcthesis
+\renewcommand{\firsttitlepage}{\firsttitlepage@engineeringdoctor}
+\renewcommand{\secondtitlepage}{\secondtitlepage@Engineering}
+}
+\DeclareOption{professionalmaster}{%
+\master@uestcthesis
+\renewcommand{\firsttitlepage}{\firsttitlepage@professionalmaster}
+\renewcommand{\secondtitlepage}{\secondtitlepage@Professional}
+}
+\DeclareOption{researchreport}{%
+\master@uestcthesis
+\renewcommand{\secondtitlepage}{\secondtitlepage@ResearchReport}
+\renewcommand{\thirdtitlepage}{\thirdtitlepage@MasterResearchReport}
+}
+\DeclareOption{withoutforepages}{
+\newcommand{\withoutforepages@uestcthesis}{}
+}
+\DeclareOption{onlychapters}{
+\newcommand{\withoutforepages@uestcthesis}{}
+\newcommand{\onlychapters@uestcthesis}{}
+}
+\DeclareOption{cv}{
+\newcommand{\usecv@uestcthesis}{\input{contents/cv.tex}}
+}
+\newcommand{\insertlof}{}
+\newcommand{\insertlot}{}
+\DeclareOption{listoffigures}{\renewcommand{\insertlof}{%
+\clearpage{\pagestyle{empty}\cleardoublepage}
+\figureslistmatter
+\def\l@figure##1##2{\ifnum 0>\c@tocdepth \else \vskip \z@ \@plus .2\p@ {\leftskip
+0em\relax \rightskip \@tocrmarg \parfillskip -\rightskip \parindent 0em\relax
+\@afterindenttrue \interlinepenalty \@M \leavevmode \@tempdima 1em\relax \advance
+\leftskip \@tempdima \null \nobreak \hskip -\leftskip {\CTEX@figurename~##1}\nobreak \leaders
+\hbox {$\m@th \mkern \@dotsep mu\hbox {.}\mkern \@dotsep mu$}\hfill \nobreak
+\hb@xt@ \@pnumwidth {\hfil \normalfont \normalcolor ##2}\par }\fi}
+\listoffigures
+}}
+
+\DeclareOption{listoftables}{\renewcommand{\insertlot}{%
+\clearpage{\pagestyle{empty}\cleardoublepage}
+\tableslistmatter
+\def\l@table##1##2{\ifnum 0>\c@tocdepth \else \vskip \z@ \@plus .2\p@ {\leftskip
+0em\relax \rightskip \@tocrmarg \parfillskip -\rightskip \parindent 0em\relax
+\@afterindenttrue \interlinepenalty \@M \leavevmode \@tempdima 1em\relax \advance
+\leftskip \@tempdima \null \nobreak \hskip -\leftskip {\CTEX@tablename~##1}\nobreak \leaders
+\hbox {$\m@th \mkern \@dotsep mu\hbox {.}\mkern \@dotsep mu$}\hfill \nobreak
+\hb@xt@ \@pnumwidth {\hfil \normalfont \normalcolor ##2}\par }\fi}
+\listoftables
+}}
 \ProcessOptions\relax
+\ifdefstring{\degree@uestcthesis}{bachelor}{
 \RequirePackage[a4paper,headheight=12.65pt,headsep=4mm,includeheadfoot,centering,
                 top=2.75cm,left=3cm]{geometry}
+}{
+\RequirePackage[a4paper,headheight=12.65pt,headsep=4mm,includeheadfoot,centering,
+                top=2.08cm,left=3cm]{geometry}
+}
 \linespread{1.391}
 \parskip=0bp plus 10bp minus 1bp
 \raggedbottom
 \RequirePackage{graphicx,calc,float,texnames}
 \RequirePackage[format=hang,labelsep=space]{caption}
 \intextsep=6bp
-\captionsetup[figure]{aboveskip=0bp,belowskip=-7mm+6bp}
-\captionsetup[table]{aboveskip=0bp,belowskip=0bp}
+\textfloatsep=6bp
+\floatsep=6bp
+\captionsetup[figure]{aboveskip=0bp,belowskip=0bp}
+\captionsetup[table]{aboveskip=0bp,belowskip=6bp}
 \RequirePackage{booktabs,tabularx,threeparttable,longtable}
 \DeclareCaptionFont{capfont}{\zihao{5}}
 \captionsetup{font=capfont}
@@ -141,23 +226,92 @@
 \RequirePackage{flafter}
 \newcommand{\newcmds@uestcthesis}{
 \newcommand{\pic}[4][htbp]{
-\begin{figure}[##1]
-\centering
-  \includegraphics[##3]{##4}
-  \caption{##2}
-  \label{##4}
-\end{figure}
-}
-\newcommand{\subpiclabel}{}%定义一个空的多图环境整体的标签变量
-\newcommand{\subpiccaption}{}%定义一个空的多图环境整体的标题变量
+\begin{figure}[##1]%
+\centering%
+  \includegraphics[##3]{##4}%
+  \caption{##2}%
+  \label{##4}%
+  \vspace{6bp}%
+\end{figure}%
+}
+\newcommand{\clearallsubfigcaptions}{
+\gdef\subfigcaptionA{}\gdef\subfigcaptionB{}\gdef\subfigcaptionC{}%
+\gdef\subfigcaptionD{}\gdef\subfigcaptionE{}\gdef\subfigcaptionF{}%
+\gdef\subfigcaptionG{}\gdef\subfigcaptionH{}\gdef\subfigcaptionI{}%
+\gdef\subfigcaptionJ{}\gdef\subfigcaptionK{}\gdef\subfigcaptionL{}%
+\gdef\subfigcaptionM{}\gdef\subfigcaptionN{}\gdef\subfigcaptionO{}%
+\gdef\subfigcaptionP{}\gdef\subfigcaptionQ{}\gdef\subfigcaptionR{}%
+\gdef\subfigcaptionS{}\gdef\subfigcaptionT{}%
+}
+\clearallsubfigcaptions
+\def\@makesubfigurecaption ##1##2{\setbox \@tempboxa \hbox {\subcapsize {
+\subcaplabelfont ##1}{\subcapfont \ignorespaces }}\@tempdimb =-\subfigcapmargin
+\multiply \@tempdimb \tw@ \advance \@tempdimb \@tempdima \hbox to\@tempdima
+{\hss \ifdim \wd \@tempboxa >\@tempdimb \subfig@caption {##1}{}\else
+\ifsubcapnooneline \subfig@caption {##1}{}\else \box \@tempboxa \fi \fi \hss }
+\ifthenelse{\equal{\subfigcaptionA}{}}{\gdef\subfigcaptionA{{(a)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionB}{}}{\gdef\subfigcaptionB{；{(b)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionC}{}}{\gdef\subfigcaptionC{；{(c)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionD}{}}{\gdef\subfigcaptionD{；{(d)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionE}{}}{\gdef\subfigcaptionE{；{(e)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionF}{}}{\gdef\subfigcaptionF{；{(f)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionG}{}}{\gdef\subfigcaptionG{；{(g)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionH}{}}{\gdef\subfigcaptionH{；{(h)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionI}{}}{\gdef\subfigcaptionI{；{(i)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionJ}{}}{\gdef\subfigcaptionJ{；{(j)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionK}{}}{\gdef\subfigcaptionK{；{(k)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionL}{}}{\gdef\subfigcaptionL{；{(l)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionM}{}}{\gdef\subfigcaptionM{；{(m)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionN}{}}{\gdef\subfigcaptionN{；{(n)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionO}{}}{\gdef\subfigcaptionO{；{(o)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionP}{}}{\gdef\subfigcaptionP{；{(p)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionQ}{}}{\gdef\subfigcaptionQ{；{(q)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionR}{}}{\gdef\subfigcaptionR{；{(r)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionS}{}}{\gdef\subfigcaptionS{；{(s)}{\ignorespaces ##2}}}
+{\ifthenelse{\equal{\subfigcaptionT}{}}{\gdef\subfigcaptionT{；{(t)}{\ignorespaces ##2}}}
+{\gdef\subfigcaptionA{子图不能超过20个！！！}}}}}}}}}}}}}}}}}}}}}}
+\newcommand{\allsubpiccaptions}{%
+\subfigcaptionA\subfigcaptionB\subfigcaptionC\subfigcaptionD\subfigcaptionE%
+\subfigcaptionF\subfigcaptionG\subfigcaptionH\subfigcaptionI\subfigcaptionJ%
+\subfigcaptionK\subfigcaptionL\subfigcaptionM\subfigcaptionN\subfigcaptionO%
+\subfigcaptionP\subfigcaptionQ\subfigcaptionR\subfigcaptionS\subfigcaptionT}
+\newcommand{\subpiclabel}{}
+\newcommand{\subpiccaption}{}
+\newsavebox{\tempsubpiccaptionbox}
+\newlength{\tempsubpiccaptionindent}
+\newlength{\tempsubpiccaptionheadindent}
+\newlength{\tempsubpiccaptionwidth}
 \newenvironment{pics}[3][htbp]{%定义多图环境
 \renewcommand{\subpiclabel}{##3}%设置多图环境整体的标签
 \renewcommand{\subpiccaption}{##2}%设置多图环境整体的标题。这里先定义两个空变量，又设置值，是因为在定义一个环境时，环境结尾中不能调用##2，##3等传入的值。所以要在环境结尾中插入标题和标签就只能这么做了。
-\begin{figure}[##1]
-\centering}
-{\caption{\subpiccaption}
-\label{\subpiclabel}
-\end{figure}
+\begin{figure}[##1]%
+\begin{center}%
+}%
+{%
+\end{center}%
+\raggedright%
+\sbox{\tempsubpiccaptionbox}{\parbox{\textwidth}%
+{\zihao{5}图~\thefigure~\subpiccaption}}%
+\settowidth{\tempsubpiccaptionheadindent}{\zihao{5}图~\thefigure~}%
+\ifthenelse{\lengthtest{\ht\tempsubpiccaptionbox > 16pt}}{%THEN
+\noindent\caption{\subpiccaption}\label{\subpiclabel}\par%
+\noindent\hspace*{\tempsubpiccaptionheadindent}%
+\parbox{\textwidth-\tempsubpiccaptionheadindent}{\zihao{5}\allsubpiccaptions}%
+}{%ELSE
+{\centering\caption{\subpiccaption}\label{\subpiclabel}}\par
+\sbox{\tempsubpiccaptionbox}{\zihao{5}图~\thefigure~\subpiccaption}%
+\setlength{\tempsubpiccaptionindent}{\textwidth}%
+\addtolength{\tempsubpiccaptionindent}{-\wd\tempsubpiccaptionbox}%
+\setlength{\tempsubpiccaptionindent}{.5\tempsubpiccaptionindent}%
+\setlength{\tempsubpiccaptionwidth}{\textwidth}%
+\addtolength{\tempsubpiccaptionwidth}{-\tempsubpiccaptionindent}%
+\addtolength{\tempsubpiccaptionwidth}{-\tempsubpiccaptionheadindent}%
+\hspace*{\tempsubpiccaptionindent}\hspace*{\tempsubpiccaptionheadindent}%
+\parbox{\tempsubpiccaptionwidth}{\zihao{5}\allsubpiccaptions}%
+}%
+\vspace{6bp}%
+\end{figure}%
+\clearallsubfigcaptions%
 }
 \newcommand{\addsubpic}[3]{
  \subfigure[##1]{\label{##3}\includegraphics[##2]{##3}}
@@ -239,14 +393,14 @@
 \fancyfoot[C]{\zihao{-5}\thepage}%页码位于页面底端，居中打印。
 }
 \newcommand{\glossarymatterfancy}{%定义主要符号表版式设置
-\fancypagestyle{plain}{
 \fancyhf{}
 \fancyhead[C]{\zihao{5}\glossaryname@uestcthesis}%
 \fancyfoot[C]{\zihao{-5}\thepage}%
 }
-\renewcommand{\glossarypreamble}{%
-\fancyhead[C]{\zihao{5}\glossaryname@uestcthesis}%页眉居中打印“主要符号表”
-}
+\newcommand{\acronymnamematterfancy}{%定义缩略词表版式设置
+\fancyhf{}
+\fancyhead[C]{\zihao{5}\acronymname@uestcthesis}%
+\fancyfoot[C]{\zihao{-5}\thepage}%
 }
 \newcommand{\Cabstractmatter}{
 \setcounter{page}{1}%页码重置为1
@@ -274,6 +428,36 @@
 \mainmatterfancy%设置正文的版式
 \fancypagestyle{plain}{\mainmatterfancy}
 }
+\newcommand{\figureslistmatterfancy}{
+\fancyhf{}
+\fancyhead[C]{图目录}%
+\fancyfoot[C]{\zihao{-5}\thepage}%页码位于页面底端，居中打印。
+}
+\newcommand{\tableslistmatterfancy}{
+\fancyhf{}
+\fancyhead[C]{表目录}
+\fancyfoot[C]{\zihao{-5}\thepage}%页码位于页面底端，居中打印。
+}
+\newcommand{\figureslistmatter}{
+\pagestyle{fancy}
+\figureslistmatterfancy
+\fancypagestyle{plain}{\figureslistmatterfancy}
+}
+\newcommand{\tableslistmatter}{
+\pagestyle{fancy}
+\tableslistmatterfancy
+\fancypagestyle{plain}{\tableslistmatterfancy}
+}
+\newcommand{\glossarymatter}{
+\pagestyle{fancy}
+\glossarymatterfancy
+\fancypagestyle{plain}{\glossarymatterfancy}
+}
+\newcommand{\acronymnamematter}{
+\pagestyle{fancy}
+\acronymnamematterfancy
+\fancypagestyle{plain}{\acronymnamematterfancy}
+}
 \newcommand{\stuid}[1]{
 \newcommand{\@stuid}{#1}
 }
@@ -346,6 +530,12 @@
 \newcommand{\englishshcool}[1]{
 \newcommand{\@englishshcool}{#1}
 }
+\newcommand{\englishshcoolextraline}[1]{
+\newcommand{\@englishshcoolextraline}{#1}
+}
+\newcommand{\majortype}[1]{
+\newcommand{\@majortype}{#1}
+}
 \begin{filecontents*}{logo.tex}
 \documentclass[pstricks=true]{standalone}
 \usepackage{pstricks}
@@ -780,7 +970,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0 0.33725491 0.62352943}
+\newrgbcolor{curcolor}{0 0.36078431 0.63529412}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1223,7 +1413,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0 0.33725491 0.62352943}
+\newrgbcolor{curcolor}{0 0.36078431 0.63529412}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1242,7 +1432,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0 0.33725491 0.62352943}
+\newrgbcolor{curcolor}{0 0.36078431 0.63529412}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1265,7 +1455,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0 0.33725491 0.62352943}
+\newrgbcolor{curcolor}{0 0.36078431 0.63529412}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1282,7 +1472,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0 0.33725491 0.62352943}
+\newrgbcolor{curcolor}{0 0.36078431 0.63529412}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1401,7 +1591,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0 0.33725491 0.62352943}
+\newrgbcolor{curcolor}{0 0.36078431 0.63529412}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1430,7 +1620,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0.9137255 0.32549021 0.15686275}
+\newrgbcolor{curcolor}{0.9176471 0.46666667 0.11764706}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1447,7 +1637,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0.9137255 0.32549021 0.15686275}
+\newrgbcolor{curcolor}{0.9176471 0.46666667 0.11764706}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1461,7 +1651,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0 0.33725491 0.62352943}
+\newrgbcolor{curcolor}{0 0.36078431 0.63529412}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1472,7 +1662,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0.9137255 0.32549021 0.15686275}
+\newrgbcolor{curcolor}{0.9176471 0.46666667 0.11764706}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -1512,7 +1702,7 @@
 }
 }
 {
-\newrgbcolor{curcolor}{0.9137255 0.32549021 0.15686275}
+\newrgbcolor{curcolor}{0.9176471 0.46666667 0.11764706}
 \pscustom[linestyle=none,fillstyle=solid,fillcolor=curcolor]
 {
 \newpath
@@ -2698,7 +2888,7 @@
 
 \end{document}
 \end{filecontents*}
-
+\ifdef{\withoutforepages@uestcthesis}{}{%withoutforepages选项效果
     \immediate\write18{latex logo}%
     \immediate\write18{dvips logo}%
     \IfFileExists{logo.dvi}{
@@ -2716,9 +2906,12 @@
 如果您是从MikTeX或CTAN.org处得到的此模板，请访问\url{https://github.com/shifujun/UESTCthesis}获取最新版本和相应的编译脚本。}
 }
 }
+}%这个大括号是前面withoutforepages选项判断的ifdef命令的一部分。
 \ifdefstring{\degree@uestcthesis}{bachelor}{
 \renewcommand{\bachelortitlepage@uestcthesis}{
 \renewcommand{\maketitle}{
+\setcounter{page}{1}%页码重置为1
+\pagenumbering{Alph}%页码使用大写罗马数字
 \begin{titlepage}
 \begin{center}
 \zihao{3}
@@ -2743,18 +2936,16 @@
 {\zihao{3}指导单位~}\makebox[20em][c]{\uline{\hfill\@university\hfill}}\\[5mm]
 {\zihao{3}\@date}
 \end{center}
+\clearpage{\pagestyle{empty}\cleardoublepage}
 \end{titlepage}}}}{}
-\ifdefstring{\degree@uestcthesis}{master}{
-\renewcommand{\mastertitlepage@uestcthesis}{
-\renewcommand{\maketitle}{%定义封面的格式
-\begin{titlepage}
+\newcommand{\firsttitlepage@doctor}{%
 \begin{center}
 {\zihao{2}电\enspace{}子\enspace{}科\enspace{}技\enspace{}大\enspace{}学}\\
 {\zihao{-4}UNIVERSITY OF ELECTRONIC SCIENCE AND TECHNOLOGY OF CHINA}\\
 ~\\
 ~\\
-{\zihao{0}硕士学位论文}\\[12bp]
-{\bf\zihao{3}MASTER THESIS}\\[2cm]
+{\zihao{0}博士学位论文}\\[12bp]
+{\bf\zihao{3}DOCTORAL DISSERTATION}\\[2cm]
 \uestclogobadge\\[2cm]
 \renewcommand{\ULthickness}{0.8pt}
 \renewcommand{\CJKunderlinecolor}{\color{black}}
@@ -2771,89 +2962,42 @@
 {\zihao{3}作者姓名~}\makebox[20em][c]{\zihao{3}\uline{\hfill\@author\hfill}}\\[5mm]
 {\zihao{3}指导教师~}\makebox[20em][c]{\zihao{3}\uline{\hfill\@advisername\hfill}}\\[5mm]
 \end{center}
-\newpage
-\thispagestyle{empty}
-\noindent
-{\zihao{-4}分类号}\makebox[15em][l]{\zihao{-4}\uline{~~~\@classnumber\hfill}}
-{\zihao{-4}密级}\makebox[15em][l]{\zihao{-4}\uline{~~~\@securityclassification\hfill}}\\
-{\zihao{-4}UDC\textsuperscript{注1}\!}\makebox[15em][l]{\zihao{-4}\uline{~~~\@UDC\hfill}}\\
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}
+\newcommand{\firsttitlepage@engineeringdoctor}{%
 \begin{center}
-{\zihao{-0}学\quad{}位\quad{}论\quad{}文}\\
+{\zihao{2}电\enspace{}子\enspace{}科\enspace{}技\enspace{}大\enspace{}学}\\
+{\zihao{-4}UNIVERSITY OF ELECTRONIC SCIENCE AND TECHNOLOGY OF CHINA}\\
+~\\
+~\\
+{\zihao{0}工程博士学位论文}\\[12bp]
+{\bf\zihao{3}ENGINEERING DOCTORAL DISSERTATION}\\[2cm]
+\uestclogobadge\\[2cm]
+\renewcommand{\ULthickness}{0.8pt}
+\renewcommand{\CJKunderlinecolor}{\color{black}}
+\linespread{1.25}
+\noindent
+\parbox[t][14ex][t]{\linewidth}{\centering
+{\zihao{-2} 论文题目~~}{\zihao{3}\uline{\@title}}
+}\\[3mm]
+\linespread{1.391}
+\renewcommand{\ULthickness}{0.4pt}
 {\zihao{3}~}\\
-\makebox[\linewidth][c]{\zihao{3}\uline{\hfill\@title\hfill}}\\
-{\zihao{-4}（题名和副题名）}\\
-{\zihao{5}~}\\
-{\zihao{5}~}\\
-\makebox[10em][c]{\zihao{3}\uline{\hfill\@author\hfill}}\\
-{\zihao{-4}（作者姓名）}\\
-{\zihao{-4}~}\\
-{\zihao{5}~}\\
-{\zihao{-4}指导教师}\makebox[29em][c]{\zihao{-4}\uline{\hfill\@advisername 、\@advisertitle 、\@adviserinstitution \hfill}}\\[5bp]
-{\zihao{-4}\qquad\qquad}\makebox[29em][c]{\zihao{-4}\uline{\hfill\ifthenelse{\isundefined{\@adviserBname}}{}{\@adviserBname 、\@adviserBtitle 、\@adviserBinstitution }\hfill}}\\[5bp]
-{\zihao{-4}\qquad\qquad}\makebox[29em][c]{\zihao{-4}\uline{\hfill\ifthenelse{\isundefined{\@adviserCname}}{}{\@adviserBname 、\@adviserCtitle 、\@adviserCinstitution }\hfill}}\\[5bp]
-{\zihao{-4}\qquad\qquad}\makebox[29em][c]{\zihao{-4}\uline{\hfill\ifthenelse{\isundefined{\@adviserDname}}{}{\@adviserBname 、\@adviserDtitle 、\@adviserDinstitution }\hfill}}\\[5bp]
-{\zihao{-4}（姓名、职称、单位名称）}\\[8bp]
-\end{center}
-{\zihao{-4}申请学位级别}\makebox[10em][l]{\zihao{-4}\uline{\hfill\@degree\hfill}}
-{\zihao{-4}学科专业}\makebox[15em][l]{\zihao{-4}\uline{\hfill\@major\hfill}}\\[13bp]
-{\zihao{-4}提交论文日期}\makebox[10em][l]{\zihao{-4}\uline{\hfill\@date\hfill}}
-{\zihao{-4}论文答辩日期}\makebox[13em][l]{\zihao{-4}\uline{\hfill\@oraldefensedate\hfill}}\\[13bp]
-{\zihao{-4}学位授予单位和日期}\makebox[26em][l]{\zihao{3}\uline{\hfill 电子科技大学\hfill\@awarddate}}\\[13bp]
-{\zihao{-4}答辩委员会主席}\makebox[16em][l]{\zihao{-4}\uline{\hfill\@chairman\hfill}}\\[13bp]
-{\zihao{-4}评阅人}\makebox[32em][l]{\zihao{-4}\uline{\hfill\@appraiser\hfill}}\\
-\vfill
-{\zihao{5}注1：注明《国际十进分类法UDC》的类号。}
-\newpage
-\thispagestyle{empty}
-\begin{center}
-{\zihao{-4}~}\\
-{\zihao{-4}~}\\
-{\zihao{-4}~}\\
-{\bf\zihao{-2}\@englishtitle}\\
-\vfill
-{\zihao{-3}A Thesis Submitted to}\\[1ex]
-{\zihao{-3}University of Electronic Science and Technology of China}\\
-\vspace{3cm}
-\makebox[6em][r]{\zihao{4}Major:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishmajor\hfill}}\\[1ex]
-\makebox[6em][r]{\zihao{4}Author:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishauthor\hfill}}\\[1ex]
-\makebox[6em][r]{\zihao{4}Advisor:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishadvisor\hfill}}\\[1ex]
-\makebox[6em][r]{\zihao{4}School:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishshcool\hfill}}\\[1ex]
-\end{center}
-\newpage
-\thispagestyle{empty}
-\linespread{1.5}
-\begin{center}
-{\bf\zihao{-2}独创性声明}\par
-\end{center}
-{\zihao{4}\qquad 本人声明所呈交的学位论文是本人在导师指导下进行的研究工作及取得的研究成果。据我所知，除了文中特别加以标注和致谢的地方外，论文中不包含其他人已经发表或撰写过的研究成果，也不包含为获得电子科技大学或其它教育机构的学位或证书而使用过的材料。与我一同工作的同志对本研究所做的任何贡献均已在论文中作了明确的说明并表示谢意。\par
-~\par
-作者签名：\makebox[5em][l]{\uline{\hfill}}\hfill
-日期：\qquad{}年\qquad{}月\qquad{}日 \par
-~\par
-\begin{center}
-{\bf\zihao{-2}论文使用授权}\par
+{\zihao{3}工程领域~}\makebox[20em][c]{\zihao{3}\uline{\hfill\@major\hfill}}\\[5mm]
+{\zihao{3}学\qquad 号~}\makebox[20em][c]{\zihao{3}\uline{\hfill\@stuid\hfill}}\\[5mm]
+{\zihao{3}作者姓名~}\makebox[20em][c]{\zihao{3}\uline{\hfill\@author\hfill}}\\[5mm]
+{\zihao{3}指导教师~}\makebox[20em][c]{\zihao{3}\uline{\hfill\@advisername\hfill}}\\[5mm]
 \end{center}
-{\zihao{4}\qquad 本学位论文作者完全了解电子科技大学有关保留、使用学位论文的规定，有权保留并向国家有关部门或机构送交论文的复印件和磁盘，允许论文被查阅和借阅。本人授权电子科技大学可以将学位论文的全部或部分内容编入有关数据库进行检索，可以采用影印、缩印或扫描等复制手段保存、汇编学位论文。\par
-（保密的学位论文在解密后应遵守此规定） \par
-~\par
-}
-\qquad 作者签名：\makebox[5em][l]{\uline{\hfill}}\hfill
-导师签名：\makebox[7em][l]{\uline{\hfill}}\par
-\hfill 日期：\qquad{}年\qquad{}月\qquad{}日 \par
+\clearpage{\pagestyle{empty}\cleardoublepage}
 }
-\linespread{1.391}
-\end{titlepage}}}}{}
-\ifdefstring{\degree@uestcthesis}{doctor}{
-\renewcommand{\doctortitlepage@uestcthesis}{
-\renewcommand{\maketitle}{%定义封面的格式
-\begin{titlepage}
+\newcommand{\firsttitlepage@master}{%
 \begin{center}
 {\zihao{2}电\enspace{}子\enspace{}科\enspace{}技\enspace{}大\enspace{}学}\\
 {\zihao{-4}UNIVERSITY OF ELECTRONIC SCIENCE AND TECHNOLOGY OF CHINA}\\
 ~\\
 ~\\
-{\zihao{0}博士学位论文}\\[12bp]
-{\bf\zihao{3}DOCTORAL DISSERTATION}\\[2cm]
+{\zihao{0}硕士学位论文}\\[12bp]
+{\bf\zihao{3}MASTER THESIS}\\[2cm]
 \uestclogobadge\\[2cm]
 \renewcommand{\ULthickness}{0.8pt}
 \renewcommand{\CJKunderlinecolor}{\color{black}}
@@ -2870,38 +3014,216 @@
 {\zihao{3}作者姓名~}\makebox[20em][c]{\zihao{3}\uline{\hfill\@author\hfill}}\\[5mm]
 {\zihao{3}指导教师~}\makebox[20em][c]{\zihao{3}\uline{\hfill\@advisername\hfill}}\\[5mm]
 \end{center}
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}
+\newcommand{\firsttitlepage@professionalmaster}{%
+\begin{center}
+{\zihao{2}电\enspace{}子\enspace{}科\enspace{}技\enspace{}大\enspace{}学}\\
+{\zihao{-4}UNIVERSITY OF ELECTRONIC SCIENCE AND TECHNOLOGY OF CHINA}\\
+~\\
+~\\
+{\zihao{0}专业学位硕士学位论文}\\[12bp]
+{\bf\zihao{3}MASTER THESIS FOR PROFESSIONAL DEGREE}\\[2cm]
+\uestclogobadge\\[2cm]
+\renewcommand{\ULthickness}{0.8pt}
+\renewcommand{\CJKunderlinecolor}{\color{black}}
+\linespread{1.25}
+\noindent
+\parbox[t][14ex][t]{\linewidth}{\centering
+{\zihao{-2} 论文题目~~}{\zihao{3}\uline{\@title}}
+}\\[3mm]
+\linespread{1.391}
+\renewcommand{\ULthickness}{0.4pt}
+{\zihao{3}~}\\
+\makebox[12em][s]{\zihao{3}专业学位类别}~\makebox[9.26cm][c]{\zihao{3}\uline{\hfill\@majortype\hfill}}\\[5mm]
+\makebox[12em][s]{\zihao{3}学号}~\makebox[9.26cm][c]{\zihao{3}\uline{\hfill\@stuid\hfill}}\\[5mm]
+\makebox[12em][s]{\zihao{3}作者姓名}~\makebox[9.26cm][c]{\zihao{3}\uline{\hfill\@author\hfill}}\\[5mm]
+\makebox[12em][s]{\zihao{3}指导教师}~\makebox[9.26cm][c]{\zihao{3}\uline{\hfill\@advisername\hfill}}\\[5mm]
+\end{center}
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}
+\newcommand{\secondtitlepage@Academic}{%
 \newpage
 \thispagestyle{empty}
+\vspace*{-4.1mm}
 \noindent
-{\zihao{-4}分类号}\makebox[15em][l]{\zihao{-4}\uline{~~~\@classnumber\hfill}}
-{\zihao{-4}密级}\makebox[15em][l]{\zihao{-4}\uline{~~~\@securityclassification\hfill}}\\
-{\zihao{-4}UDC\textsuperscript{注1}\!}\makebox[15em][l]{\zihao{-4}\uline{~~~\@UDC\hfill}}\\
+{\zihao{-4}分类号}\makebox[6.35cm][l]{\zihao{5}\uline{~~~\@classnumber\hfill}}
+{\zihao{-4}密级}\makebox[5.24cm][l]{\zihao{4}\uline{~~~\@securityclassification\hfill}}\\[2.3mm]
+{\zihao{-4}UDC\zihao{-5}\textsuperscript{~注1}\!}\makebox[6.48cm][l]{\zihao{5}\uline{~~~\@UDC\hfill}}\\[1.1mm]
 \begin{center}
 {\zihao{-0}学\quad{}位\quad{}论\quad{}文}\\
-{\zihao{3}~}\\
-\makebox[\linewidth][c]{\zihao{3}\uline{\hfill\@title\hfill}}\\
+{\zihao{3}~}\\[3.3mm]
+\makebox[14.99cm][c]{\zihao{3}\uline{\hfill}}\\[0.82cm]
+\makebox[14.99cm][c]{\zihao{3}\uline{\hfill}}\\
+\vspace{-2.47cm}
+\noindent\parbox[t][2cm][t]{34em}{\centering\zihao{2}\baselineskip=39.13766pt\@title}\\[6.8mm]
 {\zihao{-4}（题名和副题名）}\\
 {\zihao{5}~}\\
+\vspace{-3mm}
+\makebox[4.13cm][c]{\zihao{3}\@author}\\\vspace{-0.58cm}
+\makebox[4.13cm][c]{\zihao{3}\uline{\hfill}}\\[3mm]
+{\zihao{-4}（作者姓名）}\\
+{\zihao{-4}~}\\
 {\zihao{5}~}\\
-\makebox[10em][c]{\zihao{3}\uline{\hfill\@author\hfill}}\\
+\vspace{-5mm}
+{\zihao{-4}指导教师}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill%
+\@advisername 、\@advisertitle 、\@adviserinstitution \hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserBname}}{}{\@adviserBname 、\@adviserBtitle 、\@adviserBinstitution }\hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserCname}}{}{\@adviserCname 、\@adviserCtitle 、\@adviserCinstitution }\hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserDname}}{}{\@adviserDname 、\@adviserDtitle 、\@adviserDinstitution }\hfill}}\\[6.5mm]
+{\zihao{-4}（姓名、职称、单位名称）}\\
+\vspace{-3mm}
+\end{center}
+{\zihao{-4}申请学位级别}\makebox[10em][l]{\zihao{3}\uline{\hfill\@degree\hfill}}
+{\zihao{-4}学科专业}\makebox[15em][l]{\zihao{3}\uline{\hfill\@major\hfill}}\\[13bp]
+{\zihao{-4}提交论文日期}\makebox[10em][l]{\zihao{3}\uline{\hfill\@date\hfill}}
+{\zihao{-4}论文答辩日期}\makebox[13em][l]{\zihao{3}\uline{\hfill\@oraldefensedate\hfill}}\\[13bp]
+{\zihao{-4}学位授予单位和日期}\makebox[26em][l]{\zihao{3}\uline{\hfill 电子科技大学\hfill\@awarddate}}\\[13bp]
+{\zihao{-4}答辩委员会主席}\makebox[16em][l]{\zihao{3}\uline{\hfill\@chairman\hfill}}\\[13bp]
+{\zihao{-4}评阅人}\makebox[32em][l]{\zihao{3}\uline{\hfill\@appraiser\hfill}}\\[3mm]
+{\zihao{5}注1：注明《国际十进分类法UDC》的类号。}%
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}%
+\newcommand{\secondtitlepage@Engineering}{%
+\newpage
+\thispagestyle{empty}
+\vspace*{-4.1mm}
+\noindent
+{\zihao{-4}分类号}\makebox[6.35cm][l]{\zihao{5}\uline{~~~\@classnumber\hfill}}
+{\zihao{-4}密级}\makebox[5.24cm][l]{\zihao{4}\uline{~~~\@securityclassification\hfill}}\\[2.3mm]
+{\zihao{-4}UDC\zihao{-5}\textsuperscript{~注1}\!}\makebox[6.48cm][l]{\zihao{5}\uline{~~~\@UDC\hfill}}\\[1.1mm]
+\begin{center}
+{\zihao{-0}学\quad{}位\quad{}论\quad{}文}\\
+{\zihao{3}~}\\[3.3mm]
+\makebox[14.99cm][c]{\zihao{3}\uline{\hfill}}\\[0.82cm]
+\makebox[14.99cm][c]{\zihao{3}\uline{\hfill}}\\
+\vspace{-2.47cm}
+\noindent\parbox[t][2cm][t]{34em}{\centering\zihao{2}\baselineskip=39.13766pt\@title}\\[6.8mm]
+{\zihao{-4}（题名和副题名）}\\
+{\zihao{5}~}\\
+\vspace{-3mm}
+\makebox[4.13cm][c]{\zihao{3}\@author}\\\vspace{-0.58cm}
+\makebox[4.13cm][c]{\zihao{3}\uline{\hfill}}\\[3mm]
 {\zihao{-4}（作者姓名）}\\
 {\zihao{-4}~}\\
 {\zihao{5}~}\\
-{\zihao{-4}指导教师}\makebox[29em][c]{\zihao{-4}\uline{\hfill\@advisername 、\@advisertitle 、\@adviserinstitution \hfill}}\\[5bp]
-{\zihao{-4}\qquad\qquad}\makebox[29em][c]{\zihao{-4}\uline{\hfill\ifthenelse{\isundefined{\@adviserBname}}{}{\@adviserBname 、\@adviserBtitle 、\@adviserBinstitution }\hfill}}\\[5bp]
-{\zihao{-4}\qquad\qquad}\makebox[29em][c]{\zihao{-4}\uline{\hfill\ifthenelse{\isundefined{\@adviserCname}}{}{\@adviserBname 、\@adviserCtitle 、\@adviserCinstitution }\hfill}}\\[5bp]
-{\zihao{-4}\qquad\qquad}\makebox[29em][c]{\zihao{-4}\uline{\hfill\ifthenelse{\isundefined{\@adviserDname}}{}{\@adviserBname 、\@adviserDtitle 、\@adviserDinstitution }\hfill}}\\[5bp]
-{\zihao{-4}（姓名、职称、单位名称）}\\[8bp]
+\vspace{-5mm}
+{\zihao{-4}指导教师}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill%
+\@advisername 、\@advisertitle 、\@adviserinstitution \hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserBname}}{}{\@adviserBname 、\@adviserBtitle 、\@adviserBinstitution }\hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserCname}}{}{\@adviserCname 、\@adviserCtitle 、\@adviserCinstitution }\hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserDname}}{}{\@adviserDname 、\@adviserDtitle 、\@adviserDinstitution }\hfill}}\\[6.5mm]
+{\zihao{-4}（姓名、职称、单位名称）}\\
+\vspace{-3mm}
 \end{center}
-{\zihao{-4}申请学位级别}\makebox[10em][l]{\zihao{-4}\uline{\hfill\@degree\hfill}}
-{\zihao{-4}学科专业}\makebox[15em][l]{\zihao{-4}\uline{\hfill\@major\hfill}}\\[13bp]
-{\zihao{-4}提交论文日期}\makebox[10em][l]{\zihao{-4}\uline{\hfill\@date\hfill}}
-{\zihao{-4}论文答辩日期}\makebox[13em][l]{\zihao{-4}\uline{\hfill\@oraldefensedate\hfill}}\\[13bp]
+{\zihao{-4}申请学位级别}\makebox[10em][l]{\zihao{3}\uline{\hfill\@degree\hfill}}
+{\zihao{-4}专业学位类别}\makebox[13em][l]{\zihao{3}\uline{\hfill\@majortype\hfill}}\\[13bp]
+{\zihao{-4}工程领域名称}\makebox[29em][l]{\zihao{3}\uline{\hfill\@major\hfill}}\\[13bp]
+{\zihao{-4}提交论文日期}\makebox[10em][l]{\zihao{3}\uline{\hfill\@date\hfill}}
+{\zihao{-4}论文答辩日期}\makebox[13em][l]{\zihao{3}\uline{\hfill\@oraldefensedate\hfill}}\\[13bp]
 {\zihao{-4}学位授予单位和日期}\makebox[26em][l]{\zihao{3}\uline{\hfill 电子科技大学\hfill\@awarddate}}\\[13bp]
-{\zihao{-4}答辩委员会主席}\makebox[16em][l]{\zihao{-4}\uline{\hfill\@chairman\hfill}}\\[13bp]
-{\zihao{-4}评阅人}\makebox[32em][l]{\zihao{-4}\uline{\hfill\@appraiser\hfill}}\\
-\vfill
-{\zihao{5}注1：注明《国际十进分类法UDC》的类号。}
+{\zihao{-4}答辩委员会主席}\makebox[16em][l]{\zihao{3}\uline{\hfill\@chairman\hfill}}\\[13bp]
+{\zihao{-4}评阅人}\makebox[32em][l]{\zihao{3}\uline{\hfill\@appraiser\hfill}}\\[3mm]
+{\zihao{5}注1：注明《国际十进分类法UDC》的类号。}%
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}%
+\newcommand{\secondtitlepage@Professional}{%
+\newpage
+\thispagestyle{empty}
+\vspace*{-4.1mm}
+\noindent
+{\zihao{-4}分类号}\makebox[6.35cm][l]{\zihao{5}\uline{~~~\@classnumber\hfill}}
+{\zihao{-4}密级}\makebox[5.24cm][l]{\zihao{4}\uline{~~~\@securityclassification\hfill}}\\[2.3mm]
+{\zihao{-4}UDC\zihao{-5}\textsuperscript{~注1}\!}\makebox[6.48cm][l]{\zihao{5}\uline{~~~\@UDC\hfill}}\\[1.1mm]
+\begin{center}
+{\zihao{-0}学\quad{}位\quad{}论\quad{}文}\\
+{\zihao{3}~}\\[3.3mm]
+\makebox[14.99cm][c]{\zihao{3}\uline{\hfill}}\\[0.82cm]
+\makebox[14.99cm][c]{\zihao{3}\uline{\hfill}}\\
+\vspace{-2.47cm}
+\noindent\parbox[t][2cm][t]{34em}{\centering\zihao{2}\baselineskip=39.13766pt\@title}\\[6.8mm]
+{\zihao{-4}（题名和副题名）}\\
+{\zihao{5}~}\\
+\vspace{-3mm}
+\makebox[4.13cm][c]{\zihao{3}\@author}\\\vspace{-0.58cm}
+\makebox[4.13cm][c]{\zihao{3}\uline{\hfill}}\\[3mm]
+{\zihao{-4}（作者姓名）}\\
+{\zihao{-4}~}\\
+{\zihao{5}~}\\
+\vspace{-5mm}
+{\zihao{-4}指导教师}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill%
+\@advisername 、\@advisertitle 、\@adviserinstitution \hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserBname}}{}{\@adviserBname 、\@adviserBtitle 、\@adviserBinstitution }\hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserCname}}{}{\@adviserCname 、\@adviserCtitle 、\@adviserCinstitution }\hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserDname}}{}{\@adviserDname 、\@adviserDtitle 、\@adviserDinstitution }\hfill}}\\[6.5mm]
+{\zihao{-4}（姓名、职称、单位名称）}\\
+\vspace{-3mm}
+\end{center}
+{\zihao{-4}申请学位级别}\makebox[10em][l]{\zihao{3}\uline{\hfill\@degree\hfill}}
+{\zihao{-4}专业学位类别}\makebox[13em][l]{\zihao{3}\uline{\hfill\@majortype\hfill}}\\[13bp]
+{\zihao{-4}提交论文日期}\makebox[10em][l]{\zihao{3}\uline{\hfill\@date\hfill}}
+{\zihao{-4}论文答辩日期}\makebox[13em][l]{\zihao{3}\uline{\hfill\@oraldefensedate\hfill}}\\[13bp]
+{\zihao{-4}学位授予单位和日期}\makebox[26em][l]{\zihao{3}\uline{\hfill 电子科技大学\hfill\@awarddate}}\\[13bp]
+{\zihao{-4}答辩委员会主席}\makebox[16em][l]{\zihao{3}\uline{\hfill\@chairman\hfill}}\\[13bp]
+{\zihao{-4}评阅人}\makebox[32em][l]{\zihao{3}\uline{\hfill\@appraiser\hfill}}\\[3mm]
+{\zihao{5}注1：注明《国际十进分类法UDC》的类号。}%
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}%
+\newcommand{\secondtitlepage@ResearchReport}{%
+\newpage
+\thispagestyle{empty}
+\vspace*{-4.1mm}
+\noindent
+{\zihao{-4}分类号}\makebox[6.35cm][l]{\zihao{5}\uline{~~~\@classnumber\hfill}}
+{\zihao{-4}密级}\makebox[5.24cm][l]{\zihao{4}\uline{~~~\@securityclassification\hfill}}\\[2.3mm]
+{\zihao{-4}UDC\zihao{-5}\textsuperscript{~注1}\!}\makebox[6.48cm][l]{\zihao{5}\uline{~~~\@UDC\hfill}}\\[1.1mm]
+\begin{center}
+{\zihao{-0}研\quad{}究\quad{}报\quad{}告}\\
+{\zihao{3}~}\\[3.3mm]
+\makebox[14.99cm][c]{\zihao{3}\uline{\hfill}}\\[0.82cm]
+\makebox[14.99cm][c]{\zihao{3}\uline{\hfill}}\\
+\vspace{-2.47cm}
+\noindent\parbox[t][2cm][t]{34em}{\centering\zihao{2}\baselineskip=39.13766pt\@title}\\[6.8mm]
+{\zihao{-4}（题名和副题名）}\\
+{\zihao{5}~}\\
+\vspace{-3mm}
+\makebox[4.13cm][c]{\zihao{3}\@author}\\\vspace{-0.58cm}
+\makebox[4.13cm][c]{\zihao{3}\uline{\hfill}}\\[3mm]
+{\zihao{-4}（作者姓名）}\\
+{\zihao{-4}~}\\
+{\zihao{5}~}\\
+\vspace{-5mm}
+{\zihao{-4}指导教师}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill%
+\@advisername 、\@advisertitle 、\@adviserinstitution \hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserBname}}{}{\@adviserBname 、\@adviserBtitle 、\@adviserBinstitution }\hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserCname}}{}{\@adviserCname 、\@adviserCtitle 、\@adviserCinstitution }\hfill}}\\[5bp]
+{\zihao{-4}\qquad\qquad}\makebox[11.35cm][c]{\zihao{3}\uline{\hfill\ifthenelse{%
+\isundefined{\@adviserDname}}{}{\@adviserDname 、\@adviserDtitle 、\@adviserDinstitution }\hfill}}\\[6.5mm]
+{\zihao{-4}（姓名、职称、单位名称）}\\
+\vspace{-3mm}
+\end{center}
+{\zihao{-4}申请学位级别}\makebox[10em][l]{\zihao{3}\uline{\hfill\@degree\hfill}}
+{\zihao{-4}学科专业}\makebox[15em][l]{\zihao{3}\uline{\hfill\@major\hfill}}\\[13bp]
+{\zihao{-4}提交论文日期}\makebox[10em][l]{\zihao{3}\uline{\hfill\@date\hfill}}
+{\zihao{-4}论文答辩日期}\makebox[13em][l]{\zihao{3}\uline{\hfill\@oraldefensedate\hfill}}\\[13bp]
+{\zihao{-4}学位授予单位和日期}\makebox[26em][l]{\zihao{3}\uline{\hfill 电子科技大学\hfill\@awarddate}}\\[13bp]
+{\zihao{-4}答辩委员会主席}\makebox[16em][l]{\zihao{3}\uline{\hfill\@chairman\hfill}}\\[13bp]
+{\zihao{-4}评阅人}\makebox[32em][l]{\zihao{3}\uline{\hfill\@appraiser\hfill}}\\[3mm]
+{\zihao{5}注1：注明《国际十进分类法UDC》的类号。}%
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}%
+\newcommand{\thirdtitlepage@Doctor}{%
 \newpage
 \thispagestyle{empty}
 \begin{center}
@@ -2917,7 +3239,57 @@
 \makebox[6em][r]{\zihao{4}Author:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishauthor\hfill}}\\[1ex]
 \makebox[6em][r]{\zihao{4}Advisor:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishadvisor\hfill}}\\[1ex]
 \makebox[6em][r]{\zihao{4}School:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishshcool\hfill}}\\[1ex]
+\ifdef{\@englishshcoolextraline}{%可能有的额外一行学院英文名称。为一行显示不下的学院英文名称准备。
+\makebox[6em][r]{}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishshcoolextraline\hfill}}\\[1ex]%
+}{}
+\end{center}
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}
+\newcommand{\thirdtitlepage@Master}{%
+\newpage
+\thispagestyle{empty}
+\begin{center}
+{\zihao{-4}~}\\
+{\zihao{-4}~}\\
+{\zihao{-4}~}\\
+{\bf\zihao{-2}\@englishtitle}\\
+\vfill
+{\zihao{-3}A Master Thesis Submitted to}\\[1ex]
+{\zihao{-3}University of Electronic Science and Technology of China}\\
+\vspace{3cm}
+\makebox[6em][r]{\zihao{4}Major:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishmajor\hfill}}\\[1ex]
+\makebox[6em][r]{\zihao{4}Author:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishauthor\hfill}}\\[1ex]
+\makebox[6em][r]{\zihao{4}Advisor:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishadvisor\hfill}}\\[1ex]
+\makebox[6em][r]{\zihao{4}School:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishshcool\hfill}}\\[1ex]
+\ifdef{\@englishshcoolextraline}{%可能有的额外一行学院英文名称。为一行显示不下的学院英文名称准备。
+\makebox[6em][r]{}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishshcoolextraline\hfill}}\\[1ex]%
+}{}
+\end{center}
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}
+\newcommand{\thirdtitlepage@MasterResearchReport}{%
+\newpage
+\thispagestyle{empty}
+\begin{center}
+{\zihao{-4}~}\\
+{\zihao{-4}~}\\
+{\zihao{-4}~}\\
+{\bf\zihao{-2}\@englishtitle}\\
+\vfill
+{\zihao{-3}A Master Research Report Submitted to}\\[1ex]
+{\zihao{-3}University of Electronic Science and Technology of China}\\
+\vspace{3cm}
+\makebox[6em][r]{\zihao{4}Major:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishmajor\hfill}}\\[1ex]
+\makebox[6em][r]{\zihao{4}Author:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishauthor\hfill}}\\[1ex]
+\makebox[6em][r]{\zihao{4}Advisor:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishadvisor\hfill}}\\[1ex]
+\makebox[6em][r]{\zihao{4}School:}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishshcool\hfill}}\\[1ex]
+\ifdef{\@englishshcoolextraline}{%可能有的额外一行学院英文名称。为一行显示不下的学院英文名称准备。
+\makebox[6em][r]{}\makebox[25em][l]{\zihao{4}\uline{\hfill\@englishshcoolextraline\hfill}}\\[1ex]%
+}{}
 \end{center}
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}
+\newcommand{\fourthtitlepage}{%
 \newpage
 \thispagestyle{empty}
 \linespread{1.5}
@@ -2940,11 +3312,36 @@
 导师签名：\makebox[7em][l]{\uline{\hfill}}\par
 \hfill 日期：\qquad{}年\qquad{}月\qquad{}日 \par
 }
+\clearpage{\pagestyle{empty}\cleardoublepage}
+}
+\ifdefstring{\degree@uestcthesis}{master}{
+\renewcommand{\mastertitlepage@uestcthesis}{
+\renewcommand{\maketitle}{%定义封面的格式
+\setcounter{page}{1}%页码重置为1
+\pagenumbering{Alph}%页码使用大写罗马数字
+\begin{titlepage}
+\firsttitlepage%插入封面
+\secondtitlepage%插入中文扉页
+\thirdtitlepage%插入英文扉页
+\fourthtitlepage%插入独创性声明和论文使用授权
+\linespread{1.391}
+\end{titlepage}}}}{}
+\ifdefstring{\degree@uestcthesis}{doctor}{
+\renewcommand{\doctortitlepage@uestcthesis}{
+\renewcommand{\maketitle}{%定义封面的格式
+\setcounter{page}{1}%页码重置为1
+\pagenumbering{Alph}%页码使用大写罗马数字
+\begin{titlepage}
+\firsttitlepage%插入封面
+\secondtitlepage%插入中文扉页
+\thirdtitlepage%插入英文扉页
+\fourthtitlepage%插入独创性声明和论文使用授权
 \linespread{1.391}
 \end{titlepage}}}}{}
 \titlepage@degree
 \setcounter{secnumdepth}{3}
 \chaptername@uestcthesis
+\ifdefstring{\degree@uestcthesis}{bachelor}{
 \CTEXsetup[ nameformat={},
             numberformat={},
             titleformat={},
@@ -2953,18 +3350,49 @@
             afterskip={30bp plus 6bp minus 6bp},%章标题段后30磅。
             format={\heiti\zihao{-3}\centering},
             ]{chapter}
+}{
+\CTEXsetup[ nameformat={},
+            numberformat={},
+            titleformat={},
+            aftername={~},
+            beforeskip={1.8mm},%章标题段前30磅，这里2mm是由于实际效果与MS WORD有差异而微调出的。具体测量的是页眉线到章标题文字上边的距离。
+            afterskip={18bp plus 3.6bp minus 3.6bp},%章标题段后30磅。
+            format={\heiti\zihao{-3}\centering},
+            ]{chapter}
+}
+\ifdefstring{\degree@uestcthesis}{bachelor}{
 \CTEXsetup[ aftername={~},
             beforeskip={18bp},
             afterskip={18bp plus 3.6bp minus 3.6bp},
             format={\heiti\zihao{4}\flushleft}]{section}
+}{
+\CTEXsetup[ aftername={~},
+            beforeskip={18bp},
+            afterskip={6bp plus 1.2bp minus 1.2bp},
+            format={\heiti\zihao{4}\flushleft}]{section}
+}
+\ifdefstring{\degree@uestcthesis}{bachelor}{
 \CTEXsetup[ aftername={~},
             beforeskip={12bp},
             afterskip={12bp plus 2.4bp minus 2.4bp},
             format={\heiti\zihao{4}\flushleft}]{subsection}
+}{
+\CTEXsetup[ aftername={~},
+            beforeskip={12bp},
+            afterskip={6bp plus 1.2bp minus 1.2bp},
+            format={\heiti\zihao{4}\flushleft}]{subsection}
+}
+\ifdefstring{\degree@uestcthesis}{bachelor}{
 \CTEXsetup[ aftername={~},
             beforeskip={6bp},
             afterskip={6bp plus 1.2bp minus 1.2bp},
             format={\heiti\zihao{-4}\flushleft}]{subsubsection}
+}{
+\CTEXsetup[ aftername={~},
+            beforeskip={12bp},
+            afterskip={6bp plus 1.2bp minus 1.2bp},
+            format={\heiti\zihao{-4}\flushleft}]{subsubsection}
+}
 \newenvironment{Cabstract}[5]{
 \newcommand{\@ckeywords}{
 \ifthenelse{\equal{#1}{}}{必选关键词}{#1}%
@@ -2983,10 +3411,10 @@
 \hypersetup{%
 pdfkeywords={\@pdfckeywords}%在pdf元信息中加入关键字
 }
-\chapter*{摘要}%插入不带章号的摘要
+\chapter*{摘\enspace 要}%插入不带章号的摘要
 }
 {\\[3mm]%摘要后换行空出3mm
-{\heiti 关键词：}\@ckeywords%插入关键词
+{\textbf{关键词：}}\parbox[t]{378.59134pt}{\@ckeywords}%插入关键词
 }
 \newenvironment{Eabstract}[5]{
 \newcommand{\@ekeywords}{
@@ -2997,10 +3425,10 @@ pdfkeywords={\@pdfckeywords}%在pdf元信息中加入关键字
 \ifthenelse{\equal{#5}{}}{}{, #5}%
 }
 \Eabstractmatter%设置英文摘要版式
-\chapter*{ABSTRACT}%插入不带章号的ABSTRACT
+\chapter*{\bf ABSTRACT}%插入不带章号的ABSTRACT
 }
 {\\[3mm]%摘要后换行空出3mm
-{\heiti Keywords:}\@ekeywords%插入关键词
+{\bf Keywords:\nbs}\parbox[t]{367.97586pt}{\@ekeywords}%插入关键词
 }
 \CTEXoptions[contentsname={\protect\heiti\protect\zihao{-3}目\enspace 录}]
 \setcounter{tocdepth}{3}
@@ -3020,7 +3448,7 @@ pdfkeywords={\@pdfckeywords}%在pdf元信息中加入关键字
 \renewcommand*\l@subsection{\@dottedtocline{2}{4em}{1em}}
 \renewcommand*\l@subsubsection{\@dottedtocline{3}{6em}{1em}}
 }
-\RequirePackage{amsmath,kmath}
+\RequirePackage{amsmath,amsfonts,amssymb,bm}
 \renewcommand{\theequation}{\arabic{chapter}\textendash\arabic{equation}}
 \RequirePackage[amsmath,thmmarks]{ntheorem}
 \theorembodyfont{\normalfont}%字体
@@ -3039,7 +3467,7 @@ pdfkeywords={\@pdfckeywords}%在pdf元信息中加入关键字
 \newtheorem{yinli}{引理}[section]
 \def\endyinli{\quad\@endtheorem}
 \theoremstyle{nonumberplain}
-\theoremsymbol{}
+\theoremsymbol{■}
 \newtheorem{zhengming}{证明}
 \def\endzhengming{\quad\@endtheorem}
 \RequirePackage[numbers,sort&compress]{natbib}
@@ -3054,17 +3482,39 @@ pdfkeywords={\@pdfckeywords}%在pdf元信息中加入关键字
 \mb@addtocontents \let \@auxout \@auxoutpublications \let \jobname
 \@auxoutpublicationsname \bibliography {#1}}
 }
+\renewcommand*\CTEXsetfont{%
+  \begingroup
+  \settowidth\ccwd{\CTEX@spaceChar\CJKglue}%
+  \edef\x{\noexpand\ccwd\the\ccwd}%
+  \expandafter\endgroup\x
+  \ifdim\parindent=0pt\else\parindent2\ccwd\fi}
+\RequirePackage[hang,perpage]{footmisc}
+\setlength{\footnotemargin}{5.2mm}
+\renewcommand{\footnoterule}{\vfill\noindent
+\vspace*{0.9mm}\hspace{7.4mm}\rule{5.05cm}{0.02cm}\vspace*{2.6pt}}
+\RequirePackage{pifont}
+\def\@circlednumber#1{\ifcase#1\or \ding{192}\or \ding{193}\or \ding{194}\or
+ \ding{195}\or \ding{196}\or \ding{197}\or \ding{198}\or \ding{199}
+ \or \ding{200} \or \ding{201} \else\@ctrerr\fi}
+\def\circlednumber#1{\expandafter\@circlednumber\csname c@#1\endcsname}
+\renewcommand{\thefootnote}{\circlednumber{footnote}}
+\def\@makefntext #1{\ifFN@hangfoot \bgroup \setbox \@tempboxa \hbox {\ifdim
+\footnotemargin >0pt \hb@xt@ \footnotemargin {\hbox { \normalfont \@thefnmark}
+\hss }\else \hbox { \normalfont \@thefnmark} \fi }\leftmargin \wd \@tempboxa
+\rightmargin \z@ \linewidth \columnwidth \advance \linewidth -\leftmargin
+\parshape \@ne \leftmargin \linewidth \footnotesize \@setpar {{\@@par }}
+\leavevmode \llap {\box \@tempboxa }\parskip \hangfootparskip \relax \parindent
+\hangfootparindent \relax \else \parindent 1em \noindent \ifdim \footnotemargin
+ >\z@ \hb@xt@ \footnotemargin {\hss \hbox { \normalfont \@thefnmark} }\else
+ \ifdim \footnotemargin =\z@ \llap {\hbox { \normalfont \@thefnmark} }\else
+ \llap {\hb@xt@ -\footnotemargin {\hbox { \normalfont \@thefnmark} \hss }}
+ \fi \fi \fi \footnotelayout #1\ifFN@hangfoot \par \egroup \fi}
 \RequirePackage{cmap}%pdflatex编译时，可以生成可复制、粘贴的中文PDF文档
 \RequirePackage{hyperxmp}%在pdf中加入XMP高级元信息
 \RequirePackage[pdftex,unicode,
             bookmarksnumbered=true,
             bookmarksopen=true,
-            colorlinks=false,
-            pdfborder={0 0 1},
-            citecolor=blue,
-            linkcolor=red,
-            anchorcolor=green,
-            urlcolor=blue,
+            hidelinks=true,
             breaklinks=true,
 pdfdisplaydoctitle=true
 ]{hyperref}
@@ -3080,25 +3530,8 @@ pdflang={zh-CN},
 pdfpagelayout={TwoPageRight}
 }
 \RequirePackage[small]{subfigure}
-\RequirePackage{enumerate}
-\newskip\@topsepadd@uestcthesis
-\def\@trivlist@uestcthesis{\if@noskipsec \leavevmode \fi \@topsepadd@uestcthesis \topsep \ifvmode \advance \@topsepadd \partopsep \else \unskip \par \fi \if@inlabel \@noparitemtrue \@noparlisttrue \else \if@newlist \@noitemerr \fi \@noparlistfalse \@topsep \@topsepadd \fi \advance \@topsep \parskip \leftskip \z@skip \rightskip \@rightskip \parfillskip \@flushglue \par@deathcycles \z@ \@setpar {\if@newlist \advance \par@deathcycles \@ne \ifnum \par@deathcycles >\@m \@noitemerr {\@@par }\fi \else {\@@par }\fi }\global \@newlisttrue \@outerparskip \parskip }
-
-\def\list@uestcthesis#1#2{\ifnum \@listdepth >5\relax \@toodeep \else \global \advance \@listdepth \@ne \fi \rightmargin \z@ \listparindent \z@ \itemindent \z@ \csname @list\romannumeral \the \@listdepth \endcsname \def \@itemlabel {#1}\let \makelabel \@mklab \@nmbrlistfalse #2\relax \@trivlist@uestcthesis \parskip \parsep \parindent \listparindent \advance \linewidth -\rightmargin \advance \linewidth -\leftmargin \advance \@totalleftmargin \leftmargin \parshape \@ne \@totalleftmargin \linewidth \ignorespaces }
-
-\def\@enum@{\list@uestcthesis {\csname label\@enumctr \endcsname }{\usecounter {\@enumctr }\def \makelabel ##1{\hss \llap {##1}}}}
-
-\def\enumerate{%
- \ifnum \@enumdepth >3 \@toodeep\else
- \advance\@enumdepth \@ne
- \edef\@enumctr{enum\romannumeral\the\@enumdepth}\fi
- \@ifnextchar[{\@@enum@}{\@enum@}
- \parsep=0pt
- \itemsep=0pt
- \parskip=0pt
- \partopsep=0pt
- \topsep=0pt
- }
+\RequirePackage{enumitem}
+\setlist[1]{topsep=0pt,partopsep=0pt,parsep=0pt,itemsep=0pt,leftmargin=*,align=left,labelindent=\parindent}
 \RequirePackage{color,marvosym}
 \DeclareOldFontCommand{\txttbf}{\ttfamily\bfseries}{\mathbf}
 \providecommand{\hlstd}[1]{\textcolor[rgb]{0,0,0}{#1}}
@@ -3117,41 +3550,76 @@ pdfpagelayout={TwoPageRight}
 \providecommand{\hlkwc}[1]{\textcolor[rgb]{0,0,0}{\txttbf{#1}}}
 \providecommand{\hlkwd}[1]{\textcolor[rgb]{0,0,0}{\txttbf{#1}}}
 \definecolor{bgcolor}{rgb}{1,1,1}
-\RequirePackage[header,cols=3,hyper=true]{glossary}
-\makeglossary
+\RequirePackage[style=long3colheader,description,acronym]{glossaries}
+\makeglossaries
 \renewcommand{\glossaryname}{\glossaryname@uestcthesis}
 \renewcommand{\entryname}{\entryname@uestcthesis}
 \renewcommand{\descriptionname}{\descriptionname@uestcthesis}
-\renewcommand{\glspageheader}{\glspageheader@uestcthesis}
-\newcommand{\ifusingglossary}{}
-\newcommand{\fuhao}[3]{
-\glossary{name={#1},description={#2},sort=#3}
-\renewcommand{\ifusingglossary}{true}%设置使用主要符号表
+\renewcommand{\acronymname}{\acronymname@uestcthesis}
+\renewcommand{\pagelistname}{\pagelistname@uestcthesis}
+\newcommand{\fuhao}[3]{%
+\newglossaryentry{#3}{name={#1},description={#2},sort=#3}%
+}
+\newglossarystyle{acronymwithtranslation}{%缩略词表样式定义
+\setglossarystyle{long3colheader}%在long3colheader基础上修改
+\renewcommand*{\glossaryheader}{%重定义表头
+\bfseries\acronymheader@uestcthesis&\bfseries\acronymfull@uestcthesis&
+\bfseries\acronymtranslation@uestcthesis\tabularnewline\endhead}%
+\renewenvironment{theglossary}%重定义列宽
+{\begin{longtable}{lp{\glsdescwidth}p{7em}}}%
+{\end{longtable}}%
+\renewcommand{\glossentry}[2]{%重定义显示什么列：缩略词、英文全称、中文全称
+\glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+\csname glo@##1@first\endcsname & \glossentrydesc{##1}\tabularnewline
+}%
+\renewcommand{\subglossentry}[3]{%
+&
+\glssubentryitem{##2}%
+\glstarget{##2}{\strut}\csname glo@##2@first\endcsname &
+\glossentrydesc{##2}\tabularnewline
+}%
 }
 
+
 \AtBeginDocument{%插入到论文内容的最前面。
 \begin{CJK}{UTF8}{rm}%中文支持环境，此处内容不受ctexbook文类影响，所以必须手动加这个环境。
+\ifdef{\withoutforepages@uestcthesis}{}{%withoutforepages选项效果
 \maketitle%生成并插入封面
-\clearpage{\pagestyle{empty}\cleardoublepage}
+}%
+\ifdef{\onlychapters@uestcthesis}{}{%onlychapters选项效果
 \Cabstractmatter%设置中文摘要版式
+\pdfbookmark[1]{摘要}{Cabstract}%添加中文摘要的PDF书签
 \include{contents/Cabstract}%插入中文摘要
 \clearpage{\pagestyle{empty}\cleardoublepage}
 \Eabstractmatter%设置英文摘要版式
+\pdfbookmark[1]{Abstract}{Eabstract}%添加英文摘要的PDF书签
 \include{contents/Eabstract}%插入英文摘要
 \clearpage{\pagestyle{empty}\cleardoublepage}
 \tocmatter%目录版式
+\pdfbookmark[1]{目录}{tableofcontents}%添加目录的PDF书签
 \tableofcontents%插入目录
+\insertlof%插入图目录
+\insertlot%插入表目录
 \clearpage{\pagestyle{empty}\cleardoublepage}%目录之后另起一页，这样无论目录后有没有主要符号表，主要符号表的页眉设置命令都会应用到下一页。
-\glossarymatterfancy%设置主要符号表版式。
+\acronymnamematter%设置缩略词表版式
+\printacronyms[style=acronymwithtranslation]
+\clearpage{\pagestyle{empty}\cleardoublepage}
+\glossarymatter%设置主要符号表版式。
 \printglossary%插入主要符号表
 \clearpage{\pagestyle{empty}\cleardoublepage}
 \mainmatter%修正主要符号表版式，这里是受目录版式的影响，必须在此加入\mainmatter。
+}%
 \end{CJK}
 \mainmatter%正文区版式
 \makeatletter
 \newcmds@uestcthesis%自定义图表命令，这些命令必须在document环境里声明才能在正文中使用，所以只能放在这里了。
+\abovedisplayskip=6bp
+\abovedisplayshortskip=6bp
+\belowdisplayskip=6bp
+\belowdisplayshortskip=6bp
 \makeatother
 }
+\ifdef{\onlychapters@uestcthesis}{}{%onlychapters选项效果
 \newcommand{\insertacknowledgement}{
 \chapter*{\acknowledgementsname@uestcthesis}%用带星号的章命令插入不带章号的致谢。
 \markboth{\acknowledgementsname@uestcthesis}{}%页眉设置
@@ -3179,8 +3647,10 @@ pdfpagelayout={TwoPageRight}
 \newpage
 \insertreference
 }
-
 \appendix%附录版式
+\renewcommand{\thefigure}{\Alph{chapter}\textendash\arabic{figure}}
+\renewcommand{\thetable}{\Alph{chapter}\textendash\arabic{table}}
+\renewcommand{\theequation}{\Alph{chapter}\textendash\arabic{equation}}
 \renewcommand{\chaptermark}[1]{\markboth{\CTEX@appendixname\Alph{chapter}~  #1 }{}}%附录页眉设置
 \input{contents/appendix.tex}%插入附录内容
 \clearpage
@@ -3236,14 +3706,20 @@ pdfpagelayout={TwoPageRight}
 \include{contents/translation}
 }
 {
+\ifdef{\usecv@uestcthesis}{\usecv@uestcthesis}{
 \IfFileExists{contents/publications.bib}{%如果删除了publications.bib，则不显示这一章
 \CTEXoptions[ bibname={\publicationsname@degree}]%设置攻博/硕期间发表的论文章题目
 \phantomsection%手动添加目录项之前需要这个命令，用以更新目录超链接的跳转页码。
 \addcontentsline{toc}{chapter}{\publicationsname@degree}%将攻博/硕期间发表的论文编入目录
-{\zihao{5}
+{\zihao{5}%
+\def\footnotehint{}%
 \bibliographypublications{contents/publications}%插入攻博/硕期间发表的论文
-}}{}}
+}}{}
+}
+}
 \clearpage\end{CJK}}
+}%这是大括号是前面onlychapters选项的ifdef命令的一部分。
+
 \endinput
 %%
 %% End of file `uestcthesis.cls'.