diff --git a/njuthesis.dtx b/njuthesis.dtx index 008b7173f746dfea6ba6cf46c1bf6a5fc80afe87..45bd51113703e278301d9847e2cf83385b5818a4 100644 --- a/njuthesis.dtx +++ b/njuthesis.dtx @@ -244,7 +244,7 @@ through XeTeX. % % \def\abstractname{Abstract} % \begin{abstract} -% The \textsc{NJuThesis} class is intended for typesetting Nanjing University thesis with LaTeX, providing support for bachelor, master, and doctoral thesis. +% The \textsc{NJuThesis} class is intended for typesetting Nanjing University thesis with \hologo{LaTeX}, providing support for bachelor, master, and doctoral thesis. % \end{abstract} % % \def\abstractname{鐗瑰埆澹版槑} @@ -302,7 +302,7 @@ through XeTeX. % 鏈ā鏉块€氳繃\textsc{DocStrip}杩涜缁存姢锛屽疄闄呬笂鏄竴绉峔emph{鏂囧缂栫▼}銆傛枃瀛︾紪绋嬬殑鏈綋鏄偅浜涚敤鏉ヨ鏄庣殑鏂囧瓧锛屾寜鍐欎功鍐欐枃绔犵殑鏂瑰紡缁勭粐銆� % \file{njuthesis.dtx}鍖呭惈njuthesis妯℃澘鐨勬墍鏈変俊鎭€傚墠鍗婇儴鍒嗕负妯℃澘璇存槑锛屽嵆鍚勭甯哥敤鍛戒护涓庡繀瑕佺殑浣跨敤鏂规硶锛涘悗鍗婇儴鍒嗕负浠g爜瀹炵幇锛屼负甯︽湁璇︾粏娉ㄩ噴鐨刓hologo{TeX}婧愪唬鐮併€傚悗鑰呴厤鍚堥檮褰曪紝涓烘湁鎰忎簡瑙f湰妯℃澘缁嗚妭鐨勫悓瀛︽彁渚涚畝鏄庣殑鎸囧紩銆� % -% 涓嬫枃涓皢鍑虹幇鑻ュ共鐗规畩鏍煎紡锛屽寘鎷琝file{file-example.xxx}绛夈€� +% 涓嬫枃涓皢鍑虹幇鑻ュ共鐗规畩鏍煎紡锛岀敤鏉ユ寚绀轰唬鐮佺粍浠躲€傝濡傦紝\file{file-example.xxx}涓烘枃浠跺悕锛孿pkg{pkg-example}涓哄畯鍖呭悕锛孿opt{opt-example}涓洪€夐」鍚嶏紝\env{env-example}涓洪渶瑕亅\begin{}|鍜寍\end{}|鐨勭幆澧冨悕锛岀瓑銆� % % 濡傛灉鎮ㄥ湪浣跨敤鏈€鏂扮増妯℃澘鏃跺彂鐜颁簡浠讳綍闂锛屾姂鎴栨湁鎰忓悜鍙備笌鏈ā鏉跨殑缁存姢锛岃閫氳繃GitHub issue鎴栬€匭Q缇よ亰鑱旂郴LUG銆� % @@ -316,7 +316,7 @@ through XeTeX. % % 浠庢湰妯℃澘鐨凣ithub Releases椤甸潰涓嬭浇鏈€鏂扮殑鍙戝竷鐗� % -% 浠庢湰妯℃澘鐨凣ithub浠撳簱涓嬭浇鏈€鏂扮殑dtx鏂囦欢鑷瀹夎 +% 浠庢湰妯℃澘鐨凣ithub浠撳簱鎴栬€匩JU Git鍚屾闀滃儚涓嬭浇鏈€鏂扮殑dtx鏂囦欢鑷瀹夎 % % \subsection{鏈湴缂栬瘧} % @@ -326,25 +326,25 @@ through XeTeX. % % \begin{itemize} % \item 涓轰簡閬垮厤涓嶅繀瑕佺殑楹荤儲锛岃灏藉彲鑳戒笅杞� full 鐗堟湰锛屽 texlive-full銆傜畝鑰岃█涔嬶紝涓嬭浇澶х殑閭d釜銆� -% \item 骞朵笖锛屽敖鍙兘浣跨敤鏈€鏂扮増锛堟埅鑷崇洰鍓嶆槸 2021锛夈€�2020 鍙婁箣鍓嶇増鏈娇鐢� PDF 鏍煎紡鐨勫浘鐗囧彲鑳戒細鍑虹幇鍔犵矖闂銆� +% \item 骞朵笖锛屽敖鍙兘浣跨敤鏈€鏂扮増锛堟埅鑷崇洰鍓嶆槸 2021锛夈€�2020 鍙婁箣鍓嶇増鏈娇鐢� PDF 鏍煎紡鐨勫浘鐗囧彲鑳戒細鍑虹幇鍔犵矖闂浠ュ強l3璇硶瑙i噴閿欒銆� % \end{itemize} % % 涓嬭〃鏄洰鍓嶇粡杩囨祴璇曠殑鐜銆傚鏋滄湁鍏朵粬鍙敤涓嶅彲鐢ㄧ殑鐜锛屾杩庤ˉ鍏呫€� % \begin{table}[ht] % \centering % \caption{缁忚繃娴嬭瘯鐨勭幆澧儅 -% % \label{tab:1} +% \label{tab:1} % \begin{tabular}{ccc} -% \toprule -% OS & TeX & 娴嬭瘯鎯呭喌 \\ -% \midrule -% Windows 10 & \hologo{TeX}\,Live 2020 & cref瀛樺湪鏍煎紡闂 \\ -% Windows 10 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\ -% Windows 10 & \hologo{MiKTeX} & 閫氳繃 \\ -% macOS 10.15 & mac\hologo{TeX} 2021 & 閫氳繃 \\ -% Ubuntu 20.04 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\ -% Arch Linux & \hologo{TeX}\,Live 2021 & 閫氳繃 \\ -% \bottomrule +% \toprule +% OS & TeX & 娴嬭瘯鎯呭喌 \\ +% \midrule +% Windows 10 & \hologo{TeX}\,Live 2020 & cref瀛樺湪鏍煎紡闂 \\ +% Windows 10 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\ +% Windows 10 & \hologo{MiKTeX} & 閫氳繃 \\ +% macOS 10.15 & mac\hologo{TeX} 2021 & 閫氳繃 \\ +% Ubuntu 20.04 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\ +% Arch Linux & \hologo{TeX}\,Live 2021 & 閫氳繃 \\ +% \bottomrule % \end{tabular} % \end{table} % @@ -464,21 +464,21 @@ through XeTeX. % % \begin{function}[added=2021-09-07]{customlatinfont} % \begin{syntax} -% customlatinfont = <(windows)|macos|gyre|null> +% customlatinfont = <(windows)|macos|gyre|none> % \end{syntax} % % 鎵嬪姩鎸囧畾鑻辨枃瀛椾綋锛屽彲閫夛細 -% \opt{windows}锛堥粯璁わ級锛� \opt{macos}锛� \opt{gyre}锛� \opt{null}銆� +% \opt{windows}锛堥粯璁わ級锛� \opt{macos}锛� \opt{gyre}锛� \opt{none}銆� % \end{function} % % % \begin{function}[added=2021-09-07]{customchinesefont} % \begin{syntax} -% customchinesefont = <(windows)|macos|fandol|founder|noto|null> +% customchinesefont = <(windows)|macos|fandol|founder|noto|none> % \end{syntax} % % 鎵嬪姩鎸囧畾涓枃瀛椾綋锛屽彲閫夛細 -% \opt{windows}锛堥粯璁わ級锛� \opt{macos}锛� \opt{fandol}锛� \opt{founder}锛孿opt{noto}锛孿opt{null}銆� +% \opt{windows}锛堥粯璁わ級锛� \opt{macos}锛� \opt{fandol}锛� \opt{founder}锛孿opt{noto}锛孿opt{none}銆� % % 鏂规瀛椾綋锛堢畝绻佹墿灞曪級绯诲垪 % FZSSK \href{http://www.foundertype.com/index.php/FontInfo/index/id/151}{鏂规涔﹀畫} 鍏嶈垂鍟嗙敤 @@ -526,74 +526,74 @@ through XeTeX. % 鏈鐢熷彲浠ュ弬鑰冨涓嬪垪琛ㄨ緭鍏ヤ釜浜轰俊鎭€傛敞鎰忎笉鑳芥湁绌鸿锛屾湁绌烘牸鐨勫唴瀹归渶瑕佸皢绌烘牸鏇挎崲涓烘尝娴嚎鎴栬€呬袱绔姞涓婂ぇ鎷彿 % % \begin{ctexexam} -% \njusetup { -% info = { -% TitleA = 涓€绉嶄娇鐢ㄥ崡浜ぇ瀛hologo{LaTeX}妯$増, -% TitleB = 缂栧啓姣曚笟璁烘枃鐨勭粡楠屾€ф柟娉�, -% Title* = {An Empirical Way of Composing Thesis with NJU \hologo{LaTeX} Template}, -% Grade = 2018, -% StudentID = 189114514, -% StudentName = 鍛ㄧ厹鍗�, -% StudentName* = Zhou~Yuhua, -% Department = 鎷夊お璧瀛︿笌鎶€鏈闄�, -% Department* = School~of~\hologo{LaTeX}, -% Major = 鎷夊お璧瑷€瀛�, -% Major* = \hologo{LaTeX}~Linguistics, -% SupervisorA = 鏉庢垚娈�, -% SupervisorA*= Li~Chengdian, -% SupervisorATitle = 鏁欐巿, -% SupervisorATitle* = Professor, -% SupervisorB = 瀛欒但寮�, -% SupervisorB* = Sun~Hemi, -% SupervisorBTitle = 鍓暀鎺�, -% SupervisorBTitle* = Associate professor, -% SubmitDate = 2021骞�8鏈�10鏃�, -% } -% } +% \njusetup { +% info = { +% TitleA = 绗竴琛屾爣棰�, +% TitleB = 绗簩琛屾爣棰�, +% Title* = {My title in English}, +% Grade = 2018, +% StudentID = 189114514, +% StudentName = 鍛ㄧ厹鍗�, +% StudentName* = Zhou~Yuhua, +% Department = 鎷夊お璧瀛︿笌鎶€鏈闄�, +% Department* = School~of~\hologo{LaTeX}, +% Major = 鎷夊お璧瑷€瀛�, +% Major* = \hologo{LaTeX}~Linguistics, +% SupervisorA = 鏉庢垚娈�, +% SupervisorA*= Li~Chengdian, +% SupervisorATitle = 鏁欐巿, +% SupervisorATitle* = Professor, +% SupervisorB = 瀛欒但寮�, +% SupervisorB* = Sun~Hemi, +% SupervisorBTitle = 鍓暀鎺�, +% SupervisorBTitle* = Associate professor, +% SubmitDate = 2021骞�8鏈�10鏃�, +% } +% } % \end{ctexexam} % % 鐮旂┒鐢熷彲浠ュ弬鑰冨涓嬪垪琛ㄨ緭鍏ヤ釜浜轰俊鎭� % % \begin{ctexexam} -% \njusetup { -% info = { -% TitleA = 涓€绉嶄娇鐢ㄥ崡浜ぇ瀛hologo{LaTeX}妯$増, -% TitleB = 缂栧啓姣曚笟璁烘枃鐨勭粡楠屾€ф柟娉�, -% TitleC = 锛堝唴瀹瑰凡缁忚繃鏃讹紝璇﹁璇存槑鎵嬪唽锛�, -% Title* = {An Empirical Way of Composing Thesis with NJU \hologo{LaTeX} Template}, -% Grade = 2018, -% StudentID = dz18114514, -% StudentName = 鍛ㄧ厹鍗�, -% StudentName* = Zhou~Yuhua, -% Department = 鎷夊お璧瀛︿笌鎶€鏈闄�, -% Department* = School~of~\hologo{LaTeX}, -% Major = 鎷夊お璧瑷€瀛�, -% Major* = \hologo{LaTeX}~Linguistics, -% Field = 鎷夊お璧瑷€鍦ㄧ幇褰撲唬鐨勪娇鐢�, -% Field* = Contemporary~Usage~of~the~\hologo{LaTeX}~Language, -% SupervisorA = 鏉庢垚娈�, -% SupervisorA*= Li~Chengdian, -% SupervisorATitle = 鏁欐巿, -% SupervisorATitle* = Professor, -% SubmitDate = 2021骞�8鏈�10鏃�, -% SubmitDate* = {Aug 10, 2021}, -% DefendDate = 2021骞�9鏈�19鏃�, -% ReviewerChairman = 寮犳檽灞眫鏁欐巿, -% ReviewerA = 鐜嬬憺甯寏鏁欐巿, -% ReviewerB = 閮痉绾瞺鍓暀鎺�, -% ReviewerC = 鍗庤妶搴搤鏁欐巿, -% ReviewerD = 鎴磋彶鑿瞺鏁欐巿, -% Classification = 0175.2, -% SecurityLevel = 闄愬埗, -% UDC = 004.72, -% SupervisorContact = {鎷夊お璧瀛︿笌鎶€鏈闄� 鏋濇睙甯傜粨涓樿矾 19 鍙� 114514}, -% } -% } +% \njusetup { +% info = { +% TitleA = 绗竴琛屾爣棰�, +% TitleB = 绗簩琛屾爣棰�, +% TitleC = 绗笁琛屾爣棰�, +% Title* = {My title in English}, +% Grade = 2018, +% StudentID = dz18114514, +% StudentName = 鍛ㄧ厹鍗�, +% StudentName* = Zhou~Yuhua, +% Department = 鎷夊お璧瀛︿笌鎶€鏈闄�, +% Department* = School~of~\hologo{LaTeX}, +% Major = 鎷夊お璧瑷€瀛�, +% Major* = \hologo{LaTeX}~Linguistics, +% Field = 鎷夊お璧瑷€鍦ㄧ幇褰撲唬鐨勪娇鐢�, +% Field* = Contemporary~Usage~of~the~\hologo{LaTeX}~Language, +% SupervisorA = 鏉庢垚娈�, +% SupervisorA*= Li~Chengdian, +% SupervisorATitle = 鏁欐巿, +% SupervisorATitle* = Professor, +% SubmitDate = 2021骞�8鏈�10鏃�, +% SubmitDate* = {Aug 10, 2021}, +% DefendDate = 2021骞�9鏈�19鏃�, +% ReviewerChairman = 寮犳檽灞眫鏁欐巿, +% ReviewerA = 鐜嬬憺甯寏鏁欐巿, +% ReviewerB = 閮痉绾瞺鍓暀鎺�, +% ReviewerC = 鍗庤妶搴搤鏁欐巿, +% ReviewerD = 鎴磋彶鑿瞺鏁欐巿, +% Classification = 0175.2, +% SecurityLevel = 闄愬埗, +% UDC = 004.72, +% SupervisorContact = {鎷夊お璧瀛︿笌鎶€鏈闄� 鏋濇睙甯傜粨涓樿矾 19 鍙� 114514}, +% } +% } % \end{ctexexam} % % \subsection{鎽樿椤祡 % -% 鎽樿椤典竴鑸笉鎻掑叆鐩綍锛岄粯璁ゅ彧娣诲姞pdf涔︾銆傚纭疄鏈夋彃鍏ョ洰褰曠殑闇€姹傦紝璇峰湪\texttt{abstract.sty}鏂囦欢涓畾浣嶅埌濡備笅璇彞 +% % % 鍦ㄤ娇鐢╘hologo{LuaLaTeX}缂栬瘧鏃讹紝鐮旂┒鐢熶腑鏂囨憳瑕侀〉鐨勬爣棰樹細鍑虹幇绌烘牸鏃犱笅鍒掔嚎鐨勯棶棰橈紝鐩墠姝e湪绉瀬瀵绘眰瑙e喅鏂规硶銆� % @@ -606,11 +606,8 @@ through XeTeX. % 鏈鐢熸棤椤电湁锛岄〉闈㈢紪鍙峰眳涓綅浜庨〉鑴氾紱鐮旂┒鐢熸棤椤佃剼锛岄〉鐪夊寘鎷珷鑺傚悕鍜岄〉闈㈢紪鍙枫€� % % -% 瀵逛腑鏂囧姞涓嬪垝绾胯浣跨敤xeCJKfntef鍖呯殑CJKunderline鍛戒护浠f浛uline锛屼互瑙e喅涓枃鐨勬崲琛岄棶棰� -% -% {鍙傝€冩枃鐚〉} +% % -% 闇€瑕佷娇鐢╞iber鎵嬪姩缂栬瘧鎵嶄細鏄剧ず锛屽叿浣撳唴瀹瑰弬鑰� % % {鑷磋阿椤祡 % 鍚屽墠瑷€锛屼娇鐢╘env{acknowledgement}鐜 @@ -619,12 +616,103 @@ through XeTeX. % % 闄勫綍鏀惧湪|\appendix|鍛戒护鍚庯紝浠ヨ嫳鏂囧瓧姣嶈繘琛岀紪鍙� % +% +% +% \subsection{椤甸潰鍏冪礌} +% +% \subsubsection{鍥剧墖} +% +% 鎵€鏈夊浘鐗囬粯璁ゅ瓨鏀惧湪涓荤洰褰曚笅鐨刓texttt{figure/}鏂囦欢澶瑰唴锛屽厑璁哥殑鏂囦欢鍚嶅寘鎷琝file{*.jpg}, \file{*.png}, \file{*.pdf}, \file{*.eps}, +% +% 涓嬮潰杩欎釜渚嬪瓙灞曠ず浜嗗浣曟彃鍏ヤ竴寮犲悕绉颁负\file{myfig.jpg}锛屽搴﹀崰椤甸潰鏂囧瓧瀹藉害涓€鍗婄殑鍥剧墖銆傛敞鎰忔爣绛惧懡浠\label|蹇呴』鏀惧湪鍥炬敞鍛戒护|\caption|涔嬪悗銆� +% +% \begin{ctexexam} +% \begin{figure} +% \includegraphics[width=0.5\textwidth]{myfig} +% \caption{鎴戠殑鍥緘 +% \label{fig:myfig} +% \end{figure} +% \end{ctexexam} +% +% +% 鏂囧瓧鐜粫鍥惧儚锛孿env{wrapfigure}鍚庨潰涓嶈兘鏈夌┖琛� +% +% \begin{ctexexam} +% \begin{wrapfigure}{r}{0cm} +% \includegraphics[width=0.15\textwidth]{myfig} +% \caption{鎴戠殑鍥緘 +% \label{fig:myfig} +% \end{wrapfigure} +% <text> +% \end{ctexexam} +% +% +% \subsubsection{琛ㄦ牸} +% +% 涓嬮潰杩欎釜渚嬪瓙灞曠ず浜嗗浣曟彃鍏ヤ竴寮犺〃鏍� +% \begin{ctexexam} +% \begin{table}[htbp] +% \caption{鎴戠殑琛▆ +% \label{tab:testtab} +% \begin{tabular}{ccc} +% \toprule +% OS & TeX & 娴嬭瘯鎯呭喌 \\ +% \midrule +% 鍗楀ぇTeX & Overleaf & 鈭� \\ +% \bottomrule +% \end{tabular} +% \end{table} +% \end{ctexexam} +% +% +% +% +% +% \subsubsection{浠g爜} +% +% \env{lstlisting}鐜鐢ㄦ潵杩涜浠g爜鎺掔増 +% +% \subsubsection{寮曠敤鏍囩} +% +% 浣跨敤\pkg{cleveref}瀹忓寘瀹炵幇浜嗗甫鍥俱€佽〃绛夐」鐩悕绉扮殑鏅鸿兘寮曠敤锛屼粎闇€浣跨敤|\cref{<label>}|鍛戒护銆� +% +% \subsection{鍙傝€冩枃鐚畗 +% +% 绗﹀悎GB7714-2015瑙勮寖銆備娇鐢╘hologo{biber}浣滀负\hologo{BibTeX}鍚庣銆傞渶瑕佷娇鐢▅biber|鍛戒护鎵嬪姩缂栬瘧鎵嶄細鏄剧ず +% +% 榛樿鍙傝€冩枃鐚瓨鍌ㄤ簬涓荤洰褰曚笅鐨刓file{njuthesis.bib}锛岀洿鎺ュ悜鍏朵腑绮樿创鏂扮殑鍙傝€冩枃鐚嵆鍙€� +% +% 濡傛灉甯屾湜棰濆娣诲姞涓€涓悕鍙玕file{mybiblio.bib}鐨勫弬鑰冩枃鐚洰褰曪紝鍙互鍦ㄤ富鏂囦欢\file{mynjuthesis.tex}鐨勫瑷€鍖轰腑娣诲姞浠ヤ笅鍛戒护锛� +% +% \begin{ctexexam} +% \addbibresource{mybiblio.bib} +% \end{ctexexam} +% +% \subsubsection{浣跨敤EndNote绠$悊鏂囩尞} +% +% 鍗椾含澶у淇℃伅鍖栧缓璁剧鐞嗘湇鍔′腑蹇冨凡璐拱\href{https://itsc.nju.edu.cn/EndNote/list.htm}{EndNote}渚涘叏鏍″笀鐢熷厤璐硅瘯鐢紝鏈€鏂扮増涓篍ndNote 20銆� +% +% +% +% +% +% \subsubsection{浣跨敤Zotero绠$悊鏂囩尞} +% +% \href{https://www.zotero.org/}{Zotero}鏄竴娆惧厤璐圭殑鏂囩尞绠$悊杞欢锛屾敮鎸佹墍鏈夋闈㈠钩鍙般€� +% +% 鍦ㄤ繚鎸乑otero绋嬪簭杩愯鐨勬儏鍐典笅锛岀偣鍑绘祻瑙堝櫒宸ュ叿鏍忕殑Zotero Connector鎻掍欢鍗冲彲鑷姩浠庣綉椤垫姄鍙栧弬鑰冩枃浠朵俊鎭€俍otero涔熸湁鐭ョ綉鎻掍欢 +% +% \subsubsection{鏂囨鍐呭紩鐢▆ +% +% |\cite{myref}|锛寍\citesuthor{myref}| +% +% % \end{documentation} % % \begin{implementation} % % \section{浠g爜瀹炵幇} -% @@鍦╨3docstrip涓〃绀哄悕绌洪棿锛屽湪鐢熸垚cls鏃朵細琚浉搴斿瓧娈垫浛鎹紝璀鍦╪juthesis涓瑻@=nju銆� +% @@鍦╨3docstrip涓〃绀哄悕绌洪棿锛屽湪鐢熸垚cls鏃朵細琚浉搴斿瓧娈垫浛鎹紝璀鍦╘pkg{njuthesis}涓瓅@@=nju|銆� % 灏栨嫭鍙峰寘瑁圭殑|<*class>||</class>|鐢ㄦ潵鎸囧畾鏌愭浠g爜灞炰簬鍝釜鏂囦欢銆� % % \begin{macrocode} @@ -641,6 +729,10 @@ through XeTeX. % \[ 1.5\times\frac{1.3}{1.2} = 1.625\] % \begin{macrocode} linespread=1.625, +% \end{macrocode} +% +% 榛樿涓嶈浇鍏ヤ换浣曞瓧浣擄紝渚涙ā鏉胯嚜琛岃缃� +% \begin{macrocode} fontset=none, zihao=-4 ]{ctexbook}[2018/04/01] @@ -650,11 +742,6 @@ through XeTeX. % \begin{macrocode} \RequirePackage{l3keys2e} % \end{macrocode} -% 鐢ㄤ簬瀛樺偍瀛︿綅鍚嶇О鐨勫叏灞€鍙橀噺锛屾敞鎰忓畯鐨勫懡鍚嶏紝l浠h〃灞€閮ㄥ彉閲忥紝g浠h〃鍏ㄥ眬鍙橀噺 -% \begin{macrocode} -\tl_new:N \l_@@_info_degree_tl -\tl_new:N \l_@@_info_type_tl -% \end{macrocode} % % 鏄惁闇€瑕佸浗瀹跺浘涔﹂灏侀潰鐨勮缃� % \begin{macrocode} @@ -664,6 +751,15 @@ through XeTeX. nlcover .initial:n = false, } % \end{macrocode} +% +% +% \begin{variable}{\l_@@_info_degree_tl,\l_@@_info_type_tl} +% 鐢ㄤ簬瀛樺偍瀛︿綅鍚嶇О鐨勫彉閲忥紝娉ㄦ剰瀹忕殑鍛藉悕锛宭浠h〃灞€閮ㄥ彉閲忥紝g浠h〃鍏ㄥ眬鍙橀噺 +% \begin{macrocode} +\tl_new:N \l_@@_info_degree_tl +\tl_new:N \l_@@_info_type_tl +% \end{macrocode} +% \end{variable} % % 瀛︿綅淇℃伅鐨勮缃� % \begin{macrocode} @@ -801,7 +897,6 @@ through XeTeX. \RequirePackage{xparse} \RequirePackage{titletoc} % 淇敼鐩綍鍐呮爣棰樻牸寮� \RequirePackage[hyphens]{url} % generate better linebreaks in the url -% \RequirePackage[normalem]{ulem} % 缁樺埗涓嬪垝绾� \RequirePackage{dashundergaps} \RequirePackage{setspace} \RequirePackage{lastpage} @@ -887,7 +982,7 @@ through XeTeX. ]{unicode-math} % Math fonts in xetex or luatex % \end{macrocode} % -% +% 閰嶇疆鍥剧墖璺緞 % \begin{macrocode} \RequirePackage{graphicx} \DeclareGraphicsExtensions{.pdf,.eps,.jpg,.png} @@ -895,9 +990,8 @@ through XeTeX. \RequirePackage{wrapfig} % Wrap text around figures % \end{macrocode} % -% 蹇呴』浠ヨ椤哄簭鍔犺浇浠ヤ笅涓変釜鍖� +% 蹇呴』浠ヨ椤哄簭鍔犺浇浠ヤ笅鍖� % \begin{macrocode} -% \RequirePackage{varioref} \RequirePackage[hidelinks,bookmarksnumbered=true]{hyperref} \RequirePackage[capitalise,nameinlink,noabbrev]{cleveref} % \end{macrocode} @@ -924,10 +1018,10 @@ through XeTeX. \keys_define:nn { nju } { customlatinfont .choices:nn = - { gyre, macos, windows, null } + { gyre, macos, windows, none } { \tl_set_eq:NN \g_@@_latin_fontset_tl \l_keys_choice_tl }, customchinesefont .choices:nn = - { fandol, founder, macos, noto, windows, null } + { fandol, founder, macos, noto, windows, none } { \tl_set_eq:NN \g_@@_cjk_fontset_tl \l_keys_choice_tl }, } % \end{macrocode}