diff --git a/chapters/Environments.tex b/chapters/Environments.tex
index 387b789a46e42e381e018949a6a82d76c877601b..347edb4081f7718b298d833e7faba61a8e93ca89 100644
--- a/chapters/Environments.tex
+++ b/chapters/Environments.tex
@@ -30,11 +30,11 @@
\item 骞朵笖锛屽敖鍙兘浣跨敤鏈€鏂扮増锛堟埅鑷崇洰鍓嶆槸 2021锛夈€�2020 鍙婁箣鍓嶇増鏈娇鐢� PDF 鏍煎紡鐨勫浘鐗囧彲鑳戒細鍑虹幇鍔犵矖闂銆�
\end{itemize}
-\subsection{閰嶇疆鍓嶇}
+\subsection{閫夋嫨缂栬緫鍣▆
閰嶇疆瀹岀紪璇戝櫒鍚庯紝杩橀渶瑕佷竴涓猏textbf{鏂囨湰缂栬緫鍣▆浣滀负鍓嶇鏉ュ畬鎴怽texttt{.tex}鏂囦欢鍐呭鐨勫啓浣溿€�
-鑷充粖浠嶆湁鐩稿綋涓€閮ㄥ垎浜鸿涓篧indows鑷甫鐨刓textit{璁颁簨鏈瑌鏄渶濂界殑鏂囨湰缂栬緫鍣紝浣嗗浜庢湰椤圭洰鑰岃█锛屽湪姝よ瘹蹇冭瘹鎰忓湴鎺ㄨ崘浣犱娇鐢╘textbf{鏇寸幇浠ｆ洿缇庤鏇村鍔熻兘}鐨勭紪杈戝櫒锛岃濡俓emph{瀹夎浜� LaTeX Workshop 鎻掍欢 鐨� \href{https://code.visualstudio.com/}{Visual Studio Code}}锛屾潵瀹屾垚璁烘枃缂栧啓銆備綘涔熷彲浠ユ牴鎹釜浜虹殑鍠滃ソ闅忎究浣跨敤鍏朵粬缂栬緫鍣紝濡� TeXworks銆乀eX Studio绛夛紝椤烘墜灏辫銆�
+鑷充粖浠嶆湁鐩稿綋涓€閮ㄥ垎浜鸿涓篧indows鑷甫鐨刓textit{璁颁簨鏈瑌鏄渶濂界殑鏂囨湰缂栬緫鍣紝浣嗗浜庢湰椤圭洰鑰岃█锛屽湪姝よ瘹蹇冭瘹鎰忓湴鎺ㄨ崘浣犱娇鐢╘textbf{鏇寸幇浠ｆ洿缇庤鏇村鍔熻兘}鐨勭紪杈戝櫒锛岃濡俓emph{瀹夎浜� LaTeX Workshop 鎻掍欢 鐨� \href{https://code.visualstudio.com/}{Visual Studio Code}}锛屾潵瀹屾垚璁烘枃缂栧啓銆備綘涔熷彲浠ユ牴鎹釜浜虹殑鍠滃ソ闅忎究浣跨敤鍏朵粬缂栬緫鍣紝濡� TeXworks銆乀eX Studio 绛夛紝椤烘墜灏辫銆�
鑻ヤ娇鐢� LaTeX Workshop 鎻掍欢锛屾湰椤圭洰鍦╘lstinline|.vscode/|涓彁渚涗竴浠界畝鏄撻厤缃紝鍙互鐪佺暐鍒濆閰嶇疆姝ラ鐩存帴浣跨敤銆�
@@ -47,7 +47,11 @@
\item \lstinline|xelatex| / \lstinline|lualatex|
\end{enumerate}
+<<<<<<< HEAD
缂栬瘧浜х墿\footnote{浣滀负鍖栧瀛︾敓锛屼亢璁や负鐢ㄢ€滀骇鐗┾€濅唬鏇库€滅紪璇戠敓鎴愮殑鏂囦欢鈥濇槸涓€涓€氫織鏄撴噦鐨勮娉晑涓篭lstinline|njuthesis.pdf|锛屼綅浜庝富鐩綍涓嬨€�
+=======
+榛樿鐢熸垚鐨勬枃妗ｄ负\lstinline|njuthesis.pdf|锛屾澶栬繕浼氱敓鎴愪竴绯诲垪涓棿鏂囦欢锛屽彲浠ラ€夋嫨浣跨敤\lstinline|latexmk -c|杩涜娓呯悊銆�
+>>>>>>> master
\section{鍦ㄧ嚎缂栬瘧}
@@ -55,7 +59,11 @@
\subsection{鍗楀ぇ\hologo{TeX}骞冲彴绠€浠媫
+<<<<<<< HEAD
\href{https://tex.nju.edu.cn}{鍗楀ぇ\hologo{TeX}}鍩轰簬寮€婧愮殑ShareLaTeX骞冲彴\footnote{鐞嗚涓婂湪\href{https://doc.nju.edu.cn/books/latex}{杩欎釜缃戠珯}鑳芥壘鍒颁竴娈靛钩鍙扮畝浠嬶紝瀹為檯涓婂ぇ瀹堕兘鏈夋剰鏃犳剰鍦伴附浜嗭紝涓嬫涓€瀹氳ˉ涓娿€倉锛屼簬2021骞�3鏈�4鏃ユ寮忎笂绾匡紝闈㈠悜鍗椾含澶у鍏ㄤ綋甯堢敓寮€鏀俱€�
+=======
+\href{https://tex.nju.edu.cn}{鍗楀ぇ\hologo{TeX}}鍩轰簬寮€婧愮殑ShareLaTeX骞冲彴锛屼簬2021骞�3鏈�4鏃ユ寮忎笂绾匡紝闈㈠悜鍗椾含澶у鍏ㄤ綋甯堢敓寮€鏀撅紝棣栨浣跨敤闇€鍑鏍￠偖绠辫嚜鍔╂敞鍐岃处鍙枫€�
+>>>>>>> master
\subsection{鎿嶄綔姝ラ}
@@ -106,7 +114,7 @@
\midrule
瑗挎枃琛嚎 & Times~New~Roman & Times~New~Roman & TeX~Gyre~Termes \\
瑗挎枃鏃犺‖绾� & Arial & Arial & TeX~Gyre~Heros \\
- 瑗挎枃绛夊 & Courier~New & Courier~New & TeX~Gyre~Cursor \\
+ 瑗挎枃绛夊 & Courier~New & Menlo & TeX~Gyre~Cursor \\
瀹嬩綋 & SimSun & Songti~SC~Light &FandolSong-Regular \\
榛戜綋 & SimHei & Heiti~SC~Light & FandolHei-Regular \\
浠垮畫 & FangSong & STFangsong & FandolFang-Regular \\
diff --git a/chapters/Mathematics.tex b/chapters/Mathematics.tex
index 3ad2976c47ae6ba72483d0ee6f097d39911a4a14..1a2c2bbd0cc57e873efd33fbde10cf7bc9aacf33 100644
--- a/chapters/Mathematics.tex
+++ b/chapters/Mathematics.tex
@@ -2,31 +2,31 @@
\section{鍏紡绀轰緥}
\begin{equation}\label{eq:dewitt}
- \int e^{ax} \tanh bx\ dx =
- \begin{cases}
- \displaystyle{ \frac{ e^{(a+2b)x}}{(a+2b)}
- {_2F_1}\left[ 1+\frac{a}{2b},1,2+\frac{a}{2b}, -e^{2bx}\right] }& \\
- \displaystyle{
- \hspace{1cm}-\frac{1}{a}e^{ax}{_2F_1}\left[ 1, \frac{a}{2b},1+\frac{a}{2b}, -e^{2bx}\right]
- }
- & a\ne b \\
- \displaystyle{\frac{e^{ax}-2\tan^{-1}[e^{ax}]}{a} } & a = b
- \end{cases}
+ \int \mathrm{e}^{ax} \tanh {bx} \, \mathrm{d}x =
+ \begin{dcases}
+ \begin{multlined}
+ \frac{\mathrm{e}^{(a+2b)x}}{(a + 2b)} \,
+ {{}_2F_1} \left( 1 + \frac{a}{2b}, 1, 2+\frac{a}{2b}, -\mathrm{e}^{2bx} \right) \\
+ - \frac{1}{a} \mathrm{e}^{ax} \, {{}_2F_1} \left( 1, \frac{a}{2b}, 1 + \frac{a}{2b}, -\mathrm{e}^{2bx} \right)
+ \end{multlined}
+ & a \ne b \\
+ \frac{e^{ax} - 2 \tan^{-1}(\mathrm{e}^{ax})}{a} & a = b
+ \end{dcases}
\end{equation}
-
+
浣犲彲浠ヤ娇鐢╘lstinline|equation|鐜鎻掑叆鍏紡锛屽\cref{eq:dewitt}锛屼唬鐮佸涓�:
\begin{lstlisting}[language=TeX]
\begin{equation}\label{eq:dewitt}
- \int e^{ax} \tanh bx\ dx =
- \begin{cases}
- \displaystyle{ \frac{ e^{(a+2b)x}}{(a+2b)}
- {_2F_1}\left[ 1+\frac{a}{2b},1,2+\frac{a}{2b}, -e^{2bx}\right] }& \\
- \displaystyle{
- \hspace{1cm}-\frac{1}{a}e^{ax}{_2F_1}\left[ 1, \frac{a}{2b},1+\frac{a}{2b}, -e^{2bx}\right]
- }
- & a\ne b \\
- \displaystyle{\frac{e^{ax}-2\tan^{-1}[e^{ax}]}{a} } & a = b
- \end{cases}
+ \int\mathrm{e}^{ax}\tanh{bx}\,\mathrm{d}x =
+ \begin{dcases}
+ \begin{multlined}
+ \frac{\mathrm{e}^{(a+2b)x}}{(a+2b)}\,
+ {{}_2F_1}\left( 1+\frac{a}{2b},1,2+\frac{a}{2b},-\mathrm{e}^{2bx} \right) \\
+ - \frac{1}{a} \mathrm{e}^{ax}\,{{}_2F_1}\left( 1,\frac{a}{2b},1+\frac{a}{2b},-\mathrm{e}^{2bx} \right)
+ \end{multlined}
+ & a \ne b \\
+ \frac{e^{ax}-2\tan^{-1}(\mathrm{e}^{ax})}{a} & a = b
+ \end{dcases}
\end{equation}
\end{lstlisting}
diff --git a/njuthesis.tex b/njuthesis.tex
index 22658632ef53e59e65715e4ab9a89b76056b8f97..bacf128792455b600745c10160c3e0724305ae69 100644
--- a/njuthesis.tex
+++ b/njuthesis.tex
@@ -32,7 +32,7 @@
% 灏侀潰銆佹憳瑕佸拰鐩綍
%----------------------------------------------------------------------------------------
-\maketitle % 璇峰湪coverpage.sty杈撳叆灏侀潰淇℃伅
+\maketitle % 璇峰湪coverinfo.sty杈撳叆灏侀潰淇℃伅
\input{chapters/Abstract.tex}
\tableofcontents
@@ -51,6 +51,7 @@
%----------------------------------------------------------------------------------------
% 鍙傝€冩枃鐚�
%----------------------------------------------------------------------------------------
+
\printbibliography[heading=bibintoc, title=鍙傝€冩枃鐚甝 % 杈撳嚭鍙傝€冩枃鐚垪琛ㄥ苟灏嗘湰椤垫彃鍏ョ洰褰曟潯鐩�
%----------------------------------------------------------------------------------------
diff --git a/profile/font.sty b/profile/font.sty
index 69886b61746247e3e3b5a5f6e9937b95e2208ac6..8662b6e0011a98306e4dd02acabd034f8b41754a 100644
--- a/profile/font.sty
+++ b/profile/font.sty
@@ -151,39 +151,42 @@
\setCJKfamilyfont{zhkai}{鏂规妤蜂綋绠€浣搣[AutoFakeBold=2.17]
}
+% 鏍规嵁鎿嶄綔绯荤粺閫夋嫨鐩稿簲瀛椾綋
% 妫€娴嬫槸鍚︽槸 Windows
\sys_if_platform_windows:TF
{
\set_latin_fontset_windows
\set_chinese_fontset_windows
}
+% 妫€娴嬫槸鍚︽槸 macOS
+\ctex_if_platform_macos:TF
{
- % 妫€娴嬫槸鍚︽槸 MacOS
- \ctex_if_platform_macos:TF
- {
- \set_latin_fontset_macos
- \set_chinese_fontset_macos
- }
- % 鍏朵綑绯荤粺涓€寰嬩娇鐢ㄨ嚜鐢卞瓧浣�
- {
- \set_latin_fontset_gyre
- \set_chinese_fontset_fandol
- }
+ \set_latin_fontset_macos
+ \set_chinese_fontset_macos
+}
+% 鍏朵綑绯荤粺涓€寰嬩娇鐢ㄨ嚜鐢卞瓧浣�
+{
+ \set_latin_fontset_gyre
+ \set_chinese_fontset_fandol
}
+% 閫夋嫨鍏朵粬瀛椾綋锛岃纭繚鐩稿簲瀛椾綋宸插畨瑁呭苟鑷鍙栨秷娉ㄩ噴
% 浣跨敤鏂规瀛椾綋
% \set_chinese_fontset_founder
% 浣跨敤鎬濇簮瀹嬩綋+鎬濇簮榛戜綋
% \set_chinese_fontset_noto
+% 鎴戞槸 Linux 鐢ㄦ埛锛屼絾鎴戠敤 Windows 瀛椾綋锛堣鎮ㄨ刀蹇潗鍒颁富甯彴涓婃潵锛�
+% \set_latin_fontset_windows
+% \set_chinese_fontset_windows
+
% 璁剧疆鏁板瀛椾綋 (XITS, 鎴栬€� STIX, 涓� Times New Roman 鏈€涓虹浉杩�)
% \setmathfont{STIXTwoMath-Regular}[Extension = .otf]
\setmathfont{XITSMath-Regular}[
BoldFont = XITSMath-Bold,
Extension = .otf]
-
\NewDocumentCommand\songti{}{\CJKfamily{zhsong}}
\NewDocumentCommand\heiti{}{\CJKfamily{zhhei}}
\NewDocumentCommand\fangsong{}{\CJKfamily{zhfs}}
diff --git a/profile/packages.sty b/profile/packages.sty
index 6de3f5092bd55fcddf716d0329992fdb86e2966b..fa6378773137729258f54f2f44c6287d3ee7e36c 100644
--- a/profile/packages.sty
+++ b/profile/packages.sty
@@ -48,8 +48,9 @@
\RequirePackage{amsmath} % Must be loaded before unicode-math
\RequirePackage{amsthm} % Mathematical environments
+\RequirePackage{mathtools} % Mathematical tools to use with amsmath
\RequirePackage{thmtools} % Theorem styles
-\RequirePackage{unicode-math} % Math fonts in xetexorluatex
+\RequirePackage{unicode-math} % Math fonts in xetex or luatex
\RequirePackage{graphicx}
\DeclareGraphicsExtensions{.pdf,.eps,.jpg,.png}