From 4361fde370f0b2fb53a973934fc6e8bbd9a679f8 Mon Sep 17 00:00:00 2001
From: Koishi Jinguji <myandeg@outlook.com>
Date: Wed, 8 Sep 2021 14:30:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=84=E8=8C=83TeX=E5=A4=A7=E5=B0=8F?=
=?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 32 ++++++++++++++++----------------
chapters/Environments.tex | 26 +++++++++++++++++++++-----
chapters/FigTabCode.tex | 26 +++++++++++++-------------
chapters/Introduction.tex | 16 ++++++++--------
chapters/Layout.tex | 2 +-
5 files changed, 59 insertions(+), 43 deletions(-)
diff --git a/README.md b/README.md
index 690955a..0204f96 100644
--- a/README.md
+++ b/README.md
@@ -21,15 +21,15 @@
#### **鍏充簬鏈湴缂栬瘧**
-- 妯℃澘鏀寔`latexmk`銆乣XeLaTex`銆乣LuaLaTex`涓夌缂栬瘧鏂瑰紡
+- 妯℃澘鏀寔`latexmk`銆乣xelatex`銆乣lualatex`涓夌缂栬瘧鏂瑰紡
- 濡傛灉浣跨敤`latexmk`锛岃鍔″繀浣跨敤瀹屾暣鐨勫懡浠latexmk -xelatex`浠ュ厤浜х敓涓嶅繀瑕佺殑闂
-- 濡傛灉浣跨敤`XeLaTex`鎴朻LuaLaTex`锛岄渶瑕佹寜鐓XeLaTex/LuaLaTex` -> `biber` -> `XeLaTex/LuaLaTex` -> `XeLaTex/LuaLaTex`鐨勯『搴忕紪璇戝洓娆�
-- 浠撳簱涓�.vscode闄勫甫涓€浠絍Scode鐨凩atex WorkShop鐨勯厤缃枃浠讹紝鍙牴鎹渶瑕佷娇鐢�
+- 濡傛灉浣跨敤`xelatex`鎴朻lualatex`锛岄渶瑕佹寜鐓xelatex/lualatex` -> `biber` -> `xelatex/lualatex` -> `xelatex/lualatex`鐨勯『搴忕紪璇戝洓娆�
+- 浠撳簱涓�.vscode闄勫甫涓€浠絍Scode鐨凩aTeX WorkShop鐨勯厤缃枃浠讹紝鍙牴鎹渶瑕佷娇鐢�
-### [鍗楀ぇTex](https://tex.nju.edu.cn)缂栬瘧
+### [鍗楀ぇTeX](https://tex.nju.edu.cn)缂栬瘧
1. 涓嬭浇[妯℃澘鍏ㄩ儴鏂囦欢](https://github.com/nju-lug/NJUThesisUndergraduate/archive/refs/heads/master.zip)
-2. 鐧诲綍[鍗楀ぇTex](https://tex.nju.edu.cn)锛岀偣鍑籒ew Project -> Upload Project涓婁紶鍒氬垰寰楀埌鐨剒ip鏂囦欢锛屼笂浼犲悗`njuthesis.tex`銆乣njuthesis.cls`绛夋枃浠跺簲鍦ㄦ牴鐩綍锛岀洰褰曠粨鏋勫涓嬫墍绀猴細
+2. 鐧诲綍[鍗楀ぇTeX](https://tex.nju.edu.cn)锛岀偣鍑籒ew Project -> Upload Project涓婁紶鍒氬垰寰楀埌鐨剒ip鏂囦欢锛屼笂浼犲悗`njuthesis.tex`銆乣njuthesis.cls`绛夋枃浠跺簲鍦ㄦ牴鐩綍锛岀洰褰曠粨鏋勫涓嬫墍绀猴細
```bash
鈹� coverinfo.sty
@@ -42,17 +42,17 @@
鈹� njuname.pdf
鈹�
鈹斺攢profile
- abstract.sty
- components.sty
- cover.sty
- font.sty
- packages.sty
- page.sty
- reference.sty
+ abstract.sty
+ components.sty
+ cover.sty
+ font.sty
+ packages.sty
+ page.sty
+ reference.sty
```
-3. 鍦ㄥ崡澶ex椤圭洰鍐呴〉闈㈠乏涓婅鐨刞Menu`涓紝灏嗙紪璇戝櫒鏀逛负`LuaLatex`
-4. 缂栧啓tex鏂囦欢
+3. 鍦ㄥ崡澶eX椤圭洰鍐呴〉闈㈠乏涓婅鐨刞Menu`涓紝灏嗙紪璇戝櫒鏀逛负`LuaLaTeX`
+4. 缂栧啓tex鏂囨。
### 鍏朵粬
@@ -72,8 +72,8 @@
## TODO
-- [x] 涓昏浠ｇ爜杞负Latex3锛屼娇鐢╡xpl3瀹忓寘
-- [x] 鍩轰簬CTex瀹忛泦閲嶆瀯鎵€鏈夐〉闈互绗﹀悎瀛︽牎璁烘枃瑕佹眰
+- [x] 涓昏浠ｇ爜杞负LaTeX3锛屼娇鐢╜expl3`瀹忓寘
+- [x] 鍩轰簬CTeX瀹忛泦閲嶆瀯鎵€鏈夐〉闈互绗﹀悎瀛︽牎璁烘枃瑕佹眰
- [x] Github Action鑷姩鍖栨瀯寤洪瑙圥DF
- [x] 瀹屽杽鏂囨。
- [ ] CTAN鍙戝竷瀹忓寘
diff --git a/chapters/Environments.tex b/chapters/Environments.tex
index 2b2bc63..e6eac14 100644
--- a/chapters/Environments.tex
+++ b/chapters/Environments.tex
@@ -8,7 +8,7 @@
% \label{tab:1}
\begin{tabular}{ccc}
\toprule
- OS & Tex & 娴嬭瘯鎯呭喌 \\
+ OS & TeX & 娴嬭瘯鎯呭喌 \\
\midrule
Windows 10 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\
Windows 10 & \hologo{MiKTeX} & 閫氳繃 \\
@@ -32,7 +32,7 @@
\subsection{閰嶇疆鍓嶇}
-鎺ㄨ崘浣跨敤 VSCode + LaTeX Workshop锛圴SCode鎻掍欢锛夊畬鎴愯鏂囩紪鍐欙紝涔熷彲浠ヤ娇鐢ㄥ叾浠栫紪杈戝櫒锛屽 texworks銆乼exstudio銆�
+鎺ㄨ崘浣跨敤 VSCode + LaTeX Workshop锛圴SCode鎻掍欢锛夊畬鎴愯鏂囩紪鍐欙紝涔熷彲浠ヤ娇鐢ㄥ叾浠栫紪杈戝櫒锛屽 TeXworks銆乀eXstudio銆�
鑻ヤ娇鐢� LaTeX Workshop 鎻掍欢锛屾湰椤圭洰鍦╘lstinline|.vscode/|涓彁渚涗竴浠界畝鏄撻厤缃紝鍙互鐩存帴浣跨敤銆�
@@ -47,15 +47,31 @@
缂栬瘧浜х墿涓篭lstinline|njuthesis.pdf|銆�
+<<<<<<< HEAD
\section{鍗楀ぇ\hologo{TeX}鍦ㄧ嚎缂栬瘧}
+=======
+\section{鍗楀ぇTeX鍦ㄧ嚎缂栬瘧}
+>>>>>>> d423a4a (fix:瑙勮寖TeX澶у皬鍐�)
鏈湴缂栬瘧鍣ㄥ崰鐢ㄧ┖闂磋繃澶э紝瀵逛簬纾佺洏绌洪棿绱у紶鎴栬€呭鐞嗗櫒鎬ц兘鏈夐檺鐨勫悓瀛︼紝涓嶅Θ灏濊瘯鏈妭浠嬬粛鐨勫湪绾跨紪璇戞柟娉昞footnote{鐞嗚涓婂湪\href{https://doc.nju.edu.cn/books/latex}{杩欎釜缃戠珯}鑳芥壘鍒颁竴娈靛钩鍙扮畝浠嬶紝瀹為檯涓婂ぇ瀹堕兘鏈夋剰鏃犳剰鍦伴附浜嗭紝涓嬫涓€瀹氳ˉ涓娿€倉銆�
+<<<<<<< HEAD
\subsection{骞冲彴绠€浠媫
\href{https://tex.nju.edu.cn}{鍗楀ぇ\hologo{TeX}}鍩轰簬寮€婧愮殑ShareLaTeX骞冲彴锛屼簬2021骞�3鏈�4鏃ユ寮忎笂绾匡紝闈㈠悜鍗椾含澶у鍏ㄤ綋甯堢敓寮€鏀俱€�
\subsection{鎿嶄綔姝ラ}
+=======
+\subsection{鎿嶄綔姝ラ}
+
+1. 涓嬭浇\href{https://github.com/nju-lug/NJUThesisUndergraduate/archive/refs/heads/master.zip}{妯℃澘鍏ㄩ儴鏂囦欢}
+
+2. 浣跨敤鍗椾含澶у缁熶竴韬唤璁よ瘉淇℃伅鐧诲綍\href{https://tex.nju.edu.cn}{鍗楀ぇTeX}锛岀偣鍑籒ew Project -> Upload Project涓婁紶鍒氬垰寰楀埌鐨剒ip鏂囦欢锛屼笂浼犲悗njuthesis.tex銆乶juthesis.cls绛夋枃浠跺簲鍦ㄦ牴鐩綍锛岀洰褰曠粨鏋勫\cref{{sec:directory}}鎵€绀�
+
+3. 鍦ㄥ崡澶eX椤圭洰鍐呴〉闈㈠乏涓婅鐨凪enu涓紝灏嗙紪璇戝櫒鏀逛负\hologo{LuaLaTeX}
+
+4. 缂栧啓TeX鏂囨。
+>>>>>>> d423a4a (fix:瑙勮寖TeX澶у皬鍐�)
\begin{enumerate}
\item 涓嬭浇\href{https://github.com/nju-lug/NJUThesisUndergraduate/archive/refs/heads/master.zip}{妯℃澘鍏ㄩ儴鏂囦欢}
@@ -99,9 +115,9 @@
\toprule
绫诲瀷 & Windows & macOS & Linux \\
\midrule
- 瑗挎枃琛嚎 & Times~New~Roman & Times~New~Roman & texgyretermes \\
- 瑗挎枃鏃犺‖绾� & Arial & Arial & texgyreheros \\
- 瑗挎枃绛夊 & Courier~New & Courier~New & texgyrecursor \\
+ 瑗挎枃琛嚎 & Times~New~Roman & Times~New~Roman & TeX~Gyre~Termes \\
+ 瑗挎枃鏃犺‖绾� & Arial & Arial & TeX~Gyre~Heros \\
+ 瑗挎枃绛夊 & Courier~New & Courier~New & TeX~Gyre~Cursor \\
瀹嬩綋 & SimSun & Songti~SC~Light &FandolSong-Regular \\
榛戜綋 & SimHei & Heiti~SC~Light & FandolHei-Regular \\
浠垮畫 & FangSong & STFangsong & FandolFang-Regular \\
diff --git a/chapters/FigTabCode.tex b/chapters/FigTabCode.tex
index 549cb31..83b0694 100644
--- a/chapters/FigTabCode.tex
+++ b/chapters/FigTabCode.tex
@@ -40,13 +40,13 @@
\label{tab:testtab}
\begin{tabular}{ccc}
\toprule
- OS & Tex & 娴嬭瘯鎯呭喌 \\
+ OS & TeX & 娴嬭瘯鎯呭喌 \\
\midrule
- Windows 10 & TexLive 2021 & 鈭� \\
- Windows 10 & MikTex & 鈭� \\
- Windows 10 & TexLive 2020 & 脳\footnote{cleveref鍦ㄥ紩鐢ㄧ珷鑺傛椂涓嶈兘姝ｅ父宸ヤ綔} \\
- Ubuntu 20.04 & TexLive 2021 & 鈭� \\
- 鍗楀ぇTex & Overleaf & 鈭� \\
+ Windows 10 & TeXLive 2021 & 鈭� \\
+ Windows 10 & MiKTeX & 鈭� \\
+ Windows 10 & TeXLive 2020 & 脳\footnote{cleveref鍦ㄥ紩鐢ㄧ珷鑺傛椂涓嶈兘姝ｅ父宸ヤ綔} \\
+ Ubuntu 20.04 & TeXLive 2021 & 鈭� \\
+ 鍗楀ぇTeX & Overleaf & 鈭� \\
\bottomrule
\end{tabular}
\end{table}
@@ -56,13 +56,13 @@
\caption{缁忚繃娴嬭瘯鐨勭幆澧儅
\begin{tabular}{ccc}
\toprule
- OS & Tex & 娴嬭瘯鎯呭喌 \\
+ OS & TeX & 娴嬭瘯鎯呭喌 \\
\midrule
- Windows 10 & TexLive 2021 & 鈭� \\
- Windows 10 & MikTex & 鈭� \\
- Windows 10 & TexLive 2020 & 脳 \\
- Ubuntu 20.04 & TexLive 2021 & 鈭� \\
- 鍗楀ぇTex & Overleaf & 鈭� \\
+ Windows 10 & TeXLive 2021 & 鈭� \\
+ Windows 10 & MiKTeX & 鈭� \\
+ Windows 10 & TeXLive 2020 & 脳 \\
+ Ubuntu 20.04 & TeXLive 2021 & 鈭� \\
+ 鍗楀ぇTeX & Overleaf & 鈭� \\
\bottomrule
\end{tabular}
\end{table}}
@@ -78,4 +78,4 @@ The new command pretty-prints the code. The exclamation marks delimit
the code and can be replaced by any character not in the code;
\lstinline$var i:integer;$ gives the same result.
-浣跨敤\lstinline!\lstinline|\textit{<Your code>}|!锛屽彧瑕佷娇鐢ㄥ湪浠ｇ爜涓湭鍑虹幇鐨勭鍙峰皢浠ｇ爜鍖呮嫭鍦ㄥ唴鍗冲彲銆�
\ No newline at end of file
+浣跨敤\lstinline!\lstinline|\textit{<Your code>}|!锛屽彧瑕佷娇鐢ㄥ湪浠ｇ爜涓湭鍑虹幇鐨勭鍙峰皢浠ｇ爜鍖呮嫭鍦ㄥ唴鍗冲彲銆�
diff --git a/chapters/Introduction.tex b/chapters/Introduction.tex
index 98310db..40643ce 100644
--- a/chapters/Introduction.tex
+++ b/chapters/Introduction.tex
@@ -23,13 +23,13 @@
鈹� njuname.pdf
鈹�
鈹斺攢profile
- abstract.sty
- components.sty
- cover.sty
- font.sty
- packages.sty
- page.sty
- reference.sty
+ abstract.sty
+ components.sty
+ cover.sty
+ font.sty
+ packages.sty
+ page.sty
+ reference.sty
\end{lstlisting}
\subsection{鏂囦欢璇存槑}
@@ -37,7 +37,7 @@
\item [\texttt{abstract.sty}] 瀹氫箟涓嫳鏂囨憳瑕佺幆澧冨強鐩稿叧鏍煎紡
\item [\texttt{components.sty}] 瀹氫箟鍥捐〃鏍囬鏍煎紡
\item [\texttt{cover.sty}] 瀹氫箟璁烘枃灏侀潰鍐呭
- \item [\texttt{font.sty}] 璐熻矗閲嶅畾涔塁Tex瀹忛泦鐨勯粯璁ゅ瓧浣擄紝鍥犱负CTex瀛椾綋鍔犵矖瑕佹眰涓嶆弧瓒宠鏂囪瀹�
+ \item [\texttt{font.sty}] 璐熻矗閲嶅畾涔塁TeX瀹忛泦鐨勯粯璁ゅ瓧浣擄紝鍥犱负CTeX瀛椾綋鍔犵矖瑕佹眰涓嶆弧瓒宠鏂囪瀹�
\item [\texttt{package.sty}] 瀛樻斁鎵€鏈夎寮曠敤鐨勫寘
\item [\texttt{page.sty}] 瀹氫箟姝ｆ枃椤甸潰銆佹爣棰樹互鍙婄洰褰曟潯鐩牸寮�
\item [\texttt{reference.sty}] 瀹氫箟寮曟枃鏍煎紡
diff --git a/chapters/Layout.tex b/chapters/Layout.tex
index e096f77..105627c 100644
--- a/chapters/Layout.tex
+++ b/chapters/Layout.tex
@@ -40,7 +40,7 @@
\texttt{profile/abstract.sty}鎻愪緵浜嗘憳瑕侀〉鏍煎紡鐨勫畾涔夈€�
-鎽樿椤典竴鑸笉鎻掑叆鐩綍锛岄粯璁ゅ彧娣诲姞pdf涔︾銆傚纭疄鏈夋彃鍏ョ洰褰曠殑闇€姹傦紝璇峰湪abstract.sty鏂囦欢涓畾浣嶅埌濡備笅璇彞
+鎽樿椤典竴鑸笉鎻掑叆鐩綍锛岄粯璁ゅ彧娣诲姞pdf涔︾銆傚纭疄鏈夋彃鍏ョ洰褰曠殑闇€姹傦紝璇峰湪\texttt{abstract.sty}鏂囦欢涓畾浣嶅埌濡備笅璇彞
\begin{lstlisting}[language=TeX]
% \phantomsection\addcontentsline{toc}{chapter}{涓枃鎽樿}
\pdfbookmark[0]{涓枃鎽樿}{涓枃鎽樿}
--
GitLab