diff --git a/coverinfo.sty b/coverinfo.sty index f2138e59e179b2a3540c2d61e2a336f7ee1c28b1..e02da3fd0e30a869f46b6b16dba89719faee3107 100644 --- a/coverinfo.sty +++ b/coverinfo.sty @@ -18,5 +18,5 @@ \tl_const:Nn \MentorTitle {鏁欐巿} \tl_const:Nn \MentorTitle_EN {Professor} \tl_const:Nn \SubmitDate {2077骞�12鏈�31鏃 -\tl_const:Nn \Degree {鏈}% 瀛︿綅 +\tl_const:Nn \Degree {UG}% 瀛︿綅 鏈锛歎G \tl_const:Nn \Type {thesis}% thesis锛氭瘯涓氳鏂囷紝design:姣曚笟璁捐 \ No newline at end of file diff --git a/njuthesis.cls b/njuthesis.cls index 15682a1254206cbf4b16b68f700143b508efcda2..1db9bd879028ba0eb90727e5f08b4b002ca195e2 100644 --- a/njuthesis.cls +++ b/njuthesis.cls @@ -26,11 +26,3 @@ % 杈撳叆閰嶇疆鏂囦欢 \input{profile/profile.cls} - -\ifthenelse{\equal{\Type}{thesis}} -{ - \NewDocumentCommand \typename {} {\Degree 姣曚笟璁烘枃} -} -{ - \NewDocumentCommand \typename {} {\Degree 姣曚笟璁捐} -} diff --git a/profile/cover.sty b/profile/cover.sty index 5c4bc97ef452319c737cc2f65055a91cee235a32..c7e17f93c0d5ef0b2d286a4d9bbc7f735101698e 100644 --- a/profile/cover.sty +++ b/profile/cover.sty @@ -14,41 +14,42 @@ \tl_new:N \cover_oneline_title \tl_set:Nn \cover_oneline_title { \begin{tabular}{p{4.2em}c} - \coverbox:n {闄㈢郴} + \coverbox:n {闄hfill 绯粆 & \cover_underline:nn {250pt}{\songti\Department}\\ - \coverbox:n {涓撲笟} + \coverbox:n {涓揬hfill 涓殅 & \cover_underline:nn {250pt}{\songti\Major}\\ - \coverbox:n {棰樼洰} + \coverbox:n {棰榎hfill 鐩畗 & \cover_underline:nn {250pt}{\textbf{\songti\TitleA}} \\ \int_compare:nNnTF { \TitleLength } = { 2 } { - \coverbox:n {} + \coverbox:n {\hfill} & \cover_underline:nn {250pt}{\textbf{\songti\TitleB}} \\ }{} \int_compare:nNnTF { \TitleLength } = { 3 } { - \coverbox:n {} + \coverbox:n {\hfill} & \cover_underline:nn {250pt}{\textbf{\songti\TitleB}} \\ - \coverbox:n {} + \coverbox:n {\hfill} & \cover_underline:nn {250pt}{\textbf{\songti\TitleC}} \\ }{} - \end{tabular} \\ + \end{tabular}\\ \begin{tabular}{p{4.2em}cp{4.2em}c} - \coverbox:n {骞寸骇} + \coverbox:n {骞碶hfill 绾 & \cover_underline:nn {90pt}{\Grade} - & \coverbox:n {瀛﹀彿} + & \coverbox:n {瀛hfill 鍙穧 & \cover_underline:nn {90pt}{\songti\StudentID}\\ \end{tabular}\\ + \begin{tabular}{p{4.2em}c} - \coverbox:n {瀛︾敓濮撳悕} + \coverbox:n {瀛hfill 鐢焅hfill 濮揬hfill 鍚峿 & \cover_underline:nn {250pt}{\StudentName} \end{tabular}\\ \begin{tabular}{p{4.2em}cp{4.2em}c} - \coverbox:n {瀵煎笀} + \coverbox:n {瀵糪hfill 甯坿 & \cover_underline:nn {90pt}{\Mentor} - & \coverbox:n {鑱岀О} + & \coverbox:n {鑱孿hfill 绉皚 & \cover_underline:nn {90pt}{\MentorTitle}\\ \end{tabular}\\ % % 绗簩瀵煎笀 @@ -61,52 +62,49 @@ % \end{tabular} % \fi \begin{tabular}{p{4.2em}c} - \coverbox:n {鎻愪氦鏃ユ湡} + \coverbox:n {鎻怽hfill 浜hfill 鏃hfill 鏈焳 & \cover_underline:nn {250pt}{\SubmitDate}\\ \end{tabular} } +% 鍒ゆ柇绫诲瀷 +\ifthenelse{\equal{\Degree}{UG}} +{ + \NewDocumentCommand \Degreename {} {\hfill 鏈琝hfill 绉慭hfill } +} +{} + +\ifthenelse{\equal{\Type}{thesis}} +{ + \NewDocumentCommand \typename {} {\Degreename 姣昞hfill 涓歕hfill 璁篭hfill 鏂嘰hfill} +} +{ + \NewDocumentCommand \typename {} {\Degreename 姣昞hfill 涓歕hfill 璁綷hfill 璁hfill} +} + % 閲嶅畾涔塵aketitle鐢熸垚灏侀潰 \RenewDocumentCommand \maketitle {} {% \thispagestyle{empty} \pagenumbering{Roman} % Start \begin{spacing}{1.25} - \vskip 0mm + \vskip 0mm \hskip -10mm \includegraphics[width=2.55cm]{njulogo}\\ \begin{center} \includegraphics[height=3.35cm]{njuname}\\ - \vskip 10mm + \vskip 10mm {\zihao{1}\makebox[9em][s]{\textbf{\songti\typename}}}\\ - % 涓夎鏍囬 + 绗簩瀵煎笀鍙兘浼氬鑷存孩鍑� - % 鏁板瓧鍙互鍐嶈皟 - % \ifnjut@title@threelinetitle - % \ifnjut@title@twosupervisors - % \vskip 18mm - % \else - % \vskip 22mm - % \fi - % \else - \vskip 26mm - % \fi + \vfill \vskip\stretch{0} {\bgroup \kaishu\zihao{3} \def\tabcolsep{1pt} - \def\arraystretch{1.5} - % \ifnjut@title@twolinetitle - % \njut@covertable@twolinetitle - % \else - % \ifnjut@title@threelinetitle - % \njut@covertable@threelinetitle - % \else - \cover_oneline_title - % \fi - % \fi + \def\arraystretch{1.5} \cover_oneline_title \egroup}\\ - \vskip 8mm + \vfill \end{center} \end{spacing} \cleardoublepage + \vfill % \newpage } \ No newline at end of file diff --git a/profile/packages.sty b/profile/packages.sty index 9fd0d3697b43b8e10d710495a587a029ca5179f5..945a2f4a1965702c54e7892e85a443583ab134ee 100644 --- a/profile/packages.sty +++ b/profile/packages.sty @@ -31,6 +31,7 @@ \RequirePackage{hologo} % 鐢ㄤ簬鐢熸垚鍙互琚彃鍏ヤ功绛剧殑LaTeX logo \RequirePackage{needspace} % Required to prevent page break right after a sectioning command \RequirePackage{xspace} % Better print trailing whitespace +\RequirePackage{microtype} \RequirePackage{blindtext} % 鐢熸垚鐢ㄤ簬娴嬭瘯鐨勫ぇ娈垫棤鎰忎箟鑻辨枃鏂囧瓧 \RequirePackage{zhlipsum} % 鐢熸垚鐢ㄤ簬娴嬭瘯鐨勫ぇ娈垫棤鎰忎箟涓枃鏂囧瓧