diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c4301fa4ed9a7e5e2d6c5f246afeb68e2f01e53..40f79cf978e84a26f0914abf5bb4c3ce771f9ce1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,6 @@
- `nlcover` 閫夐」鏇村悕涓� `nl-cover`
- `blind` 閫夐」鏇村悕涓� `anonymous`
- 璋冩暣瀹氱悊绫荤幆澧冮€夐」 `theorem`
-- 浣跨敤 `create-theorem` 杩涜榛樿鐨勫畾鐞嗙被鐜閰嶇疆
- 鎽樿銆佺洰褰曘€侀〉鐪夐〉鑴氳缃」鏇村悕
- 璋冩暣鐮旂┒鐢熸ā鏉跨殑灏侀潰甯冨眬 - [#144]
- 绉婚櫎鐮旂┒鐢熻嫳鏂囨憳瑕佺殑涓嬪垝绾�
@@ -396,7 +395,7 @@
[鏈彂甯僝: https://github.com/nju-lug/NJUThesis/compare/v1.0.0...HEAD
-[0.20.0]: https://github.com/nju-lug/NJUThesis/compare/v0.20.0...v1.0.0
+[1.0.0]: https://github.com/nju-lug/NJUThesis/compare/v0.20.0...v1.0.0
[0.20.0]: https://github.com/nju-lug/NJUThesis/compare/v0.19.0...v0.20.0
[0.19.0]: https://github.com/nju-lug/NJUThesis/compare/v0.18.0...v0.19.0
[0.18.0]: https://github.com/nju-lug/NJUThesis/compare/v0.17.0...v0.18.0
diff --git a/docs/njuthesis-setup.def b/docs/njuthesis-setup.def
index 5103f1c3c1be3c064f38f9d64e112fed422d97e4..9f2a61466c9e3ab5093cd7b5f5518d721520cec4 100644
--- a/docs/njuthesis-setup.def
+++ b/docs/njuthesis-setup.def
@@ -146,7 +146,7 @@
% image 绫荤敤浜庤浇鍏ュ缃殑鍥剧墖
\njusetup[image]{
- % path = {{./figure/}{./image/}}
+ % path = {{./figure/}{./image/}},
% 鍥剧墖鎼滅储璺緞
%
nju-emblem = {nju-emblem},
diff --git a/source/njuthesis.dtx b/source/njuthesis.dtx
index ced6a7f27e369d3b0ad914978c498e91da541d44..fe70973e6d37a55f4405ccd3b143581b7b8951d4 100644
--- a/source/njuthesis.dtx
+++ b/source/njuthesis.dtx
@@ -118,7 +118,7 @@ To produce the documentation run the original source files ending with
%<*!(driver|install)>
% ^^A 璇氳€€鐧惧豢锛岄泟鍒涗竴娴�
% ^^A 鍗椾含澶у涓€鐧句簩鍗佸懆骞村崕璇為個鎮ㄥ叡瑗勭洓涓撅紒
-%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.0.0 2022-08-08 14:50:00
+%<+!driver>\GetIdInfo $Id: njuthesis.dtx 1.0.1 2022-08-10 18:50:00
%<+!driver> +0800 NJU LUG <git+nju-lug-email-3104-issue-@yaoge123.cn>$
%<class> {Thesis template for Nanjing University}
%<class>\ProvidesExplClass{njuthesis}
@@ -134,13 +134,14 @@ To produce the documentation run the original source files ending with
%<*driver>
\ProvidesFile{njuthesis.dtx}
\documentclass[fontset=fandol]{ctxdoc}
-\usepackage{listings,njuvisual,tabularray,unicode-math,zhlineskip}
+\usepackage{listings,njuvisual,tabularray,unicode-math,xeCJKfntef,zhlineskip}
\usepackage[firstpage=true]{background}
\backgroundsetup{
contents={\njuemblem[white!85!gray]{22cm}{!}},
scale=1, angle=0, hshift=-4cm
}
\definecolor{olgreen}{HTML}{138a07}
+\renewcommand\emph[1]{\CJKunderdot[textformat=\itshape]{#1}}
\newcommand\olbutton[1]{\textcolor{olgreen}{\bfseries #1}}
\newcommand\tikzlogo{Ti\emph{k}Z}
\hypersetup{
@@ -351,7 +352,7 @@ To produce the documentation run the original source files ending with
% \thanks{E-mail: \href{mailto:git+nju-lug-email-3104-issue-@yaoge123.cn}
% {git+nju-lug-email-3104-issue-@yaoge123.cn}}}
%
-% \date{v1.0.0 \quad 2022-08-08}
+% \date{v1.0.1 \quad 2022-08-10}
%
% \changes{v0.1}{2021/09/04}{寮€濮嬪紑鍙戙€倉
% \changes{v0.2}{2021/09/07}{鍒濇鎼缓浜嗗彲鐢ㄧ殑妯℃澘銆倉
@@ -389,17 +390,17 @@ To produce the documentation run the original source files ending with
% \maketitle
%
% \begin{abstract}
-% 鍗椾含澶у瀛︿綅璁烘枃 \LaTeX 妯℃澘 \cls{njuthesis} 鍩轰簬鏈鐢熼櫌鐨勮鏂囨挵鍐�
-% 瑙勮寖鍒朵綔锛屽悓鏃跺弬鑰冪爺绌剁敓闄㈡彁渚涚殑纭曞＋銆佸崥澹浣嶆潗鏂欏寘锛岀敤浜庣敓鎴愮鍚堝崡浜ぇ瀛﹀
-% 浣嶈鏂囨帓鐗堣姹傚拰鐩稿簲鐨勫浗瀹惰鑼冦€佽涓氭爣鍑嗙殑瀛︿綅璁烘枃锛屾棬鍦ㄤ负鍚屽鎻愪緵姣曚笟璁烘枃涔�
-% 鍐欑殑鏂逛究銆�
+% \cls{njuthesis} 鏄埗浣滃崡浜ぇ瀛︽湰绉戠敓姣曚笟璁烘枃銆佺爺绌剁敓瀛︿綅璁烘枃銆佸崥澹悗鍑虹珯鎶ュ憡鐨�
+% \LaTeX 鏂囨。绫汇€傛湰妯℃澘鍩轰簬鏈鐢熼櫌鐨勮鏂囨挵鍐欒鑼冨埗浣滐紝鍚屾椂鍙傝€冪爺绌剁敓闄㈡彁渚涚殑纭曞＋銆�
+% 鍗氬＋瀛︿綅鏉愭枡鍖咃紝鐢ㄤ簬鐢熸垚绗﹀悎鍗椾含澶у鎺掔増瑕佹眰鍜岀浉搴旂殑鍥藉瑙勮寖銆佽涓氭爣鍑嗙殑瀛︿綅璁�
+% 鏂囷紝鍔涙眰閫氳繃 \LaTeX3 璇硶瀹炵幇娓呮櫚鐨勫疄鐜伴€昏緫銆佽緝楂樼殑鍙畾鍒舵€т互鍙婂弸濂界殑鐢ㄦ埛鎺ュ彛銆�
% \end{abstract}
%
% \def\abstractname{Abstract}
% \begin{abstract}
% The \cls{njuthesis} class is intended for typesetting Nanjing University
% dissertations with \LaTeX, providing support for bachelor, master,
-% and doctoral thesis.
+% doctoral theses as well as postdoctoral reports.
% \end{abstract}
%
% \vspace{2cm}
@@ -962,8 +963,8 @@ To produce the documentation run the original source files ending with
% \begin{syntax}
% type = <(bachelor)|master|doctor|postdoc>
% \end{syntax}
-% 閫夋嫨姣曚笟璁烘枃妯℃澘绫诲瀷锛岃繖灏嗗喅瀹氭ā鏉挎暣浣撶殑澶栬銆�
-% 鍙€夊€煎垎鍒负瀛﹀＋锛堟湰绉戠敓锛夈€佺澹爺绌剁敓鍜屽崥澹爺绌剁敓锛岄粯璁や负瀛﹀＋銆�
+% 閫夋嫨姣曚笟璁烘枃妯℃澘绫诲瀷锛岃繖灏嗗喅瀹氭ā鏉挎暣浣撶殑澶栬銆傚彲閫夊€煎垎鍒负
+% 瀛﹀＋锛堟湰绉戠敓锛夈€佺澹爺绌剁敓銆佸崥澹爺绌剁敓鍜屽崥澹悗锛岄粯璁や负瀛﹀＋銆�
% \end{function}
%
% \begin{function}[added=2021-09-07,updated=2022-07-01]{degree}
@@ -1202,18 +1203,19 @@ To produce the documentation run the original source files ending with
% 瀛椾綋閰嶇疆銆俉indows 鍜� macOS 浠ュ鐨勭郴缁熼噰鐢� \opt{gyre} 閰嶇疆銆�
%
% \begin{table}[!htbp]
+% \def\TG#1{TG~#1~\TA}
% \centering
% \begin{talltblr} [
% caption = {瑗挎枃瀛椾綋閰嶇疆},
-% label = {tab:latin-fontset},
+% label = {tab:latin-fontset},
% note{a} = {TG 琛ㄧず \href{http://www.gust.org.pl/projects/e-foundry/tex-gyre}{\TeX~Gyre}銆倉 ]
% { colspec = {cccc} }
% \toprule
-% 閰嶇疆鍚嶇О & 琛嚎浣� & 鏃犺‖绾夸綋 & 绛夊瀛椾綋 \\
+% 閰嶇疆鍚嶇О & 琛嚎浣� & 鏃犺‖绾夸綋 & 绛夊瀛椾綋 \\
% \midrule
-% \opt{win} & Times~New~Roman & Arial & Courier~New \\
-% \opt{mac} & Times~New~Roman & Arial & Menlo \\
-% \opt{gyre} & TG Termes & TG Heros & TG Cursor \\
+% \opt{win} & Times~New~Roman & Arial & Courier~New \\
+% \opt{mac} & Times~New~Roman & Arial & Menlo \\
+% \opt{gyre} & \TG{Termes} & \TG{Heros} & \TG{Cursor} \\
% \bottomrule
% \end{talltblr}
% \end{table}
@@ -1223,39 +1225,40 @@ To produce the documentation run the original source files ending with
%
% \begin{function}[added=2022-07-02]{math-font}
% \begin{syntax}
-% math-font=<asana|cambria|fira|garamond|lm|...|termes|xits|none>
+% math-font=<asana|cambria|fira|garamond|lm|...|termes|(xits)|none>
% \end{syntax}
-% 璁剧疆鏁板瀛椾綋銆�
+% 璁剧疆鏁板瀛椾綋銆傚畬鏁村垪琛ㄨ琛� {tab:math-fontset}銆�
% \end{function}
%
-% 鏈ā鏉块噰鐢� \pkg{unicode-math} 瀹忓寘閰嶇疆鏁板鍏紡鐜涓娇鐢ㄧ殑瀛椾綋銆�
-% 涓庡師鐢� \LaTeX{} 鏈€鎺ヨ繎鐨勫瓧浣撳搴� \opt{lm}锛�
-% 涓� MS Word 鏈€鎺ヨ繎鐨勫瓧浣撳搴� \opt{cambria}銆�
+% 鏈ā鏉块粯璁ら噰鐢� \pkg{unicode-math} 瀹忓寘閰嶇疆鏁板妯″紡涓嬩娇鐢ㄧ殑瀛椾綋銆�
+% 涓庡師鐢� \LaTeX{} 鏈€鎺ヨ繎鐨勫瓧浣撳搴� \opt{lm}锛孧S Word 棰勮鐨勫瓧浣撳搴� \opt{cambria}銆�
%
% \begin{table}[!htbp]
+% \def\NCM{New Computer Modern}
% \centering
% \begin{talltblr} [
% caption = {鏁板瀛椾綋閰嶇疆},
-% label = {tab:math-fontset},
+% label = {tab:math-fontset},
% note{a} = {TG 琛ㄧず \href{http://www.gust.org.pl/projects/e-foundry/tex-gyre}{\TeX~Gyre}銆倉,
% note{b} = {绮椾綋浣跨敤 XITS Math Bold銆倉 ]
% { colspec = {ccl} }
% \toprule
-% 閰嶇疆鍚嶇О & 瀛椾綋鍚嶇О & 鎻忚堪 \\
+% 閰嶇疆鍚嶇О & 瀛椾綋鍚嶇О & 鎻忚堪 \\
% \midrule
-% \opt{asana} & Asana Math & \\
-% \opt{cambria} & Cambria Math & 寰蒋 Office 棰勮鐨勬暟瀛﹀瓧浣� \\
-% \opt{fira} & Fira Math & 鏃犺‖绾挎暟瀛﹀瓧浣擄紝Fira 椋庢牸 \\
-% \opt{garamond} & Garamond Math & Garamond 椋庢牸 \\
-% \opt{lm} & Latin Modern Math & Computer Modern 椋庢牸 \\
-% \opt{libertinus} & Libertinus Math & \\
-% \opt{stix} & STIX Math & Times 椋庢牸 \\
-% \opt{bonum} & TG Bonum Math \TblrNote{a} & \\
-% \opt{dejavu} & TG DejaVu Math \TblrNote{a} & DejaVu 椋庢牸 \\
-% \opt{pagella} & TG Pagella Math \TblrNote{a} & Palatino 椋庢牸 \\
-% \opt{schola} & TG Schola Math \TblrNote{a} & \\
-% \opt{termes} & TG Termes Math \TblrNote{a} & Times 椋庢牸 \\
-% \opt{xits} & XITS Math \TblrNote{b} & 鍩轰簬 STIX锛孴imes 椋庢牸 \\
+% \opt{asana} & Asana Math & \\
+% \opt{cambria} & Cambria Math & 寰蒋 Office 棰勮鐨勬暟瀛﹀瓧浣� \\
+% \opt{fira} & Fira Math & 鏃犺‖绾挎暟瀛﹀瓧浣擄紝Fira 椋庢牸 \\
+% \opt{garamond} & Garamond Math & Garamond 椋庢牸 \\
+% \opt{lm} & Latin Modern Math & Computer Modern 椋庢牸 \\
+% \opt{libertinus} & Libertinus Math & \\
+% \opt{newcm} & \NCM Math & Computer Modern 椋庢牸 \\
+% \opt{stix} & STIX Math & Times 椋庢牸 \\
+% \opt{bonum} & TG Bonum Math \TA & \\
+% \opt{dejavu} & TG DejaVu Math \TA & DejaVu 椋庢牸 \\
+% \opt{pagella} & TG Pagella Math \TA & Palatino 椋庢牸 \\
+% \opt{schola} & TG Schola Math \TA & \\
+% \opt{termes} & TG Termes Math \TA & Times 椋庢牸 \\
+% \opt{xits} & XITS Math \TB & 鍩轰簬 STIX锛孴imes 椋庢牸 \\
% \bottomrule
% \end{talltblr}
% \end{table}
@@ -1846,23 +1849,24 @@ To produce the documentation run the original source files ending with
% \end{function}
%
% \opt{theorem/type} 鍒濆瀹氫箟鐨勭幆澧冨垪琛ㄥ琛▇\ref{tab:mathenv} 鎵€绀恒€�
-% 鍏朵腑璇佹槑鐜杈冧负鐗规畩锛屼笉缂栧彿涓斾細鍦ㄧ粨灏炬坊鍔犺瘉姣曠鍙枫€�
% 杩欎簺鐜骞舵病鏈夐鍏堝垱寤猴紝浣跨敤鏂规硶瑙佷笅闈㈢殑渚嬪瓙銆�
%
% \begin{table}[htbp]
% \centering
-% \caption{棰勭疆鐨勬暟瀛﹀畾鐞嗙幆澧儅
-% \label{tab:mathenv}
-% \begin{tabular}{cc|cc}
+% \begin{talltblr} [
+% caption = {棰勭疆鐨勬暟瀛﹀畾鐞嗙幆澧儅,
+% label = {tab:mathenv},
+% note{a} = {璇佹槑鐜杈冧负鐗规畩锛屼笉缂栧彿涓斾細鍦ㄧ粨灏炬坊鍔犺瘉姣曠鍙枫€倉 ]
+% { colspec = {cc|cc} }
% \toprule
-% \bf 鏍囩 & \bf 鍚嶇О & \bf 鏍囩 & \bf 鍚嶇О \\
+% 鏍囩 & 鍚嶇О & 鏍囩 & 鍚嶇О \\
% \midrule
-% axiom & 鍏悊 & lemma & 寮曠悊 \\
-% corollary & 鎺ㄨ & proof & 璇佹槑 \\
-% definition & 瀹氫箟 & theorem & 瀹氱悊 \\
-% example & 渚� & & \\
+% axiom & 鍏悊 & lemma & 寮曠悊 \\
+% corollary & 鎺ㄨ & proof \TA & 璇佹槑 \\
+% definition & 瀹氫箟 & theorem & 瀹氱悊 \\
+% example & 渚� & & \\
% \bottomrule
-% \end{tabular}
+% \end{talltblr}
% \end{table}
%
% \begin{function}[added=2022-08-05]{theorem/define}
@@ -2050,16 +2054,15 @@ To produce the documentation run the original source files ending with
% note{a} = {鍦ㄦ鏍峰紡涓� \tn{parencite} 鏁堟灉绛夊悓浜� \tn{cite}銆倉 ]
% { colspec = {cll} }
% \toprule
-% 寮曠敤鏂瑰紡 & 鍛戒护 & 鎺掔増鏁堟灉 \\
+% 寮曠敤鏂瑰紡 & 鍛戒护 & 鎺掔増鏁堟灉 \\
% \midrule
-% 鍗曠瘒鏂囩尞 & \tn{cite}\TblrNote{a} &
-% 浣滆€呭姞骞翠唤鐢ㄦ嫭鍙峰寘鍥村彲璁剧疆椤电爜 \\
-% 澶氱瘒鏂囩尞 & \tn{cite} & 鍒嗗彿闅斿紑 \\
-% 鏍囨敞椤电爜 & \tn{pagescite} & 浣滆€呭姞骞翠唤鐢ㄦ嫭鍙峰寘鍥磋嚜鍔ㄩ〉鐮� \\
-% 鏍囨敞骞翠唤 & \tn{yearcite} & 鐢ㄦ嫭鍙峰寘鍥寸殑骞翠唤 \\
-% 鏍囨敞骞翠唤銆侀〉鐮� & \tn{yearpagescite} & 鎻愪緵骞翠唤鐢ㄦ嫭鍙峰寘鍥磋嚜鍔ㄩ〉鐮� \\
-% 鏍囨敞浣滆€� & \tn{textcite} & 浣滆€呬负涓昏鍔犲姞鎷彿鍖呭洿骞翠唤 \\
-% 瀹屾暣鑴氭敞 & \tn{footfullcite} & 鑴氭敞鏂瑰紡 \\
+% 鍗曠瘒鏂囩尞 & \tn{cite} \TA & 浣滆€呭姞骞翠唤鐢ㄦ嫭鍙峰寘鍥村彲璁剧疆椤电爜 \\
+% 澶氱瘒鏂囩尞 & \tn{cite} & 鍒嗗彿闅斿紑 \\
+% 鏍囨敞椤电爜 & \tn{pagescite} & 浣滆€呭姞骞翠唤鐢ㄦ嫭鍙峰寘鍥磋嚜鍔ㄩ〉鐮� \\
+% 鏍囨敞骞翠唤 & \tn{yearcite} & 鐢ㄦ嫭鍙峰寘鍥寸殑骞翠唤 \\
+% 鏍囨敞骞翠唤銆侀〉鐮� & \tn{yearpagescite} & 鎻愪緵骞翠唤鐢ㄦ嫭鍙峰寘鍥磋嚜鍔ㄩ〉鐮� \\
+% 鏍囨敞浣滆€� & \tn{textcite} & 浣滆€呬负涓昏鍔犲姞鎷彿鍖呭洿骞翠唤 \\
+% 瀹屾暣鑴氭敞 & \tn{footfullcite} & 鑴氭敞鏂瑰紡 \\
% \bottomrule
% \end{talltblr}
% \end{table}
@@ -2867,23 +2870,6 @@ To produce the documentation run the original source files ending with
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\g_@@_thm_type_clist}
-% 榛樿瀹氱悊绫诲瀷銆佸ご鍚嶇О锛屼互鍙婃槸鍚﹂渶瑕佺紪鍙峰拰璇佹瘯绗﹀彿銆�
-% \begin{macrocode}
-\clist_new:N \g_@@_thm_type_clist
-\clist_gset:Nn \g_@@_thm_type_clist
- {
- { axiom } { 鍏悊 },
- { corollary } { 鎺ㄨ },
- { definition } { 瀹氫箟 },
- { example } { 渚� },
- { lemma } { 寮曠悊 },
- { proof, *+ } { 璇佹槑 },
- { theorem } { 瀹氱悊 }
- }
-% \end{macrocode}
-% \end{variable}
-%
% \begin{variable}{\c_@@_today_tl}
% 缂栬瘧褰撳ぉ鏃ユ湡锛屾牸寮忎负 |yyyy-mm-dd|銆�
% \begin{macrocode}
@@ -2943,6 +2929,13 @@ To produce the documentation run the original source files ending with
%
% \subsection{鍐呴儴鍑芥暟}
%
+% \begin{macro}{\@@_null:}
+% 绛変环浜� \LaTeXe{} 涓殑 \tn{null}銆�
+% \begin{macrocode}
+\cs_new:Nn \@@_null: { \hbox:n { } }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@@_quad:,\@@_qquad:}
% 绛変环浜� \LaTeXe{} 涓殑 \tn{quad} 鍜� \tn{qquad}銆�
% \begin{macrocode}
@@ -3062,13 +3055,13 @@ To produce the documentation run the original source files ending with
\cs_new_protected:Npn \@@_box_spread:NNn #1#2#3
{
\mode_leave_vertical:
- \@@_get_width:Nn \l_@@_tmpa_dim { #2 #3 }
+ \@@_get_width:Nn \l_@@_tmp_skip { #2 #3 }
\hbox_to_wd:nn { #1 }
{
- \dim_compare:nTF { \l_@@_tmpa_dim > #1 }
+ \dim_compare:nTF { \l_@@_tmp_skip > #1 }
{
\tex_hfil:D \scalebox
- { \dim_to_decimal_in_unit:nn { #1 } { \l_@@_tmpa_dim } }
+ { \dim_to_decimal_in_unit:nn { #1 } { \l_@@_tmp_skip } }
[ 1.0 ] { #2 #3 } \tex_hfil:D
}
{ #2 \tl_map_inline:nn { #3 } { ##1 \tex_hfil:D } \tex_unskip:D }
@@ -3199,55 +3192,53 @@ To produce the documentation run the original source files ending with
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_full_uline:Nn,\@@_full_uline:Nx}
+% \begin{macro}{\@@_get_width_print:Nn,\@@_get_width_print:Nv,
+% \@@_get_width_print:Nx}
% 妯法鏁撮〉鐨勪笅鍒掔嚎銆�
% \begin{arguments}
% \item 瀹藉害锛寍dim| 鍨嬪彉閲�
% \item 鏂囨湰
% \end{arguments}
-% 鍏堜娇鐢� \cs{@@_get_text_width:Nn} 鑾峰彇鏂囨湰鍐呭瀹藉害锛�
+% 鍏堜娇鐢� \cs{@@_get_width:Nn} 鑾峰彇鏂囨湰鍐呭鍒板彸杈硅窛鐨勫搴︼紝
% 璇ュ搴﹀瓨鍌ㄥ湪璋冪敤鐨� |dim| 鍨嬪彉閲忎腑銆傞殢鍚庤緭鍑烘枃鏈唴瀹广€�
% \begin{macrocode}
-\cs_new_protected:Npn \@@_full_uline:Nn #1#2
+\cs_new_protected:Npn \@@_get_width_print:Nn #1#2
{
\@@_get_width:Nn #1 { #2 }
\dim_set:Nn #1 { \textwidth - #1 } #2
}
-\cs_generate_variant:Nn \@@_full_uline:Nn { Nx }
+\cs_generate_variant:Nn \@@_get_width_print:Nn { Nv }
+\cs_generate_variant:Nn \@@_get_width_print:Nn { Nx }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_uline_entry:Nnnn}
+% \begin{macro}{\@@_uline_entry:Nn}
% 鐢熸垚鍗犳暣椤靛搴︾殑涓嬪垝绾挎潯鐩€�
% \begin{arguments}
% \item 瀹藉害锛寍dim| 鍨嬪彉閲�
% \item 鏂囨湰
-% \item 鏂囨湰
-% \item 鍒嗛殧绗�
% \end{arguments}
% \begin{macrocode}
-\cs_new_protected:Npn \@@_uline_entry:Nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_uline_entry:Nn #1#2
{
- \@@_full_uline:Nx #1 { \@@_name:n { #2 } #4 }
- \@@_box_ulined_info:Nn #1 { #3 }
+ \@@_get_width_print:Nv #1 { c_@@_name_ #2 _tl }
+ \@@_box_ulined_info:Nn #1 { #2 }
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_uline_bientry:Nnnn}
+% \begin{macro}{\@@_uline_bientry:Nn}
% 鐢熸垚鍗犲崐椤靛搴︾殑涓嬪垝绾挎潯鐩€�
% \begin{arguments}
% \item 瀹藉害锛寍dim| 鍨嬪彉閲�
% \item 鏂囨湰
-% \item 鏂囨湰
-% \item 鍒嗛殧绗�
% \end{arguments}
% \begin{macrocode}
-\cs_new_protected:Npn \@@_uline_bientry:Nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_uline_bientry:Nn #1#2
{
- \@@_full_uline:Nx #1 { \@@_name:n { #2 } #4 }
+ \@@_get_width_print:Nv #1 { c_@@_name_ #2 _tl }
\dim_sub:Nn #1 { \textwidth / 2 }
- \@@_box_ulined_info:Nn #1 { #3 }
+ \@@_box_ulined_info:Nn #1 { #2 }
}
% \end{macrocode}
% \end{macro}
@@ -3677,10 +3668,10 @@ To produce the documentation run the original source files ending with
bottom-skip = \l_@@_bottom_skip,
align =
{
- l = { \cs_set_eq:NN \@@_align: \raggedright },
- r = { \cs_set_eq:NN \@@_align: \raggedleft },
- c = { \cs_set_eq:NN \@@_align: \centering },
- n = { \__nju_cs_clear:N \@@_align: }
+ l = { \cs_set_eq:NN \@@_align: \raggedright },
+ r = { \cs_set_eq:NN \@@_align: \raggedleft },
+ c = { \cs_set_eq:NN \@@_align: \centering },
+ n = { \cs_set:Nn \@@_align: { } }
}
}
{
@@ -4274,7 +4265,7 @@ To produce the documentation run the original source files ending with
\sys_if_engine_luatex:T
{
\RequirePackage { lua-ul }
- \NewDocumentCommand \njuline { m } { \underLine{#1} \null }
+ \NewDocumentCommand \njuline { m } { \underLine{#1} \@@_null: }
}
% \end{macrocode}
% \end{macro}
@@ -5792,7 +5783,7 @@ To produce the documentation run the original source files ending with
% \subsection{鍥剧墖琛ㄦ牸}
%
% \begin{macro}{image/path}
-% \changes{v1.0}{2021/08/06}{鎻愪緵鍥剧墖璺緞璁剧疆銆倉
+% \changes{v1.0}{2022/08/06}{鎻愪緵鍥剧墖璺緞璁剧疆銆倉
% 澶栫疆鍥剧墖璺緞锛岀瓑鏁堜簬 \tn{graphicspath}銆�
% \begin{macrocode}
\keys_define:nn { nju / image } { path .code:n = { \graphicspath {#1} } }
@@ -5860,7 +5851,7 @@ To produce the documentation run the original source files ending with
% \end{macro}
%
% \begin{macro}{label-sep/figure,label-sep/table,label-sep/equation}
-% \changes{1.0}{2022/07/31}{娣诲姞缂栧彿杩炴帴绗﹁缃」銆倉
+% \changes{v1.0}{2022/07/31}{娣诲姞缂栧彿杩炴帴绗﹁缃」銆倉
% 淇敼鍥剧墖銆佽〃鏍笺€佸叕寮忕紪鍙蜂腑鐨勮繛鎺ョ銆�
% \footnote{\url{https://tex.stackexchange.com/q/61756/}}
% \begin{macrocode}
@@ -5929,10 +5920,26 @@ To produce the documentation run the original source files ending with
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{theorem/type,theorem/define}
-% 瀹氫箟鍜屽垱寤哄畾鐞嗙被鐜鐨勬帴鍙ｃ€�
+% \begin{macro}{theorem/type}
+% 瀹氫箟瀹氱悊绫荤幆澧冦€�
+% \begin{macrocode}
+ type .clist_gset:N = \g_@@_thm_type_clist,
+ type .initial:n =
+ {
+ { axiom } { 鍏悊 },
+ { corollary } { 鎺ㄨ },
+ { definition } { 瀹氫箟 },
+ { example } { 渚� },
+ { lemma } { 寮曠悊 },
+ { proof, *+ } { 璇佹槑 },
+ { theorem } { 瀹氱悊 }
+ },
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{theorem/define}
+% 鍒涘缓瀹氱悊绫荤幆澧冦€�
% \begin{macrocode}
- type .clist_set:N = \g_@@_thm_type_clist,
define .value_forbidden:n = true,
define .code:n =
{
@@ -6679,14 +6686,15 @@ To produce the documentation run the original source files ending with
% \begin{macrocode}
\cs_new_protected:Npn \@@_cover_top_nl:
{
- \dim_set:Nn \l_@@_tmpa_dim { 3.2 em }
- \dim_set:Nn \l_@@_tmpb_dim { 9 em }
- \@@_box_spread_name:Nn \l_@@_tmpa_dim { clc } \@@_hskip:
- \@@_box_ulined_info:Nn \l_@@_tmpb_dim { clc } \tex_hfill:D
+ \dim_set:Nn \l_@@_tmpa_dim { 38.6 pt }
+ \dim_set:Nn \l_@@_tmpb_dim { 109 pt }
+ \@@_box_spread_name:Nn \l_@@_tmpa_dim { clc } \@@_hskip:
+ \@@_box_ulined_info:Nn \l_@@_tmpb_dim { clc } \tex_hfill:D
\@@_box_spread_name:Nn \l_@@_tmpa_dim { secretlv } \@@_hskip:
\@@_box_ulined_info:Nn \l_@@_tmpb_dim { secretlv } \tex_par:D
- \@@_box_spread_name:Nn \l_@@_tmpa_dim { udc } \@@_hskip:
- \@@_box_ulined_info:Nn \l_@@_tmpb_dim { udc } \tex_hfill:D \hbox:n { }
+ \@@_box_spread_name:Nn \l_@@_tmpa_dim { udc } \@@_hskip:
+ \@@_box_ulined_info:Nn \l_@@_tmpb_dim { udc } \tex_hfill:D
+ \@@_null:
}
% \end{macrocode}
% \end{macro}
@@ -6715,20 +6723,28 @@ To produce the documentation run the original source files ending with
% \begin{macrocode}
\cs_new_protected:Npn \@@_cover_info_nl:
{
- \skip_set:Nn \l_@@_tmp_skip { 1 em plus 1 fill }
- \@@_uline_list:NNn \c_@@_name_supvinfo_tl \l_@@_tmp_skip
+ \tl_set:Nx \l_@@_tmpa_tl
{
\clist_use:Nn \g_@@_info_supv_clist { ~ }
\clist_use:Nn \g_@@_info_supvii_clist { ~ }
\@@_hskip: \g_@@_info_supvcont_tl
}
- \@@_uline_bientry:Nnnn \l_@@_tmpa_dim { degree } { degree } { }
- \@@_uline_bientry:Nnnn \l_@@_tmpa_dim { majorb } { major } { }
- \tex_par:D
- \@@_uline_bientry:Nnnn \l_@@_tmpa_dim { submitdate } { submitdate } { }
- \@@_uline_bientry:Nnnn \l_@@_tmpa_dim { defenddate } { defenddate } { }
+ \skip_set:Nn \l_@@_tmp_skip { .5 em plus 1 fill }
+ \@@_uline_list:NNn \l_@@_tmpa_tl \l_@@_tmp_skip
+ { \c_@@_name_supvinfo_tl }
+% \end{macrocode}
+% 涓存椂鏇挎崲鏄剧ず鐨勫悕绉板瓧鏍枫€�
+% \begin{macrocode}
+ \group_begin:
+ \tl_set_eq:NN \c_@@_name_major_tl \c_@@_name_majorb_tl
+ \@@_uline_bientry:Nn \l_@@_tmpa_dim { degree }
+ \@@_uline_bientry:Nn \l_@@_tmpa_dim { major }
+ \tex_par:D
+ \group_end:
+ \@@_uline_bientry:Nn \l_@@_tmpa_dim { submitdate }
+ \@@_uline_bientry:Nn \l_@@_tmpa_dim { defenddate }
\tex_par:D
- \@@_uline_entry:Nnnn \l_@@_tmpa_dim { confer } { confer } { }
+ \@@_uline_entry:Nn \l_@@_tmpa_dim { confer }
}
% \end{macrocode}
% \end{macro}
@@ -7094,9 +7110,9 @@ To produce the documentation run the original source files ending with
% \begin{macrocode}
\cs_new_protected:Npn \@@_p_decl_sign:nn #1#2
{
- \@@_name:n {#1} \c_@@_name_colon_tl \hfill
+ \@@_name:n {#1} \c_@@_name_colon_tl \tex_hfill:D
\@@_name:n {#2} \c_@@_name_colon_tl
- \skip_horizontal:n { 160 pt } \null \@@_vskip:
+ \skip_horizontal:n { 160 pt } \@@_null: \@@_vskip:
}
%</def-p>
% \end{macrocode}
@@ -7602,7 +7618,7 @@ To produce the documentation run the original source files ending with
% \end{macrocode}
% 涓撲笟銆佸勾绾с€佸鍚嶃€�
% \begin{macrocode}
- \@@_full_uline:Nx \l_@@_tmp_skip
+ \@@_get_width_print:Nx \l_@@_tmp_skip
{
\dim_set:Nn \l_@@_tmpa_dim { 11 em }
\dim_set:Nn \l_@@_tmpb_dim { 4 em }
@@ -7615,7 +7631,7 @@ To produce the documentation run the original source files ending with
% \end{macrocode}
% 瀵煎笀濮撳悕銆佽亴绉般€�
% \begin{macrocode}
- \@@_full_uline:Nx \l_@@_tmpa_dim { \c_@@_name_supva_tl #1 }
+ \@@_get_width_print:Nx \l_@@_tmpa_dim { \c_@@_name_supva_tl #1 }
\@@_box_ulined_info:Nn \l_@@_tmpa_dim { supvfull }
}
% \end{macrocode}