diff --git a/.vscode/settings.json b/.vscode/settings.json index ce6c41495dc918bf3e59b7d64630285b4341edd6..6cacd4b3771426f0d0a3bfc488ff4e8778f05d46 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -35,7 +35,7 @@ "name": "makedoc", "command": "latexmk", "args": [ - "-pv", + "-xelatex", "njuthesis.dtx" ] } diff --git a/README.md b/README.md index 09812040524116c65f156c1ac21acf8b93a3cf99..e143479604852ba35b6a0866c67a6f27247d6f0e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ 浠�0.9.0鐗堜互鍚庯紝鏈ā鏉夸互DocStrip(`.dtx`)鏍煎紡杩涜缁存姢锛屽悓鏃跺湪浠撳簱鎻愪緵`.cls`鏂囦欢浠ラ檷浣庝娇鐢ㄩ棬妲涖€� -### 浣跨敤DocStrip鏂囦欢 +### 濡備綍浣跨敤DocStrip鏂囦欢 DocStrip鍚堝苟浜哃aTeX婧愪唬鐮佸拰鏂囨。锛屾洿鏈夊埄浜庡畯鍖呯殑鍙戝竷銆傝浣跨敤璇ユ枃浠讹紝璇峰湪褰撳墠宸ヤ綔鐩綍涓嬫墦寮€缁堢锛� @@ -39,8 +39,8 @@ DocStrip鍚堝苟浜哃aTeX婧愪唬鐮佸拰鏂囨。锛屾洿鏈夊埄浜庡畯鍖呯殑鍙戝竷銆傝浣� ### [鍗楀ぇTeX](https://tex.nju.edu.cn)缂栬瘧 -1. 浠巖elease涓嬭浇鍖呭惈[妯℃澘鍏ㄩ儴鏂囦欢](https://github.com/nju-lug/NJUThesis/releases/latest)鐨勫帇缂╁寘 -2. 鐧诲綍[鍗楀ぇTeX](https://tex.nju.edu.cn)锛岀偣鍑籒ew Project -> Upload Project涓婁紶鍒氬垰寰楀埌鐨剒ip鏂囦欢锛屼笂浼犲悗`njuthesis-sample.tex`銆乣njuthesis.cls`绛夋枃浠跺簲鍦ㄦ牴鐩綍锛�0.9.0浠ュ悗鐨勭洰褰曠粨鏋勫涓嬫墍绀猴細 +1. 浠巖elease涓嬭浇鍖呭惈[妯℃澘鍏ㄩ儴鏂囦欢](https://github.com/nju-lug/NJUThesis/releases/latest)鐨刞njuthesis.zip` +2. 鐧诲綍[鍗楀ぇTeX](https://tex.nju.edu.cn)锛岀偣鍑籒ew Project -> Upload Project涓婁紶鍒氬垰寰楀埌鐨勫帇缂╁寘锛屼笂浼犲悗`njuthesis-sample.tex`銆乣njuthesis.cls`绛夋枃浠跺簲鍦ㄦ牴鐩綍锛�0.9.0浠ュ悗鐨勭洰褰曠粨鏋勫涓嬫墍绀猴細 ```shell NJUThesis-master/ diff --git a/njuthesis-sample.tex b/njuthesis-sample.tex index 56f6ba9619e2046848a56529131d12457dde21d0..e67350e24e4347452ddb61eeeff8c68975776ad5 100644 --- a/njuthesis-sample.tex +++ b/njuthesis-sample.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % NJU Thesis % 鍗椾含澶у姣曚笟璁烘枃LaTeX妯℃澘 -% Version 0.9.0 (2021-09-14) +% Version 0.9.0 (2021-09-15) % % 璇峰叧娉ㄩ」鐩湴鍧€浠ヨ幏鍙栨渶鏂板彉鍖� % https://github.com/nju-lug/NJUThesis diff --git a/njuthesis.cls b/njuthesis.cls index 844d00623729ae84b69fae89196d30dbdc319cc5..a8b76764b288835407b24a70aea46b96bdf00648 100644 --- a/njuthesis.cls +++ b/njuthesis.cls @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo $Id: njuthesis.dtx 0.9.0 2020-09-14 12:00:00 +0800 NJU LUG <my@yaoge123.com> $ + \GetIdInfo $Id: njuthesis.dtx 0.9.0 2020-09-15 12:00:00 +0800 NJU LUG <my@yaoge123.com> $ {Thesis template for Nanjing University} \ProvidesExplClass{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \LoadClass[ @@ -75,19 +75,15 @@ MajorEN .tl_set:N = \nju_major_en, Field .tl_set:N = \nju_field, FieldEN .tl_set:N = \nju_field_en, - % 瀵煎笀 MentorA .tl_set:N = \nju_mentor_a, MentorAEN .tl_set:N = \nju_mentor_a_en, MentorATitle .tl_set:N = \nju_mentor_a_title, MentorATitleEN .tl_set:N = \nju_mentor_a_title_en, - % 绗簩瀵煎笀 MentorB .tl_set:N = \nju_mentor_b, MentorBEN .tl_set:N = \nju_mentor_b_en, MentorBTitle .tl_set:N = \nju_mentor_b_title, MentorBTitleEN .tl_set:N = \nju_mentor_b_title_en, - % 鎻愪氦鏃ユ湡 SubmitDate .tl_set:N = \nju_submit_date, - % 绛旇京 DefendDate .tl_set:N = \nju_defend_date, ReviewerChairman .tl_set:N = \nju_reviewer_chairman, ReviewerA .tl_set:N = \nju_reviewer_a, @@ -127,7 +123,7 @@ \RequirePackage{multicol} % Multiple columns in dictionary \RequirePackage{siunitx} % 鐢ㄤ簬涔﹀啓鍗曚綅绗﹀彿 \RequirePackage[version=4]{mhchem} % 鐢ㄤ簬缁樺埗鍒嗗瓙寮� -\RequirePackage{hologo} % 鐢ㄤ簬鐢熸垚鍙互琚彃鍏ヤ功绛剧殑LaTeX logo +\RequirePackage{hologo} \sys_if_engine_xetex:T { \RequirePackage{microtype} @@ -149,8 +145,8 @@ % For windows. % Shipped with the best `grinning-face-with-sweat' support. } -\RequirePackage{blindtext} % 鐢熸垚鐢ㄤ簬娴嬭瘯鐨勫ぇ娈垫棤鎰忎箟鑻辨枃鏂囧瓧 -\RequirePackage{zhlipsum} % 鐢熸垚鐢ㄤ簬娴嬭瘯鐨勫ぇ娈垫棤鎰忎箟涓枃鏂囧瓧 +\RequirePackage{blindtext} +\RequirePackage{zhlipsum} \RequirePackage{amsmath} % Must be loaded before unicode-math \RequirePackage{amsthm} % Mathematical environments \RequirePackage{mathtools} % Mathematical tools to use with amsmath diff --git a/njuthesis.dtx b/njuthesis.dtx index 8e0c8b4d712e7a2ca41b151e4df80741b4e55899..fb48f74f5db70a5c6610df2ae8569dba977b89e8 100644 --- a/njuthesis.dtx +++ b/njuthesis.dtx @@ -40,7 +40,7 @@ 浠�0.9.0鐗堜互鍚庯紝鏈ā鏉夸互DocStrip(`.dtx`)鏍煎紡杩涜缁存姢锛屽悓鏃跺湪浠撳簱鎻愪緵`.cls`鏂囦欢浠ラ檷浣庝娇鐢ㄩ棬妲涖€� -### 浣跨敤DocStrip鏂囦欢 +### 濡備綍浣跨敤DocStrip鏂囦欢 DocStrip鍚堝苟浜哃aTeX婧愪唬鐮佸拰鏂囨。锛屾洿鏈夊埄浜庡畯鍖呯殑鍙戝竷銆傝浣跨敤璇ユ枃浠讹紝璇峰湪褰撳墠宸ヤ綔鐩綍涓嬫墦寮€缁堢锛� @@ -65,8 +65,8 @@ DocStrip鍚堝苟浜哃aTeX婧愪唬鐮佸拰鏂囨。锛屾洿鏈夊埄浜庡畯鍖呯殑鍙戝竷銆傝浣� ### [鍗楀ぇTeX](https://tex.nju.edu.cn)缂栬瘧 -1. 浠巖elease涓嬭浇鍖呭惈[妯℃澘鍏ㄩ儴鏂囦欢](https://github.com/nju-lug/NJUThesis/releases/latest)鐨勫帇缂╁寘 -2. 鐧诲綍[鍗楀ぇTeX](https://tex.nju.edu.cn)锛岀偣鍑籒ew Project -> Upload Project涓婁紶鍒氬垰寰楀埌鐨剒ip鏂囦欢锛屼笂浼犲悗`njuthesis-sample.tex`銆乣njuthesis.cls`绛夋枃浠跺簲鍦ㄦ牴鐩綍锛�0.9.0浠ュ悗鐨勭洰褰曠粨鏋勫涓嬫墍绀猴細 +1. 浠巖elease涓嬭浇鍖呭惈[妯℃澘鍏ㄩ儴鏂囦欢](https://github.com/nju-lug/NJUThesis/releases/latest)鐨刞njuthesis.zip` +2. 鐧诲綍[鍗楀ぇTeX](https://tex.nju.edu.cn)锛岀偣鍑籒ew Project -> Upload Project涓婁紶鍒氬垰寰楀埌鐨勫帇缂╁寘锛屼笂浼犲悗`njuthesis-sample.tex`銆乣njuthesis.cls`绛夋枃浠跺簲鍦ㄦ牴鐩綍锛�0.9.0浠ュ悗鐨勭洰褰曠粨鏋勫涓嬫墍绀猴細 ```shell NJUThesis-master/ @@ -79,7 +79,7 @@ DocStrip鍚堝苟浜哃aTeX婧愪唬鐮佸拰鏂囨。锛屾洿鏈夊埄浜庡畯鍖呯殑鍙戝竷銆傝浣� 鈹� njuthesis.cls 鈹� njuthesis-sample.tex ``` - + 3. 鍦ㄥ崡澶eX椤圭洰鍐呴〉闈㈠乏涓婅鐨刞Menu`涓紝灏嗙紪璇戝櫒鏀逛负`XeLaTeX` 4. 缂栧啓TeX鏂囨。 @@ -207,7 +207,7 @@ through XeTeX. % %<class>\NeedsTeXFormat{LaTeX2e} %<class>\RequirePackage{expl3} -%<!readme> \GetIdInfo $Id: njuthesis.dtx 0.9.0 2020-09-14 12:00:00 +0800 NJU LUG <my@yaoge123.com> $ +%<!(readme|readme-en)> \GetIdInfo $Id: njuthesis.dtx 0.9.0 2020-09-15 12:00:00 +0800 NJU LUG <my@yaoge123.com> $ %<class> {Thesis template for Nanjing University} %<class>\ProvidesExplClass{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} % @@ -627,19 +627,19 @@ through XeTeX. Field .tl_set:N = \nju_field, FieldEN .tl_set:N = \nju_field_en, % \end{macrocode} -% +% +% 瀵煎笀 % Put text here. % \begin{macrocode} - % 瀵煎笀 MentorA .tl_set:N = \nju_mentor_a, MentorAEN .tl_set:N = \nju_mentor_a_en, MentorATitle .tl_set:N = \nju_mentor_a_title, MentorATitleEN .tl_set:N = \nju_mentor_a_title_en, % \end{macrocode} % +% 绗簩瀵煎笀 % Put text here. % \begin{macrocode} - % 绗簩瀵煎笀 MentorB .tl_set:N = \nju_mentor_b, MentorBEN .tl_set:N = \nju_mentor_b_en, MentorBTitle .tl_set:N = \nju_mentor_b_title, @@ -647,14 +647,14 @@ through XeTeX. % \end{macrocode} % % Put text here. +% 鎻愪氦鏃ユ湡 % \begin{macrocode} - % 鎻愪氦鏃ユ湡 SubmitDate .tl_set:N = \nju_submit_date, % \end{macrocode} % % Put text here. +% 绛旇京 % \begin{macrocode} - % 绛旇京 DefendDate .tl_set:N = \nju_defend_date, ReviewerChairman .tl_set:N = \nju_reviewer_chairman, ReviewerA .tl_set:N = \nju_reviewer_a, @@ -722,8 +722,16 @@ through XeTeX. \RequirePackage{multirow} % Cells occupying multiple rows in tables \RequirePackage{multicol} % Multiple columns in dictionary \RequirePackage{siunitx} % 鐢ㄤ簬涔﹀啓鍗曚綅绗﹀彿 +% \end{macrocode} +% +% 鐢ㄤ簬鍖栧 +% \begin{macrocode} \RequirePackage[version=4]{mhchem} % 鐢ㄤ簬缁樺埗鍒嗗瓙寮� -\RequirePackage{hologo} % 鐢ㄤ簬鐢熸垚鍙互琚彃鍏ヤ功绛剧殑LaTeX logo +% \end{macrocode} +% +% 鐢ㄤ簬鐢熸垚鍙互琚彃鍏ヤ功绛剧殑LaTeX logo锛孴ODO 浣跨敤hologo鍒涘缓|latex{}|鍛戒护 +% \begin{macrocode} +\RequirePackage{hologo} % \RequirePackage{needspace} % Required to prevent page break right after a sectioning command % \RequirePackage{xspace} % Better print trailing whitespace % \end{macrocode} @@ -753,11 +761,15 @@ through XeTeX. } % \end{macrocode} % -% 鍑犱釜鐢ㄦ潵杩涜寮€鍙戞祴璇曠殑鍖� +% 鐢熸垚鐢ㄤ簬娴嬭瘯鐨勫ぇ娈垫棤鎰忎箟鑻辨枃鏂囧瓧 +% \begin{macrocode} +\RequirePackage{blindtext} +\RequirePackage{zhlipsum} +% \end{macrocode} +% +% 鍔犺浇浠ュ悗灞曠ず鍐呭杈圭晫 % \begin{macrocode} -\RequirePackage{blindtext} % 鐢熸垚鐢ㄤ簬娴嬭瘯鐨勫ぇ娈垫棤鎰忎箟鑻辨枃鏂囧瓧 -\RequirePackage{zhlipsum} % 鐢熸垚鐢ㄤ簬娴嬭瘯鐨勫ぇ娈垫棤鎰忎箟涓枃鏂囧瓧 -% \RequirePackage{showframe} % 鍔犺浇浠ュ悗灞曠ず鍐呭杈圭晫 +% \RequirePackage{showframe} % \end{macrocode} % % 鏁板 @@ -781,15 +793,14 @@ through XeTeX. \RequirePackage{wrapfig} % Wrap text around figures % \end{macrocode} % -% Put text here. -% \begin{macrocode} % 蹇呴』浠ヨ椤哄簭鍔犺浇浠ヤ笅涓変釜鍖� +% \begin{macrocode} % \RequirePackage{varioref} \RequirePackage[hidelinks,bookmarksnumbered=true]{hyperref} \RequirePackage[capitalise,nameinlink,noabbrev]{cleveref} % \end{macrocode} % -% and so forth. +% \subsection{瀛椾綋璁剧疆} % \begin{macrocode} % 璁剧疆瑗挎枃瀛椾綋 \NewDocumentCommand\set_latin_fontset_windows{}{ @@ -1465,7 +1476,7 @@ through XeTeX. ]{theorem} % \end{macrocode} % -% \section{灏侀潰璁捐} +% \subsection{灏侀潰缁樺埗} % \begin{macrocode} % 鎷煎悎鏍囬 \tl_const:Nn \nju_title {\nju_title_a \nju_title_b \nju_title_c}