diff --git a/njuthesis.dtx b/njuthesis.dtx index eadf6ad27ed91aade86d6c539d7cfff479bba993..0f3470f25fc066d90f5741b18d9cbb9fade74289 100644 --- a/njuthesis.dtx +++ b/njuthesis.dtx @@ -210,7 +210,7 @@ through XeTeX. % %<class>\NeedsTeXFormat{LaTeX2e} %<class>\RequirePackage{expl3} -%<!(readme-zh|readme-en)> \GetIdInfo $Id: njuthesis.dtx 0.9.2 2021-09-17 22:00:00 +0800 NJU LUG <nju.lug@yaoge123.cn> $ +%<!(readme-zh|readme-en)> \GetIdInfo $Id: njuthesis.dtx 0.9.3 2021-09-19 20:00:00 +0800 NJU LUG <nju.lug@yaoge123.cn> $ %<class> {Thesis template for Nanjing University} %<class>\ProvidesExplClass{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} % @@ -234,7 +234,7 @@ through XeTeX. % Nanjing University Linux User Group % \thanks{E-mail: \href{mailto:nju.lug@yaoge123.cn}{nju.lug@yaoge123.cn}}} % -% \date{v0.9.2 \\ Released 2021-09-17} +% \date{v0.9.3 \\ Released 2021-09-19} % % \maketitle % @@ -455,8 +455,8 @@ through XeTeX. % type = <(thesis)|design> % \end{syntax} % -% 鐢ㄤ簬閫夋嫨鏂囨。绫诲瀷骞跺皢鐩稿叧瀛楁杈撳嚭鍦ㄥ皝闈㈠拰鎽樿椤点€傚彲閫夊€煎寘鎷瑃hesis锛堣〃绀烘瘯涓氳鏂囷級鍜宒esign锛堣〃绀烘瘯涓氳璁★級锛岀己鐪佸€间负thesis銆� -% \opt{thesis}锛堥粯璁わ級锛孿opt{design}銆� +% 鐢ㄤ簬閫夋嫨鏂囨。绫诲瀷骞跺皢鐩稿叧瀛楁杈撳嚭鍦ㄥ皝闈㈠拰鎽樿椤点€傚彲閫夊€煎寘鎷琝opt{thesis}锛堣〃绀烘瘯涓氳鏂囷級鍜孿opt{design}锛堣〃绀烘瘯涓氳璁★級锛岀己鐪佸€间负thesis銆� +% % \end{function} % % @@ -466,7 +466,7 @@ through XeTeX. % % 瀛︽牎璁烘枃鏍煎紡瑕佹眰浣跨敤鐨勫瓧浣撲竴鑸凡缁忛瑁呭湪鍚勪釜鎿嶄綔绯荤粺锛屾湰妯℃澘閽堝涓嶅悓骞冲彴杩涜浜嗚嚜鍔ㄦ娴嬮€傞厤锛屽彲浠ュ紑绠卞嵆鐢ㄣ€� % -% 濡傛灉甯屾湜鏇存敼鏈ā鏉夸娇鐢ㄧ殑瀛椾綋锛岃濉啓浠ヤ笅涓や釜閫夐」瑕嗙洊妫€娴嬫搷浣滅郴缁熷緱鍒扮殑璁剧疆 +% 濡傛灉甯屾湜鏇存敼鏈ā鏉夸娇鐢ㄧ殑瀛椾綋锛岃濉啓浠ヤ笅涓や釜閫夐」瑕嗙洊妫€娴嬫搷浣滅郴缁熷緱鍒扮殑璁剧疆銆� % % % \begin{function}[added=2021-09-07]{customlatinfont} @@ -478,6 +478,22 @@ through XeTeX. % \opt{windows}锛堥粯璁わ級锛� \opt{macos}锛� \opt{gyre}锛� \opt{none}銆� % \end{function} % +% 瑗挎枃鍖呮嫭琛嚎锛坰erif锛夈€佹棤琛嚎锛坰ans锛夈€佺瓑瀹斤紙mono锛変笁绉嶅瓧褰� +% \begin{table}[htbp] +% \centering +% \caption{瑗挎枃瀛椾綋娓呭崟} +% \label{tab:latinfontset} +% \begin{tabular}{cccc} +% \toprule +% 鎿嶄綔绯荤粺 & 琛嚎 & 鏃犺‖绾� & 绛夊 \\ +% \midrule +% Windows & Times~New~Roman & Arial & Courier~New \\ +% macOS & Times~New~Roman & Arial & Menlo \\ +% Linux & TeX~Gyre~Termes & TeX~Gyre~Heros & TeX~Gyre~Cursor \\ +% \bottomrule +% \end{tabular} +% \end{table} +% % % \begin{function}[added=2021-09-07]{customchinesefont} % \begin{syntax} @@ -486,37 +502,61 @@ through XeTeX. % % 鎵嬪姩鎸囧畾涓枃瀛椾綋锛屽彲閫夛細 % \opt{windows}锛堥粯璁わ級锛� \opt{macos}锛� \opt{fandol}锛� \opt{founder}锛孿opt{noto}锛孿opt{none}銆� +% \end{function} +% +% 涓枃瀛椾綋鍒嗕负瀹嬩綋锛坰erif锛夈€侀粦浣擄紙sans锛夈€佹シ浣撱€佷豢瀹嬪洓绉嶅瓧褰� +% +% \begin{table}[htbp] +% \centering +% \caption{涓枃瀛椾綋娓呭崟} +% \label{tab:cjkfontset} +% \begin{tabular}{ccccc} +% \toprule +% 鎿嶄綔绯荤粺 & 瀹嬩綋 & 榛戜綋 & 妤蜂功 & 浠垮畫 \\ +% \midrule +% Windows & SimSun & SimHei & KaiTi & FangSong \\ +% macOS & Songti~SC~Light & Heiti~SC~Light & Kaiti~SC & STFangsong \\ +% Linux & FandolSong & FandolHei & FandolKai & FandolFang \\ +% 鏂规 & FZSSK/FZXBSK & FZHTK/FZXH1K & FZKTK & FZFSK \\ +% 鎬濇簮 & Noto~Serif~CJK~SC & Noto~Sans~CJK~SC & FZKTK & FZFSK \\ +% \bottomrule +% \end{tabular} +% \end{table} % -% 鏂规瀛椾綋锛堢畝绻佹墿灞曪級绯诲垪 -% FZSSK \href{http://www.foundertype.com/index.php/FontInfo/index/id/151}{鏂规涔﹀畫} 鍏嶈垂鍟嗙敤 -% -% FZXBSK \href{http://www.foundertype.com/index.php/FontInfo/index/id/164}{鏂规灏忔爣瀹媫 璁捐甯堥潪鍟嗗厤璐� -% -% FZKTK \href{http://www.foundertype.com/index.php/FontInfo/index/id/137}{鏂规妤蜂綋} 鍏嶈垂鍟嗙敤 -% -% FZXH1K \href{http://www.foundertype.com/index.php/FontInfo/index/id/161}{鏂规缁嗛粦涓€} 璁捐甯堥潪鍟嗗厤璐� -% -% FZHTK \href{http://www.foundertype.com/index.php/FontInfo/index/id/131}{鏂规榛戜綋} 鍏嶈垂鍟嗙敤 -% -% FZFSK \href{http://www.foundertype.com/index.php/FontInfo/index/id/128}{鏂规浠垮畫} -% -% FZYouHK_508R \href{http://www.foundertype.com/index.php/FontInfo/index/id/244}{鏂规鎮犻粦508R} 璁捐甯堥潪鍟嗗厤璐� % -% FZYouHK_511M \href{http://www.foundertype.com/index.php/FontInfo/index/id/244}{鏂规鎮犻粦511M} 璁捐甯堥潪鍟嗗厤璐� +% 鍚勪釜绯荤粺鐨勯粯璁ゅ瓧浣撹鍙傝€冧笂杩拌〃鏍笺€傚彲浠ョ湅鍒帮紝鍦ㄦā鏉胯嚜鍔ㄦ娴嬫椂涓嶅悓绯荤粺涓婁娇鐢ㄧ殑瀛椾綋鏈夋墍宸埆锛屽疄闄呰緭鍑虹粨鏋滃彲鑳藉瓨鍦ㄧ粏寰笉鍚�, 浣跨敤鏃惰娉ㄦ剰銆備緥濡傦紝鍦↙inux骞冲彴鎴栬€呬娇鐢ㄤ簡Ubuntu鍚庣鐨勫崡澶hologo{TeX}涓婏紝瀹嬩綋鍔犵矖鏁堟灉鏇存槑鏄撅紱鍙︿竴鏂归潰锛屽湪Windows骞冲彴杩涜缂栬瘧鐨勬晥鏋滄洿鎺ヨ繎Word鍔犵矖\footnote{鍥犱负SimSun娌℃湁鍘熺敓绮椾綋锛岄€氳繃AutoFakeBold=2.17杩涜妯′豢}锛屽缓璁渶鍚庝氦绋挎椂璁剧疆浣跨敤Windows瀛椾綋浠ラ€傚簲璇勫瑙嗚涔犳儻銆� +% +% 鍑轰簬缇庤鑰冭檻锛屾垜浠篃鍗曠嫭鎻愪緵浜嗘柟姝e拰鎬濇簮涓ゅ涓枃瀛椾綋棰勮銆傝〃涓柟姝e瓧浣撻噰鐢ㄤ簡鏂囦欢鍚嶄互缂╃煭闀垮害锛屽叾鍏ㄧО濡備笅鎵€绀猴細 +% +% \begin{table}[htbp] +% \centering +% \caption{鏂规瀛椾綋娓呭崟} +% \label{tab:founder} +% \begin{tabular}{ccc} +% \toprule +% 鏂囦欢鍚� & 鍏ㄧО & 璁稿彲 \\ +% \midrule +% FZSSK & \href{http://www.foundertype.com/index.php/FontInfo/index/id/151}{鏂规涔﹀畫锛堢畝绻佹墿灞曪級} & 鍏嶈垂鍟嗙敤 \\ +% FZXBSK & \href{http://www.foundertype.com/index.php/FontInfo/index/id/164}{鏂规灏忔爣瀹嬶紙绠€绻佹墿灞曪級} & 璁捐甯堥潪鍟嗗厤璐� \\ +% FZHTK & \href{http://www.foundertype.com/index.php/FontInfo/index/id/131}{鏂规榛戜綋锛堢畝绻佹墿灞曪級} & 鍏嶈垂鍟嗙敤 \\ +% FZXH1K & \href{http://www.foundertype.com/index.php/FontInfo/index/id/161}{鏂规缁嗛粦涓€锛堢畝绻佹墿灞曪級} & 璁捐甯堥潪鍟嗗厤璐� \\ +% FZKTK & \href{http://www.foundertype.com/index.php/FontInfo/index/id/137}{鏂规妤蜂綋锛堢畝绻佹墿灞曪級} & 鍏嶈垂鍟嗙敤 \\ +% FZFSK & \href{http://www.foundertype.com/index.php/FontInfo/index/id/128}{鏂规浠垮畫锛堢畝绻佹墿灞曪級} & \\ +% \bottomrule +% \end{tabular} +% \end{table} % -% 鎬濇簮瀛椾綋\footnote{鎬濇簮瀹嬩綋鍜屾€濇簮榛戜綋鏈変袱绉嶈嫳鏂囧懡鍚嶏紝鏈ā鏉块噰鐢℅oogle鐨刵oto绯诲垪}锛� -% \href{https://www.google.com/get/noto/#serif-hans}{鎬濇簮瀹嬩綋}銆� -% \href{https://www.google.com/get/noto/#sans-hans}{鎬濇簮榛戜綋} % % +% 鍏充簬鎬濇簮瀛椾綋鐨勪竴浜涜В閲婏細 +% \begin{itemize} +% \item 鎬濇簮瀹嬩綋鍜屾€濇簮榛戜綋鏈変袱绉嶈嫳鏂囧懡鍚嶏紝鏈ā鏉块噰鐢℅oogle鐨刵oto绯诲垪锛歕href{https://www.google.com/get/noto/#serif-hans}{鎬濇簮瀹嬩綋}銆乗href{https://www.google.com/get/noto/#sans-hans}{鎬濇簮榛戜綋} +% \item 鎬濇簮瀛椾綋骞朵笉鍖呭惈妤蜂功鍜屼豢瀹嬶紝鎵€浠ヤ娇鐢ㄦ柟姝e瓧浣撲唬鏇� +\end{itemize} +% +% % -% 鏂规妤蜂綋銆佹柟姝d豢瀹嬩负鍏嶈垂鍟嗙敤瀛椾綋锛屼笖鏀寔CJK瀛楃闆� -% \href{http://www.foundertype.com/index.php/FontInfo/index/id/128.html}{鏂规浠垮畫} -% \href{http://www.foundertype.com/index.php/FontInfo/index/id/137.html}{鏂规妤蜂綋} % -% 鍚勪釜绯荤粺鐨勯粯璁ゅ瓧浣撹鍙傝€冦€傚彲浠ョ湅鍒帮紝涓嶅悓绯荤粺涓婁娇鐢ㄧ殑瀛椾綋鏈夋墍宸埆锛屽疄闄呰緭鍑虹粨鏋滃彲鑳藉瓨鍦ㄧ粏寰笉鍚�, 浣跨敤鏃惰娉ㄦ剰銆備緥濡傦紝鍦↙inux骞冲彴鎴栬€呬娇鐢ㄤ簡Ubuntu鍚庣鐨勫崡澶hologo{TeX}涓婏紝瀹嬩綋鍔犵矖鏁堟灉鏇存槑鏄撅紱鍙︿竴鏂归潰锛屽湪Windows骞冲彴杩涜缂栬瘧鐨勬晥鏋滄洿鎺ヨ繎Word鍔犵矖\footnote{鍥犱负SimSun娌℃湁鍘熺敓绮椾綋锛岄€氳繃AutoFakeBold=2.17杩涜妯′豢}锛岀鍚堣瑙変範鎯€� -% -% \end{function} % % % @@ -636,7 +676,7 @@ through XeTeX. % % \subsubsection{琛ㄦ牸} % -% 涓嬮潰杩欎釜渚嬪瓙灞曠ず浜嗗浣曟彃鍏ヤ竴寮犺〃鏍� +% 涓嬮潰杩欎釜渚嬪瓙灞曠ず浜嗗浣曟彃鍏ヤ竴寮犺〃鏍笺€傞€氳繃\pkg{booktabs}鎻愪緵鐨剕\toprule|銆亅\midrule|鍜寍\bottomrule|锛屾垜浠彲浠ュ緢杞绘澗鍦扮粯鍒跺嚭涓€寮犳紓浜鑼冪殑涓夌嚎琛ㄣ€� % \begin{ctexexam} % \begin{table}[htbp] % \caption{鎴戠殑琛▆ @@ -651,6 +691,7 @@ through XeTeX. % \end{table} % \end{ctexexam} % +% TODO锛歕pkg{multirow}\pkg{multicol}鍚堝苟鍗曞厓鏍� % % \subsubsection{浠g爜} % @@ -661,7 +702,7 @@ through XeTeX. % \end{lstlisting} % \end{ctexexam} % -% 琛岄棿浠g爜|\lstinline!<code>!| +% 琛岄棿浠g爜|\lstinline!<code>!|锛屽叾涓寘瑁逛唬鐮佺殑涓や釜鎰熷徆鍙峰苟涓嶆槸缁濆鐨勶紝鍙互鏇挎崲鎴愪换浣曚袱涓浉鍚岀殑娌℃湁鍦ㄨ繖娈典唬鐮佷腑鍑虹幇杩囩殑绗﹀彿銆� % % % \subsubsection{鏁板} @@ -677,7 +718,7 @@ through XeTeX. % % 濡備笉闇€瑕佺紪鍙凤紝鍙互鐢╘env{equation*}鎴栬€� |\[<eq>\]| % -% 涔熸彁渚涗簡涓€绯诲垪鐨勬暟瀛︾幆澧冦€傝瘉鏄庣幆澧冧細鍦ㄧ粨灏炬坊鍔犺瘉姣曠鍙� +% 鏈ā鏉夸篃鎻愪緵浜嗕竴绯诲垪鐨勬暟瀛︾幆澧冦€傝瘉鏄庣幆澧冧細鍦ㄧ粨灏炬坊鍔犺瘉姣曠鍙� % \begin{ctexexam} % \begin{proof} % 璇佹槑鎴戞槸鎴� @@ -733,9 +774,27 @@ through XeTeX. % \begin{ctexexam} % \begin{preface} % 鎴戠殑鍓嶈█ +% \vspace{1cm} +% \begin{flushright} +% 鎴戠殑鍚嶅瓧\\ +% 鏃堕棿鍦扮偣 +% \end{flushright} % \end{preface} % \end{ctexexam} % +% \subsubsection{鐩綍椤祡 +% +% 鐩綍銆佸浘鐗囨竻鍗曞拰琛ㄦ牸娓呭崟鍙娇鐢ㄥ涓嬪懡浠ょ敓鎴愩€傜敱浜庣洰鍓嶇敤鏉ヤ慨鏀圭洰褰曟牸寮忕殑\pkg{tocloft}浼氳鐩栦竴浜涢粯璁ら€夐」锛屾墍浠ラ渶瑕佸姞鍏\cleardoublepage|杩涜鎹㈤〉銆� +% +% \begin{ctexexam} +% \tableofcontents +% \cleardoublepage +% \listoffigures +% \cleardoublepage +% \listoftables +% \cleardoublepage +% \end{ctexexam} +% % \subsubsection{鑷磋阿椤祡 % % 鍚屽墠瑷€锛屼娇鐢╘env{acknowledgement}鐜 @@ -1230,8 +1289,8 @@ through XeTeX. \setCJKfamilyfont{zhhei}{SimHei} \setCJKfamilyfont{zhfs}{FangSong} \setCJKfamilyfont{zhkai}{KaiTi}[AutoFakeBold=2.17] - \setCJKfamilyfont{zhnewhei}{Microsoft~YaHei}[ - BoldFont=Microsoft~YaHei~Bold] + % \setCJKfamilyfont{zhnewhei}{Microsoft~YaHei}[ + % BoldFont=Microsoft~YaHei~Bold] } % \end{macrocode} % \end{macro} @@ -1302,6 +1361,8 @@ through XeTeX. % % \begin{macro}{\@@_load_cjk_font_founder:} % 鏂规瀛楃闆嗭紙绠€绻佹墿灞曪級 +FZYouHK_508R \href{http://www.foundertype.com/index.php/FontInfo/index/id/244}{鏂规鎮犻粦508R} 璁捐甯堥潪鍟嗗厤璐癸紝 +% FZYouHK_511M \href{http://www.foundertype.com/index.php/FontInfo/index/id/244}{鏂规鎮犻粦511M} 璁捐甯堥潪鍟嗗厤璐� % \begin{macrocode} \cs_new_protected:Npn \@@_load_cjk_font_founder: { @@ -1325,10 +1386,10 @@ through XeTeX. {FZFSK}[Extension=.ttf] \setCJKfamilyfont{zhkai} {FZKTK}[Extension=.ttf] - \setCJKfamilyfont{zhnewhei} - {FZYouHK_508R}[% 鏂规鎮犻粦508R - Extension=.ttf, - BoldFont=FZYouHK_511M]% 鏂规鎮犻粦511M + % \setCJKfamilyfont{zhnewhei} + % {FZYouHK_508R}[% 鏂规鎮犻粦508R + % Extension=.ttf, + % BoldFont=FZYouHK_511M]% 鏂规鎮犻粦511M } % \end{macrocode} % \end{macro} @@ -1368,8 +1429,10 @@ through XeTeX. \setCJKfamilyfont{zhsong}{Noto~Serif~CJK~SC} \setCJKfamilyfont{zhhei}{Noto~Sans~CJK~SC} - \setCJKfamilyfont{zhfs}{鏂规浠垮畫绠€浣搣[AutoFakeBold=2.17] - \setCJKfamilyfont{zhkai}{鏂规妤蜂綋绠€浣搣[AutoFakeBold=2.17] + \setCJKfamilyfont{zhfs} + {FZFSK}[Extension=.ttf] + \setCJKfamilyfont{zhkai} + {FZKTK}[Extension=.ttf] } % \end{macrocode} % \end{macro}