diff --git a/njuthesis.dtx b/njuthesis.dtx
index 4e3dbb2e59dfc50b2aa941b8af5249276efe2097..0af3f2c18408f2b3d746cff8eb069ca289e3704b 100644
--- a/njuthesis.dtx
+++ b/njuthesis.dtx
@@ -217,7 +217,11 @@ through XeTeX.
%<*driver>
\ProvidesFile{njuthesis.dtx}
\documentclass{ctxdoc}
-\usepackage{listings,xcolor}
+\usepackage{listings,xcolor,tabularray}
+\UseTblrLibrary{booktabs,siunitx,diagbox}
+\DefTblrTemplate{caption-tag}{default}{琛╘hspace{0.25em}\thetable}
+\SetTblrStyle{caption-tag}{font=\bfseries}
+\DefTblrTemplate{caption-sep}{default}{\quad}
\definecolor{njuviolet}{cmyk}{0.5,1,0,0.4}
\definecolor{njumagenta}{cmyk}{0.05,1,0.55,0}
\definecolor{njublue}{cmyk}{0.8,0.5,0,0}
@@ -461,105 +465,90 @@ through XeTeX.
%
%
%
-% \subsubsection{鎸囧畾瀛椾綋}
-%
+% \subsubsection{鎸囧畾瀛椾綋\protect\footnote{
+% 鏈妭鎻愬強鐨勫瓧搴撲腑锛屼腑鏂囧瓧搴撳彧鏈夋柟姝ｄ功瀹嬨€佹柟姝ｉ粦浣撱€佹柟姝ｆシ浣撱€佹柟姝ｄ豢瀹嬨€佷袱绉嶆€濇簮瀛椾綋鍜屽洓绉岶andol瀛椾綋鑳藉鍏嶈垂鍟嗙敤锛�
+% 鑻辨枃瀛楀簱涓彧鏈� Times New Roman銆丼TIX 鍜屼笁绉峔Hologo{TeX} Gyre瀛椾綋鑳藉鍏嶈垂鍟嗙敤銆�
+% 鍥犳锛岃嫢闇€瑕佸皢鏈ā鏉跨敤浜庡晢涓氱浉鍏崇殑娲诲姩锛岃鍜ㄨ涓撲笟浜哄＋銆倉}
%
% 瀛︽牎璁烘枃鏍煎紡瑕佹眰浣跨敤鐨勫瓧浣撲竴鑸凡缁忛瑁呭湪鍚勪釜鎿嶄綔绯荤粺锛屾湰妯℃澘閽堝涓嶅悓骞冲彴杩涜浜嗚嚜鍔ㄦ娴嬮€傞厤锛屽彲浠ュ紑绠卞嵆鐢ㄣ€�
%
-% 濡傛灉甯屾湜鏇存敼鏈ā鏉夸娇鐢ㄧ殑瀛椾綋锛岃濉啓浠ヤ笅涓や釜閫夐」瑕嗙洊妫€娴嬫搷浣滅郴缁熷緱鍒扮殑璁剧疆銆�
+% 濡傛灉甯屾湜鏇存敼鏈ā鏉夸娇鐢ㄧ殑瀛椾綋锛岃濉啓浠ヤ笅涓や釜閫夐」浠ヨ鐩栨搷浣滅郴缁熸娴嬪緱鍒扮殑璁剧疆銆�
%
+% \begin{function}[added=2021-09-07]{customchinesefont}
+% \begin{syntax}
+% customchinesefont = <(windows)|macos|fandol|founder|noto|none>
+% \end{syntax}
+%
+% 鎵嬪姩鎸囧畾涓枃瀛椾綋锛屽彲閫夛細
+% \opt{windows}锛堥粯璁わ級锛� \opt{macos}锛� \opt{fandol}锛� \opt{founder}锛孿opt{noto}锛孿opt{none}銆�
+% \end{function}
%
% \begin{function}[added=2021-09-07]{customlatinfont}
% \begin{syntax}
% customlatinfont = <(windows)|macos|gyre|none>
% \end{syntax}
%
-% 鎵嬪姩鎸囧畾鑻辨枃瀛椾綋锛屽彲閫夛細
+% 鎵嬪姩鎸囧畾瑗挎枃瀛椾綋锛屽彲閫夛細
% \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}
+% 鏍规嵁瀛︽牎璁烘枃鏍煎紡鐨勮姹傦紝鏈ā鏉夸娇鐢ㄧ殑涓枃瀛椾綋涓昏鏈墈\songti 瀹嬩綋}銆亄\heiti 榛戜綋}銆亄\kaishu 妤蜂綋}銆亄\fangsong 浠垮畫}鍥涚锛�
+% 瑗挎枃瀛椾綋涓昏鏈夎‖绾夸綋锛圽textup{serif}锛夈€佹棤琛嚎浣擄紙\textsf{sans-serif}锛夊拰绛夊瀛椾綋锛圽texttt{monospace}锛変笁绉嶃€�
+% 鍦ㄧ敓鎴愯鏂囨椂锛岄渶瑕佸皢姣忎竴绉嶅瓧浣擄紙瀹嬩綋銆佹シ浣擄級涓庝竴绉嶅瓧搴擄紙鎿嶄綔绯荤粺涓殑 ttf 鏂囦欢锛夌浉瀵瑰簲銆�
+% 鐢变簬涓嶅悓鎿嶄綔绯荤粺鑷甫鐨勫瓧搴撲笉鍚岋紝鍦ㄤ笉鍚岀殑鎿嶄綔绯荤粺涓婁娇鐢ㄥ悓涓€濂楅厤缃細瀵艰嚧缂哄瓧銆佺紪璇戝嚭閿欑瓑鍚庢灉銆�
+% 鍥犳锛屾湰妯℃澘瀵逛簬涓枃瀛椾綋鍜岃タ鏂囧瓧浣撻兘鎻愪緵浜嗗绉嶅瓧浣撻厤缃€�
%
-%
-% \begin{function}[added=2021-09-07]{customchinesefont}
-% \begin{syntax}
-% customchinesefont = <(windows)|macos|fandol|founder|noto|none>
-% \end{syntax}
+% 鏈ā鏉挎彁渚涚殑涓枃瀛椾綋閰嶇疆濡傝〃 \ref{tab:chinesefontset} 鎵€绀恒€�
+% 鍦ㄤ笉鎸囧畾瀛椾綋閰嶇疆鐨勬儏鍐典笅锛屾湰妯℃澘榛樿浣跨敤涓庢搷浣滅郴缁熺浉瀵瑰簲鐨勫瓧浣撻厤缃紙瑙佽〃涓墠涓夎锛學indows 鍜� macOS 浠ュ鐨勭郴缁熼噰鐢� Fandol 閰嶇疆锛夈€�
+% 姝ゅ锛屾垜浠篃鍗曠嫭鎻愪緵浜嗘柟姝ｅ拰鎬濇簮涓ゅ涓枃瀛椾綋閰嶇疆銆�
%
-% 鎵嬪姩鎸囧畾涓枃瀛椾綋锛屽彲閫夛細
-% \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}
+% \begin{talltblr}[
+% caption = {涓枃瀛椾綋閰嶇疆鍒楄〃},
+% label = {tab:chinesefontset},
+% note{a} = {姝ゅ瓧浣撳彧鏈夊父瑙勮嚜閲嶏紝鍥犳鏈ā鏉夸腑浣跨敤浼矖浣撲唬鏇跨矖浣搣,
+% note{b} = {浣跨敤鏂规灏忔爣瀹嬩綔涓虹矖浣搣,
+% note{c} = {浣跨敤鏂规榛戜綋浣滀负绮椾綋},
+% note{d} = {鑰冭檻鍒拌幏鍙栧瓧浣撶殑闅炬槗绋嬪害锛岄噰鐢� noto 瀛椾綋琛ㄧず鎬濇簮瀛椾綋},
+% note{e} = {鎬濇簮瀛椾綋骞朵笉鍖呭惈妤蜂功鍜屼豢瀹嬶紝鑰孉dobe妤蜂綋鍜屼豢瀹嬮毦浠ョ洿鎺ヤ笅杞斤紝鍥犳浣跨敤鏂规瀛椾綋浠ｆ浛},
+% ]{colspec = {ccccc}}
+% \toprule
+% 閰嶇疆鍚嶇О & 瀹嬩綋 & 榛戜綋 & 妤蜂功 & 浠垮畫 \\
+% \midrule
+% Windows & 涓槗瀹嬩綋\TblrNote{a} & 涓槗榛戜綋 & 涓槗妤蜂綋\TblrNote{a} & 涓槗浠垮畫 \\
+% macOS & 鍗庢枃瀹嬩綋 & 鍗庢枃榛戜綋 & 鍗庢枃妤蜂綋 & 鍗庢枃浠垮畫 \\
+% Fandol & Fandol瀹嬩綋 & Fandol榛戜綋 & Fandol妤蜂綋\TblrNote{a} & Fandol浠垮畫 \\
+% 鏂规 & 鏂规涔﹀畫\TblrNote{b} & 鏂规缁嗛粦涓€\TblrNote{c} & 鏂规妤蜂綋 & 鏂规浠垮畫 \\
+% 鎬濇簮 & 鎬濇簮瀹嬩綋\TblrNote{d} & 鎬濇簮榛戜綋\TblrNote{d} & 鏂规妤蜂綋\TblrNote{e} & 鏂规浠垮畫\TblrNote{e} \\
+% \bottomrule
+% \end{talltblr}
% \end{table}
%
+% 鍙互鐪嬪嚭锛屼笉鍚岀郴缁熶笂浣跨敤鐨勫瓧浣撲互鍙婂姞绮楃殑鏂瑰紡鏈夋墍宸埆锛屽疄闄呰緭鍑虹粨鏋滃彲鑳藉瓨鍦ㄧ粏寰笉鍚岋紝浣跨敤鏃惰娉ㄦ剰銆�
+% 鑻ユ兂瑕佽幏寰椾笌 Word 鐗堟湰妯℃澘鏈€涓鸿创杩戠殑浣撻獙锛屽彲浠ラ€氳繃鎵嬪姩瀹夎 Windows 鑷甫鐨勪腑鏄撳畫浣撱€佷腑鏄撻粦浣撱€佷腑鏄撴シ浣撳拰涓槗浠垮畫锛屽苟璁剧疆浣跨敤 Windows 瀛椾綋鏉ュ疄鐜般€�
%
-% 鍚勪釜绯荤粺鐨勯粯璁ゅ瓧浣撹鍙傝€冧笂杩拌〃鏍笺€傚彲浠ョ湅鍒帮紝鍦ㄦā鏉胯嚜鍔ㄦ娴嬫椂涓嶅悓绯荤粺涓婁娇鐢ㄧ殑瀛椾綋鏈夋墍宸埆锛屽疄闄呰緭鍑虹粨鏋滃彲鑳藉瓨鍦ㄧ粏寰笉鍚�, 浣跨敤鏃惰娉ㄦ剰銆備緥濡傦紝鍦↙inux骞冲彴鎴栬€呬娇鐢ㄤ簡Ubuntu鍚庣鐨勫崡澶hologo{TeX}涓婏紝瀹嬩綋鍔犵矖鏁堟灉鏇存槑鏄撅紱鍙︿竴鏂归潰锛屽湪Windows骞冲彴杩涜缂栬瘧鐨勬晥鏋滄洿鎺ヨ繎Word鍔犵矖\footnote{鍥犱负SimSun娌℃湁鍘熺敓绮椾綋锛岄€氳繃AutoFakeBold=2.17杩涜妯′豢}锛屽缓璁渶鍚庝氦绋挎椂璁剧疆浣跨敤Windows瀛椾綋浠ラ€傚簲璇勫瑙嗚涔犳儻銆�
-%
-% 鍑轰簬缇庤鑰冭檻锛屾垜浠篃鍗曠嫭鎻愪緵浜嗘柟姝ｅ拰鎬濇簮涓ゅ涓枃瀛椾綋棰勮銆傝〃涓柟姝ｅ瓧浣撻噰鐢ㄤ簡鏂囦欢鍚嶄互缂╃煭闀垮害锛屽叾鍏ㄧО濡備笅鎵€绀猴細
+% 鏈ā鏉挎彁渚涚殑瑗挎枃瀛椾綋閰嶇疆濡傝〃 \ref{tab:latinfontset} 鎵€绀恒€�
+% 鍦ㄤ笉鎸囧畾瀛椾綋閰嶇疆鐨勬儏鍐典笅锛屾湰妯℃澘榛樿浣跨敤涓庢搷浣滅郴缁熺浉瀵瑰簲鐨勫瓧浣撻厤缃紙瑙佽〃涓墠涓夎锛學indows 鍜� macOS 浠ュ鐨勭郴缁熼噰鐢� gyre 閰嶇疆锛夈€�
%
% \begin{table}[htbp]
% \centering
-% \caption{鏂规瀛椾綋娓呭崟}
-% \label{tab:founder}
-% \begin{tabular}{ccc}
+% \caption{瑗挎枃瀛椾綋娓呭崟}
+% \label{tab:latinfontset}
+% \begin{tabular}{cccc}
% \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}{鏂规浠垮畫锛堢畝绻佹墿灞曪級} & \\
+% Windows & Times~New~Roman & Arial & Courier~New \\
+% macOS & Times~New~Roman & Arial & Menlo \\
+% gyre & \Hologo{TeX}~Gyre~Termes & \Hologo{TeX}~Gyre~Heros & \Hologo{TeX}~Gyre~Cursor \\
% \bottomrule
% \end{tabular}
% \end{table}
%
-%
+% 鑻ヨ鎵嬪姩閫夋嫨瀛椾綋锛屽垯闇€灏嗗瓧浣撹缃负 \texttt{none}锛屽啀閫氳繃 \texttt{fontspec} 瀹忓寘鎴� \texttt{ctex} 瀹忓寘涓粰鍑虹殑鍛戒护鏉ュ疄鐜般€�
%
-% 鍏充簬鎬濇簮瀛椾綋鐨勪竴浜涜В閲婏細
-% \begin{itemize}
-% \item 鎬濇簮瀹嬩綋鍜屾€濇簮榛戜綋鏈変袱绉嶈嫳鏂囧懡鍚嶏紝鏈ā鏉块噰鐢℅oogle鐨刵oto绯诲垪锛歕href{https://www.google.com/get/noto/#serif-hans}{鎬濇簮瀹嬩綋}銆乗href{https://www.google.com/get/noto/#sans-hans}{鎬濇簮榛戜綋}
-% \item 鎬濇簮瀛椾綋骞朵笉鍖呭惈妤蜂功鍜屼豢瀹嬶紝鎵€浠ヤ娇鐢ㄦ柟姝ｅ瓧浣撲唬鏇�
-% \end{itemize}
-%
-%
-%
-%
-%
-%
-%
+% 鏈€鍚庯紝鍑轰簬缁熶竴鏍煎紡鐨勯渶瑕侊紝鏈ā鏉胯繕閫夊彇浜嗕笌姝ｆ枃瀛椾綋鐩镐技搴︽渶楂樼殑鏁板瀛椾綋锛圫TIX 瀛椾綋锛夌敤浜庡叕寮忔帓鐗堛€�
%
% \subsection{涓汉淇℃伅}
%
@@ -1236,7 +1225,7 @@ through XeTeX.
}
% \end{macrocode}
%
-% 鎺ヤ笅鏉ラ€愪釜瀹氫箟鎵€闇€瑕佷娇鐢ㄧ殑瀛楃闆�
+% 鎺ヤ笅鏉ラ€愪釜瀹氫箟鎵€闇€瑕佷娇鐢ㄧ殑瀛楀簱
%
% \begin{macro}{\@@_load_latin_font_windows:}
% Windows 瑗挎枃瀛椾綋
@@ -1331,16 +1320,7 @@ through XeTeX.
\setCJKfamilyfont{zhsong}{Songti~SC~Light}[BoldFont=Songti~SC~Bold]
\setCJKfamilyfont{zhhei}{Heiti~SC~Light}[BoldFont=Heiti~SC~Medium]
\setCJKfamilyfont{zhfs}{STFangsong}
- \setCJKfamilyfont{zhkai}{Kaiti~SC}
- [
- BoldFont=Kaiti~SC~Bold,
- % AlternateFont =
- % {
- % {character range1} {alternate font name1}
- % {alternate font features2} ,
- % ......
- % }
- ]
+ \setCJKfamilyfont{zhkai}{Kaiti~SC}[BoldFont=Kaiti~SC~Bold]
\setCJKfamilyfont{zhnewhei}{PingFang~SC}
}
% \end{macrocode}
@@ -1378,8 +1358,8 @@ through XeTeX.
%
%
% \begin{macro}{\@@_load_cjk_font_founder:}
-% 鏂规瀛楃闆嗭紙绠€绻佹墿灞曪級
-% FZYouHK_508R \href{http://www.foundertype.com/index.php/FontInfo/index/id/244}{鏂规鎮犻粦508R} 璁捐甯堥潪鍟嗗厤璐癸紝
+% 鏂规瀛楀簱锛堢畝绻佹墿灞曪級
+% 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: