diff --git a/docs/njuthesis-sample.tex b/docs/njuthesis-sample.tex
index d84044cdbf89aa0bb48cdd23182da1c17bbfaa5d..325afec3a9b796e30d9d67be7e06f4c0b53fd51d 100644
--- a/docs/njuthesis-sample.tex
+++ b/docs/njuthesis-sample.tex
@@ -168,6 +168,11 @@
% 鐢熸垚灏侀潰椤�
\maketitle
+% 涓轰簡闃叉鐩綍鍑虹幇杈冨 underfull \vbox 璀﹀憡
+% 妯℃澘涓娇鐢ㄤ簡 \raggedbottom 閫夐」
+% 甯屾湜鎺掔増鏁堟灉鏇村ソ鍙互鍙嶆敞閲婁互涓嬪懡浠�
+% \flushbottom
+
\begin{abstract}
涓枃鎽樿
\end{abstract}
diff --git a/source/njuthesis.dtx b/source/njuthesis.dtx
index 6f0e1256302f799f4ebd7b02c5983df790ac4395..d69ac373bc61ebf2f55fcd0a7e7c869a4c6ccf99 100644
--- a/source/njuthesis.dtx
+++ b/source/njuthesis.dtx
@@ -105,7 +105,7 @@ through XeTeX.
%
%<class>\NeedsTeXFormat{LaTeX2e}
%<class>\RequirePackage{expl3}
-%<class>\GetIdInfo $Id: njuthesis.dtx 0.12.1 2021-12-02 15:00:00 +0800 NJU LUG <nju.lug@yaoge123.cn> $
+%<class>\GetIdInfo $Id: njuthesis.dtx 0.12.2 2021-12-03 23:00:00 +0800 NJU LUG <nju.lug@yaoge123.cn> $
%<class> { Thesis template for Nanjing University }
%<class>\ProvidesExplClass{njuthesis}
%<class>{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -135,7 +135,7 @@ through XeTeX.
% Nanjing University Linux User Group
% \thanks{E-mail: \href{mailto:nju.lug@yaoge123.cn}{nju.lug@yaoge123.cn}}}
%
-% \date{v0.12.1 \\ Released 2021-12-02}
+% \date{v0.12.2 \\ Released 2021-12-03}
%
% \changes{v0.1}{2021/09/04}{寮€濮嬪紑鍙戙€倉
% \changes{v0.2}{2021/09/07}{鍒濇鎼缓浜嗗彲鐢ㄧ殑妯℃澘銆倉
@@ -794,6 +794,17 @@ through XeTeX.
%
% 涓庡瑷€鍖虹浉瀵圭殑鏄鏂囷紝浣嶄簬\env{document}鐜鍐呫€�
%
+% \begin{function}{\mainmatter}
+% \cs{mainmatter} 鏍囧織鐫€姝ｆ枃鐨勫紑濮嬶紝閲嶆柊寮€濮嬪瓧鍙疯鏁板苟璁剧疆椤电湁銆�
+% \end{function}
+%
+% \begin{function}{\chapter,\section,\subsection,\subsubsection}
+% \begin{syntax}
+% \tn{chapter}\oarg{鐭弿杩皚\marg{瀹屾暣鐨勯暱鏍囬}
+% \end{syntax}
+% \pkg{ctex} 瀹忛泦鎻愪緵浜嗗叾涓敤浜庡鐞嗛暱鏍囬鐨勫彲閫夊弬鏁般€傚浜庤繃闀跨殑鏍囬锛岀洰褰曚腑浼氫娇鐢ㄥ叾鐭弿杩般€�
+% \end{function}
+%
% \begin{ctexexam}
% \begin{document}
% text
@@ -801,7 +812,6 @@ through XeTeX.
% \end{ctexexam}
%
% 鍔犱笂绌鸿灏卞彲浠ュ彟璧蜂竴娈点€�
-%
%
% 鍦ㄩ〉闈㈠竷灞€鏂归潰锛屾湰绉戠敓鏃犻〉鐪夛紝椤甸潰缂栧彿灞呬腑浣嶄簬椤佃剼锛涚爺绌剁敓鏃犻〉鑴氾紝椤电湁鍖呮嫭绔犺妭鍚嶅拰椤甸潰缂栧彿锛堝皻鏈‘瀹氾級銆�
%
@@ -1880,33 +1890,55 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
%
% 鏈鐢熼〉鐪夐〉鑴氥€傝姹傛棤椤电湁锛岄〉鑴氬眳涓紝椤电爜浣跨敤浜斿彿鏂扮綏椹綋鏁板瓧銆�
% \begin{macrocode}
-\fancypagestyle{njuplain}{
- \fancyhead{}
- \fancyfoot[C]{\zihao{5}\thepage}
- \renewcommand{\headrulewidth}{0pt}
- \renewcommand{\footrulewidth}{0pt}
+\fancypagestyle{plain}{
+ \fancyhf{}
+ \fancyfoot[C]{\zihao{5}\thepage}
+ \renewcommand{\headrulewidth}{0pt}
+ \renewcommand{\footrulewidth}{0pt}
}
% \end{macrocode}
%
% 鐮旂┒鐢熼〉鐪夐〉鑴氥€傚鏁伴〉涓虹珷鍚嶏紝鍋舵暟椤典负鑺傚悕銆�
% \begin{macrocode}
-\fancypagestyle{njuheadings}{
- \fancyhead{}
- \fancyfoot{}
+\fancypagestyle{headings}{
+ \fancyhf{}
\fancyhead[CO]{\leftmark}
\fancyhead[CE]{\rightmark}
\fancyfoot[C]{\zihao{5}\thepage}
- \renewcommand{\headrulewidth}{0.4pt}
\renewcommand{\footrulewidth}{0pt}
+ \renewcommand{\headrulewidth}{0.4pt}
+ \setlength{\headheight}{20pt}
}
% \end{macrocode}
%
-% 杞藉叆椤电湁椤佃剼璁剧疆銆傛澶刓tn{flushbottom}鏄负浜嗛槻姝㈢洰褰曢〉鍑虹幇underfull \tn{vbox}淇℃伅銆�
+% \begin{macro}{\frontmatter}
+% 閲嶅畾涔� \cs{frontmatter}锛屾竻绌洪〉鐪夐〉鑴氫互鍙婇〉鐮佽缃€�
+% 姝ゅ懡浠や粎涓鸿В鍐冲師 \cls{book} 绫讳腑浣跨敤灏忓啓缃楅┈瀛楁瘝搴忓彿鐨勫啿绐侊紝骞朵笉寤鸿浣跨敤銆�
% \begin{macrocode}
-\int_compare:nTF { \g_@@_info_degree_int == 1 }
- { \AtBeginDocument{\pagestyle{njuplain}} }
- { \AtBeginDocument{\pagestyle{njuheadings}} }
+\RenewDocumentCommand \frontmatter { }
+ {
+ \cleardoublepage
+ \pagestyle{empty}
+ \pagenumbering{Roman}
+ }
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\mainmatter}
+% \changes{v0.12}{2021/12/03}{淇浜嗘鏂囧瓧浣撳拰椤电湁闂銆倉
+% 閲嶅畾涔� \cs{mainmatter}锛屽湪璁烘枃涓讳綋閮ㄥ垎杞藉叆椤电湁椤佃剼璁剧疆锛屽苟閲嶆柊杩涜鏁板瓧缂栧彿銆�
+% \begin{macrocode}
+\RenewDocumentCommand \mainmatter { }
+ {
+ \cleardoublepage
+ \int_compare:nTF { \g_@@_info_degree_int == 1 }
+ { \pagestyle{plain} }
+ { \pagestyle{headings} }
+ \pagenumbering{arabic}
+ \normalfont\normalsize
+ }
+% \end{macrocode}
+% \end{macro}
%
% \subsection{绔犺妭鏍囬鏍煎紡}
%
@@ -1947,7 +1979,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macrocode}
\RenewDocumentCommand \tableofcontents { }
{
- \cleardoublepage
\raggedbottom
\group_begin:
\ctexset{
@@ -1968,7 +1999,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macrocode}
\RenewDocumentCommand \listoffigures { }
{
- \cleardoublepage
\group_begin:
\ctexset{
chapter/format = {\centering\songti\bf\zihao{3}\selectfont},
@@ -1987,7 +2017,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macrocode}
\RenewDocumentCommand \listoftables { }
{
- \cleardoublepage
\group_begin:
\ctexset{
chapter/format = {\centering\songti\bf\zihao{3}\selectfont},
@@ -1996,7 +2025,8 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
\group_end:
\addcontentsline{toc}{chapter}{\listtablename}
\vskip 20pt
- \@starttoc{lot}%
+ \@starttoc{lot}
+ \vfill
}
% \end{macrocode}
% \end{macro}
@@ -2351,14 +2381,17 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \subsection{灏侀潰}
%
% \subsubsection{鍐呴儴鍛戒护}
+%
+% \begin{variable}{\l_@@_info_title_tl }
% 鎷煎悎鏍囬
% \begin{macrocode}
-\tl_const:Nn \l_@@_info_title_tl
-{
- \l_@@_info_title_a_tl
- \l_@@_info_title_b_tl
- \l_@@_info_title_c_tl
-}
+\tl_new:N \l_@@_info_title_tl
+% \end{macrocode}
+% \end{variable}
+% 灏嗗琛屾爣棰樺悎骞朵负瀹屾暣鏍囬銆�
+% \begin{macrocode}
+\tl_set:Nn \l_@@_info_title_tl
+ { \l_@@_info_title_a_tl \l_@@_info_title_b_tl \l_@@_info_title_c_tl }
% \end{macrocode}
%
% \begin{variable}{\l_@@_info_supv_full_tl,\l_@@_info_supv_full_en_tl}
@@ -2368,55 +2401,50 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
\tl_new:N \l_@@_info_supv_full_en_tl
% \end{macrocode}
% \end{variable}
-%
% 鎷煎悎鍙屽甯堢殑濮撳悕鍜岃亴绉般€�
% \begin{macrocode}
\tl_set:Nn \l_@@_info_supv_full_tl
-{
- \l_@@_info_supv_a_tl\
- \l_@@_info_supv_a_title_tl\ \
- \l_@@_info_supv_b_tl\
- \l_@@_info_supv_b_title_tl
-}
+ {
+ \l_@@_info_supv_a_tl\quad\l_@@_info_supv_a_title_tl\qquad
+ \l_@@_info_supv_b_tl\quad\l_@@_info_supv_b_title_tl
+ }
\tl_set:Nn \l_@@_info_supv_full_en_tl
-{
- \l_@@_info_supv_a_title_en_tl\
- \l_@@_info_supv_a_en_tl\ \
- \l_@@_info_supv_b_title_en_tl\
- \l_@@_info_supv_b_en_tl
-}
+ {
+ \l_@@_info_supv_a_title_en_tl\quad\l_@@_info_supv_a_en_tl\qquad
+ \l_@@_info_supv_b_title_en_tl\quad\l_@@_info_supv_b_en_tl
+ }
% \end{macrocode}
%
% 鍒ゆ柇瀛︿綅杩涜鍛戒护瀹氫箟
% \begin{macrocode}
\int_compare:nTF { \g_@@_info_degree_int == 1 }
-{
- % 鏈
- \tl_const:Nn \c_@@_name_title_tl { 棰榎hfill 鐩� }
-
- \tl_const:Nn \c_@@_cover_uline_len_a_tl { 250pt }
- \tl_const:Nn \c_@@_cover_uline_len_b_tl { 90pt }
- \tl_const:Nn \c_@@_cover_uline_font_tl { \songti }
- \tl_const:Nn \c_@@_cover_uline_style_tl { \bf }
- \tl_const:Nn \c_@@_cover_uline_bskip_tl {}
+ {
+ % 鏈
+ \tl_const:Nn \c_@@_name_title_tl { 棰榎hfill 鐩� }
+
+ \tl_const:Nn \c_@@_cover_uline_len_a_tl { 250pt }
+ \tl_const:Nn \c_@@_cover_uline_len_b_tl { 90pt }
+ \tl_const:Nn \c_@@_cover_uline_font_tl { \songti }
+ \tl_const:Nn \c_@@_cover_uline_style_tl { \bf }
+ \tl_const:Nn \c_@@_cover_uline_bskip_tl {}
- \tl_const:Nn \c_@@_cover_box_len_tl { 4.2em }
+ \tl_const:Nn \c_@@_cover_box_len_tl { 4.2em }
- % 鏈寮哄埗涓嶆墦鍗板浗瀹跺浘涔﹂灏侀潰
- \bool_set_false:N \g_@@_nlcover_bool
-}
-{
- % 鏈浠ュ閮芥槸鐮旂┒鐢�
- \tl_const:Nn \c_@@_name_title_tl { 璁篭hfill 鏂嘰hfill 棰榎hfill 鐩� }
+ % 鏈寮哄埗涓嶆墦鍗板浗瀹跺浘涔﹂灏侀潰
+ \bool_set_false:N \g_@@_nlcover_bool
+ }
+ {
+ % 鏈浠ュ閮芥槸鐮旂┒鐢�
+ \tl_const:Nn \c_@@_name_title_tl { 璁篭hfill 鏂嘰hfill 棰榎hfill 鐩� }
- \tl_const:Nn \c_@@_cover_uline_len_a_tl { 250pt }
- \tl_const:Nn \c_@@_cover_uline_len_b_tl { 14em }
- \tl_const:Nn \c_@@_cover_uline_font_tl { \kaishu }
- \tl_const:Nn \c_@@_cover_uline_style_tl {}
- \tl_const:Nn \c_@@_cover_uline_bskip_tl { \hspace{1em} }
+ \tl_const:Nn \c_@@_cover_uline_len_a_tl { 250pt }
+ \tl_const:Nn \c_@@_cover_uline_len_b_tl { 14em }
+ \tl_const:Nn \c_@@_cover_uline_font_tl { \kaishu }
+ \tl_const:Nn \c_@@_cover_uline_style_tl {}
+ \tl_const:Nn \c_@@_cover_uline_bskip_tl { \hspace{1em} }
- \tl_const:Nn \c_@@_cover_box_len_tl { 6em }
-}
+ \tl_const:Nn \c_@@_cover_box_len_tl { 6em }
+ }
% \end{macrocode}
% \begin{macro}{\@@_spread_box:nn}
% 鏉ヨ嚜\cls{fduthesis}锛氬垎鏁ｅ榻愮殑姘村钩鐩掑瓙銆�
@@ -2441,21 +2469,21 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macro}{\@@_cover_uline_a:n}
% 鍦ㄥ皝闈㈢粯鍒朵笅鍒掔嚎
% \begin{macrocode}
-\cs_new:Npn \@@_cover_uline_a:n #1
-{
- \uline{\makebox[\c_@@_cover_uline_len_a_tl]
- {\rm\c_@@_cover_uline_font_tl #1 }}
-}
-\cs_new:Npn \@@_cover_uline_b:n #1
-{
- \uline{\makebox[\c_@@_cover_uline_len_b_tl]
- {\rm\c_@@_cover_uline_font_tl #1 }}
-}
-\cs_new:Npn \@@_cover_uline_nl:nn #1 #2
-{
- \uline{\makebox[#1]
- {\rm\c_@@_cover_uline_font_tl #2 }}
-}
+\cs_new_protected:Npn \@@_cover_uline_a:n #1
+ {
+ \uline{\makebox[\c_@@_cover_uline_len_a_tl]
+ {\rm\c_@@_cover_uline_font_tl #1 }}
+ }
+\cs_new_protected:Npn \@@_cover_uline_b:n #1
+ {
+ \uline{\makebox[\c_@@_cover_uline_len_b_tl]
+ {\rm\c_@@_cover_uline_font_tl #1 }}
+ }
+\cs_new_protected:Npn \@@_cover_uline_nl:nn #1 #2
+ {
+ \uline{\makebox[#1]
+ {\rm\c_@@_cover_uline_font_tl #2 }}
+ }
% \end{macrocode}
% \end{macro}
%
@@ -2463,11 +2491,11 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macro}{\@@_cover_box:n}
% 灏侀潰琛ㄦ牸杈规
% \begin{macrocode}
-\cs_new:Npn \@@_cover_box:n #1
-{
- \makebox[\c_@@_cover_box_len_tl][s]{
- #1\c_@@_cover_uline_bskip_tl}
-}
+\cs_new_protected:Npn \@@_cover_box:n #1
+ {
+ \makebox[\c_@@_cover_box_len_tl][s]{
+ #1\c_@@_cover_uline_bskip_tl}
+ }
% \end{macrocode}
% \end{macro}
%
@@ -2475,11 +2503,11 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% 瀛︿綅绫诲瀷銆�
% \begin{macrocode}
\cs_new_protected:Npn \@@_cover_degree:
-{
- { 锛堢敵璇� }
- \clist_item:Nn \c_@@_name_degree_clist { \g_@@_info_degree_int }
- { 瀛︿綅锛� }
-}
+ {
+ { 锛堢敵璇� }
+ \clist_item:Nn \c_@@_name_degree_clist { \g_@@_info_degree_int }
+ { 瀛︿綅锛� }
+ }
% \end{macrocode}
% \end{macro}
%
@@ -2489,25 +2517,25 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% 瀵规爣棰樿繘琛岃嚜鍔ㄥ垽鏂紝濡傛灉鏌愯鏍囬绌哄垯涓嶈緭鍑烘帴涓嬫潵鐨勮嫢骞茶锛屽緱鍒板琛屾爣棰樸€�
% \begin{macrocode}
\cs_new_protected:Npn \@@_cover_title_breakline:
-{
- \@@_cover_box:n {\c_@@_name_title_tl}
- & \@@_cover_uline_a:n
- { \c_@@_cover_uline_style_tl \l_@@_info_title_a_tl } \\
- \tl_if_empty:NF \l_@@_info_title_b_tl
{
- \tl_if_empty:NTF \l_@@_info_title_c_tl
- {
- & \@@_cover_uline_a:n
- {\c_@@_cover_uline_style_tl \l_@@_info_title_b_tl } \\
- }
- {
- & \@@_cover_uline_a:n
- { \c_@@_cover_uline_style_tl \l_@@_info_title_b_tl } \\
- & \@@_cover_uline_a:n
- { \c_@@_cover_uline_style_tl \l_@@_info_title_c_tl } \\
- }
+ \@@_cover_box:n {\c_@@_name_title_tl}
+ & \@@_cover_uline_a:n
+ { \c_@@_cover_uline_style_tl \l_@@_info_title_a_tl } \\
+ \tl_if_empty:NF \l_@@_info_title_b_tl
+ {
+ \tl_if_empty:NTF \l_@@_info_title_c_tl
+ {
+ & \@@_cover_uline_a:n
+ {\c_@@_cover_uline_style_tl \l_@@_info_title_b_tl } \\
+ }
+ {
+ & \@@_cover_uline_a:n
+ { \c_@@_cover_uline_style_tl \l_@@_info_title_b_tl } \\
+ & \@@_cover_uline_a:n
+ { \c_@@_cover_uline_style_tl \l_@@_info_title_c_tl } \\
+ }
+ }
}
-}
% \end{macrocode}
% \end{macro}
%
@@ -2576,9 +2604,7 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \end{macro}
%
%
-%
% \subsubsection{缁樺埗灏侀潰}
-%
%
% \begin{macro}{\@@_print_cover_nl:}
% \changes{v0.12}{2021/12/02}{閫夋嫨|nlcover|鏃朵笉鐢熸垚鏅€氬皝闈€€倉
@@ -2586,7 +2612,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_cover_nl:
{
- \thispagestyle{empty}
\pdfbookmark[0]{鍥藉鍥句功棣嗗皝闈{nl}
{
% 椤剁
@@ -2654,7 +2679,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
\kaishu\zihao{3}\hspace{2em} 骞碶hspace{1em} 鏈圽hspace{1em} 鏃�
\end{center}
\vskip -10mm
- \cleardoublepage
}
% \end{macrocode}
% \end{macro}
@@ -2663,7 +2687,9 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_declaration:
{
+ \normalfont\normalsize
\chapter*{鍗椾含澶у瀛︿綅璁烘枃鍘熷垱鎬у０鏄巬
+ \thispagestyle{empty}
\c_@@_orig_decl_text_tl
\vfil
\begin{flushright}
@@ -2671,7 +2697,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
{鏃ユ湡锛殅 \uline{\makebox[5em]{}}
\end{flushright}
\vfil
- \cleardoublepage
}
% \end{macrocode}
% \end{macro}
@@ -2680,32 +2705,28 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% 鏈灏侀潰
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_cover_ug:
-{
- \thispagestyle{empty}
- \pagenumbering{Roman}
- % Start
- \pdfbookmark{灏侀潰}{cover} % 灏嗗皝闈㈡彃鍏df涔︾
- \begin{spacing}{1.25}
- \noindent\null\hspace{-10mm}
- \njuemblem[black]{!}{3cm}\smallskip
- \begin{center}
- \njuname[black]{!}{3.35cm}
- \vskip 10mm
- {\zihao{1}\bf\songti\@@_spread_box:nn {9em}{鏈姣曚笟璁烘枃}}
- \vfill
- \vskip\stretch{0}
- {\bgroup
- \kaishu\zihao{3}
- \def\tabcolsep{1pt}
- \def\arraystretch{1.5}
- % 缁樺埗淇℃伅妗�
- \@@_print_covertab:
- \egroup}
- \vfill
- \end{center}
- \end{spacing}
- \cleardoublepage
-}
+ {
+ \pdfbookmark{灏侀潰}{cover} % 灏嗗皝闈㈡彃鍏df涔︾
+ \begin{spacing}{1.25}
+ \noindent\null\hspace{-10mm}
+ \njuemblem[black]{!}{3cm}\smallskip
+ \begin{center}
+ \njuname[black]{!}{3.35cm}
+ \vskip 10mm
+ {\zihao{1}\bf\songti\@@_spread_box:nn {9em}{鏈姣曚笟璁烘枃}}
+ \vfill
+ \vskip\stretch{0}
+ {\bgroup
+ \kaishu\zihao{3}
+ \def\tabcolsep{1pt}
+ \def\arraystretch{1.5}
+ % 缁樺埗淇℃伅妗�
+ \@@_print_covertab:
+ \egroup}
+ \vfill
+ \end{center}
+ \end{spacing}
+ }
% \end{macrocode}
% \end{macro}
%
@@ -2715,9 +2736,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_cover_g:
{
- \thispagestyle{empty}
- \pagenumbering{Roman}
- % Start
\pdfbookmark{灏侀潰}{cover} % 灏嗗皝闈㈡彃鍏df涔︾
\begin{spacing}{1.25}
\begin{center}
@@ -2744,15 +2762,15 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
\egroup
\vfill
\vskip 10mm
- \bf\kaishu\zihao{4}\l_@@_submit_date_tl
+ \bgroup
+ \bf\kaishu\zihao{4}\l_@@_submit_date_tl
+ \egroup
\vskip 15mm
\end{center}
\end{spacing}
\newpage % 灏侀潰鑳岄潰
- \thispagestyle{empty}
\begin{spacing}{1.625}
- % TODO: 绛夊緟璋冩暣鏍煎紡
\null\vfill
{\bgroup
\kaishu\zihao{3}
@@ -2765,10 +2783,9 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
\egroup}
\vskip 15mm
\end{spacing}
- \cleardoublepage
% 鐮旂┒鐢熻嫳鏂囧皝闈�
- \thispagestyle{empty}
+ \newpage
\pdfbookmark{鑻辨枃灏侀潰}{cover-en} % 灏嗗皝闈㈡彃鍏df涔︾
\begin{center}
\noindent\vspace*{20pt}
@@ -2804,8 +2821,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
\vskip 30pt
\normalfont\normalsize\l_@@_submit_date_en_tl
\end{center}
- \normalfont
- \cleardoublepage
}
% \end{macrocode}
% \end{macro}
@@ -2817,9 +2832,17 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macrocode}
\RenewDocumentCommand \maketitle { }
{
+ \pagestyle{empty}
\bool_if:NTF \g_@@_nlcover_bool
{ \@@_print_cover_nl: \@@_print_declaration: }
{ \use:c { @@_print_cover_ \g_@@_info_diploma_tl : } }
+% \end{macrocode}
+% 鍦ㄦ爣棰橀〉鍚庝娇鐢ㄧ綏椹瓧姣嶉〉鐮併€�
+% \begin{macrocode}
+ \cleardoublepage
+ \pagestyle{plain}
+ \pagenumbering{Roman}
+ \normalfont\normalsize
}
% \end{macrocode}
% \end{macro}
@@ -2830,25 +2853,21 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% 涓嫳鏂囧叧閿瘝
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_keywords:
-{
- \par\vspace{2ex}
- \bgroup
- \noindent
- \c_@@_name_keywords_tl
- \clist_use:Nn \l_@@_info_keywords_clist {锛泒
- \par
- \egroup
-}
+ {
+ \par\vspace{2ex}
+ \group_begin:
+ \noindent \c_@@_name_keywords_tl
+ \clist_use:Nn \l_@@_info_keywords_clist {锛泒
+ \group_end:
+ }
\cs_new_protected:Npn \@@_print_keywords_en:
-{
- \par\vspace{2ex}
- \bgroup
- \noindent
- \c_@@_name_keywords_en_tl\hspace{0.5em}
- \clist_use:Nn \l_@@_info_keywords_en_clist {锛泒
- \par
- \egroup
-}
+ {
+ \par\vspace{2ex}
+ \group_begin:
+ \noindent \c_@@_name_keywords_en_tl\hspace{0.5em}
+ \clist_use:Nn \l_@@_info_keywords_en_clist {锛泒
+ \group_end:
+ }
% \end{macrocode}
% \end{macro}
%
@@ -2858,7 +2877,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_abstract_ug:
{
- \thispagestyle{plain}
\pdfbookmark[0]{涓枃鎽樿}{abstract-zh}
\begin{center}
\kaishu\zihao{-2}{\textbf{
@@ -2872,28 +2890,23 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
鏈鐢熷鍚嶏細 \l_@@_info_author_tl \\
鎸囧鏁欏笀锛堝鍚嶃€佽亴绉帮級锛歕l_@@_info_supv_full_tl \\
鎽樿锛�
- \egroup
- \kaishu\zihao{-4}\par%
+ \egroup\par
}
\cs_new_protected:Npn \@@_print_abstract_en_ug:
{
- \thispagestyle{plain}
\pdfbookmark[0]{鑻辨枃鎽樿}{abstract-en}
\begin{center}
\kaishu\zihao{-2}{\textbf{\uuline{
鍗椾含澶у鏈鐢熸瘯涓氳鏂囷紙璁捐銆佷綔鍝侊級鑻辨枃鎽樿}}}
\end{center}
- {
- \bgroup
+ \bgroup
THESIS: ~~\l_@@_info_title_en_tl \\
DEPARTMENT: ~~\l_@@_info_dept_en_tl \\
SPECIALIZATION: ~~\l_@@_major_en_tl \\
UNDERGRADUATE:~~\l_@@_info_author_en_tl \\
MENTOR:~~\l_@@_info_supv_full_en_tl \\
ABSTRACT:
- \egroup
- }
- \zihao{-4}\par%
+ \egroup\par
}
% \end{macrocode}
% \end{macro}
@@ -2904,7 +2917,6 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_abstract_g:
{
- \thispagestyle{plain}
\pdfbookmark[0]{涓枃鎽樿}{abstract-zh}
\begin{center}
\kaishu\zihao{-2}{\textbf{\uuline{
@@ -2917,28 +2929,23 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
\njuline{\makebox[4em]{\l_@@_info_grade_tl}}绾�
\int_compare:nTF { \g_@@_info_degree_int == 4} { 鍗� } { 纭� }
澹敓濮撳悕锛歕njuline{\hfill\l_@@_info_author_tl\hfill}\\
- 鎸囧鏁欏笀锛堝鍚嶃€佽亴绉帮級锛歕njuline{\hfill\l_@@_info_supv_full_tl\hfill}\par
- \egroup
- \kaishu\zihao{4}\par%
+ 鎸囧鏁欏笀锛堝鍚嶃€佽亴绉帮級锛歕njuline{\hfill\l_@@_info_supv_full_tl\hfill}
+ \egroup\par
}
\cs_new_protected:Npn \@@_print_abstract_en_g:
{
- \thispagestyle{plain}
\pdfbookmark[0]{鑻辨枃鎽樿}{abstract-en}
\begin{center}
\kaishu\zihao{-2}{\textbf{\uuline{
鍗椾含澶у鐮旂┒鐢熸瘯涓氳鏂囪嫳鏂囨憳瑕侀椤电敤绾竲}}
\end{center}
- {
- \bgroup
+ \bgroup
\zihao{4}
THESIS: ~~\l_@@_info_title_en_tl \\
SPECIALIZATION: ~~\l_@@_major_en_tl \\
POSTGRADUATE:~~\l_@@_info_author_en_tl \\
- MENTOR:~~\l_@@_info_supv_full_en_tl\par
- \egroup
- }
- \zihao{4}\par%
+ MENTOR:~~\l_@@_info_supv_full_en_tl
+ \egroup\par
}
% \end{macrocode}
% \end{macro}
@@ -2947,8 +2954,9 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% 涓枃鎽樿鐜銆�
% \begin{macrocode}
\NewDocumentEnvironment{abstract} { +b }
- { \use:c { @@_print_abstract_ \g_@@_info_diploma_tl : } #1 }
- { \@@_print_keywords: \newpage }
+ { \newpage \use:c { @@_print_abstract_ \g_@@_info_diploma_tl : }
+ \group_begin: \kaishu \zihao{-4} #1 }
+ { \@@_print_keywords: \group_end: }
% \end{macrocode}
% \end{macro}
%
@@ -2956,8 +2964,9 @@ keywords* .clist_set:N = \l_@@_info_keywords_en_clist,
% 鑻辨枃鎽樿鐜銆俓pkg{xparse} 鐩墠涓嶆敮鎸佸悎骞跺甫鏈夋槦鍙风殑鐜锛屽洜姝ら渶瑕佸崟鐙畾涔夈€�
% \begin{macrocode}
\NewDocumentEnvironment{abstract*} { +b }
- { \use:c { @@_print_abstract_en_ \g_@@_info_diploma_tl : } #1 }
- { \@@_print_keywords_en: \cleardoublepage }
+ { \newpage \use:c { @@_print_abstract_en_ \g_@@_info_diploma_tl : }
+ \group_begin: \zihao{-4} #1 }
+ { \@@_print_keywords_en: \group_end: }
%</class>
% \end{macrocode}
% \end{macro}
diff --git a/test/chapters/Environments.tex b/test/chapters/Environments.tex
deleted file mode 100644
index 750eb0d86a169dfa79993311490ce28e2d53113d..0000000000000000000000000000000000000000
--- a/test/chapters/Environments.tex
+++ /dev/null
@@ -1,157 +0,0 @@
-\chapter{閰嶇疆鐜}
-
-\textbf{鐗瑰埆鎻愰啋锛氭湰绔犳枃瀛椾粎渚涙牸寮忕ず渚嬶紝鍐呭宸插仠姝㈢淮鎶わ紝璇峰弬鑰冨畯鍖呮墜鍐岃繘琛岃缃畗
-
-\section{鏈湴缂栬瘧}
-
-\subsection{瀹夎\hologo{TeX}鍙戣鐗坿
-
-棣栧厛闇€瑕佷笅杞絓hologo{TeX}杞欢鍙戣鐗堬紝鏍″洯缃戠幆澧冧腑浣跨敤\href{https://mirror.nju.edu.cn/download/app/TeX%20%E6%8E%92%E7%89%88%E7%B3%BB%E7%BB%9F}{鍗楀ぇ闀滃儚绔檥鍙互鑾峰緱鏈€濂界殑浣撻獙銆俓textbf{鎺ㄨ崘浣跨敤鏈€鏂扮殑\hologo{TeX}\,Live 2021鎴栬€匼hologo{MiKTeX} 21浠ラ伩鍏嶆綔鍦ㄧ殑鍏煎鎬ч棶棰樸€倉
-
-\begin{itemize}
- \item 涓轰簡閬垮厤涓嶅繀瑕佺殑楹荤儲锛岃灏藉彲鑳戒笅杞� full 鐗堟湰锛屽 texlive-full銆傜畝鑰岃█涔嬶紝涓嬭浇澶х殑閭ｄ釜銆�
- \item 骞朵笖锛屽敖鍙兘浣跨敤鏈€鏂扮増锛堟埅鑷崇洰鍓嶆槸 2021锛夈€�2020 鍙婁箣鍓嶇増鏈娇鐢� PDF 鏍煎紡鐨勫浘鐗囧彲鑳戒細鍑虹幇鍔犵矖闂銆�
-\end{itemize}
-
-涓嬭〃鏄洰鍓嶇粡杩囨祴璇曠殑鐜銆傚鏋滄湁鍏朵粬鍙敤涓嶅彲鐢ㄧ殑鐜锛屾杩庤ˉ鍏呫€�
-
-\begin{table}[ht]
- \caption{缁忚繃娴嬭瘯鐨勭幆澧儅
- % \label{tab:1}
- \begin{tabular}{ccc}
- \toprule
- OS & TeX & 娴嬭瘯鎯呭喌 \\
- \midrule
- Windows 10 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\
- Windows 10 & \hologo{MiKTeX} & 閫氳繃 \\
- Windows 10 & \hologo{TeX}\,Live 2020 & cref瀛樺湪鏍煎紡闂 \\
- macOS 10.15 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\
- Ubuntu 20.04 & \hologo{TeX}\,Live 2021 & 閫氳繃 \\
- \bottomrule
- \end{tabular}
-\end{table}
-
-\subsection{閫夋嫨缂栬緫鍣▆
-
-閰嶇疆瀹岀紪璇戝櫒鍚庯紝杩橀渶瑕佷竴涓猏textbf{鏂囨湰缂栬緫鍣▆浣滀负鍓嶇鏉ュ畬鎴怽texttt{.tex}鏂囦欢鍐呭鐨勫啓浣溿€�
-
-鑷充粖浠嶆湁鐩稿綋涓€閮ㄥ垎浜鸿涓篧indows鑷甫鐨刓textit{璁颁簨鏈瑌鏄渶濂界殑鏂囨湰缂栬緫鍣紝浣嗗浜庢湰椤圭洰鑰岃█锛屽湪姝よ瘹蹇冭瘹鎰忓湴鎺ㄨ崘浣犱娇鐢╘textbf{鏇寸幇浠ｆ洿缇庤鏇村鍔熻兘}鐨勭紪杈戝櫒锛岃濡俓emph{瀹夎浜� LaTeX Workshop 鎻掍欢 鐨� \href{https://code.visualstudio.com/}{Visual Studio Code}}锛屾潵瀹屾垚璁烘枃缂栧啓銆備綘涔熷彲浠ユ牴鎹釜浜虹殑鍠滃ソ闅忎究浣跨敤鍏朵粬缂栬緫鍣紝濡� TeXworks銆乀eX Studio 绛夛紝椤烘墜灏辫銆�
-
-鑻ヤ娇鐢� LaTeX Workshop 鎻掍欢锛屾湰椤圭洰鍦╘lstinline|.vscode/|涓彁渚涗竴浠界畝鏄撻厤缃紝鍙互鐪佺暐鍒濆閰嶇疆姝ラ鐩存帴浣跨敤銆�
-
-\subsection{缂栬瘧椤哄簭}
-搴旈噰鐢ㄤ互涓嬪懡浠ら『搴忚繘琛岀紪璇戯紝浠ョ敓鎴愭纭殑鐩綍銆佺紪鍙峰拰鍙傝€冩枃鐚潯鐩€�
-\begin{enumerate}
- \item \lstinline|xelatex| / \lstinline|lualatex|
- \item \lstinline|biber|
- \item \lstinline|xelatex| / \lstinline|lualatex|
- \item \lstinline|xelatex| / \lstinline|lualatex|
-\end{enumerate}
-
-缂栬瘧浜х墿\footnote{浣滀负鍖栧瀛︾敓锛屼亢璁や负鐢ㄢ€滀骇鐗┾€濅唬鏇库€滅紪璇戠敓鎴愮殑鏂囦欢鈥濇槸涓€涓€氫織鏄撴噦鐨勮娉晑涓篭lstinline|njuthesis.pdf|锛屼綅浜庝富鐩綍涓嬨€傛澶栬繕浼氱敓鎴愪竴绯诲垪涓棿鏂囦欢锛屽彲浠ラ€夋嫨浣跨敤\lstinline|latexmk -c|杩涜娓呯悊銆�
-
-\section{鍦ㄧ嚎缂栬瘧}
-
-鐩镐俊浣犲湪鎺ヨЕ浜嗘湰鍦扮紪璇戜互鍚庯紝寰堝揩灏变細鎰忚瘑鍒颁竴浜涘崄鍒嗘樉鐒剁殑浜嬪疄锛岃濡俓hologo{TeX}缂栬瘧鍣ㄥ畨瑁呰繃绋嬭緝涓烘极闀匡紝鍗犵敤绌洪棿杩囧ぇ锛岃€屼笖鍦ㄤ竴閮ㄥ垎澶勭悊鍣ㄦ€ц兘涓嶄匠鐨勭數鑴戜笂闇€瑕佽緝闀跨紪璇戞椂闂碶footnote{鍏跺疄杩欎笁鐐归兘鏄骞垮ぇ鐨刉indows鐢ㄦ埛璇寸殑锛屽悓涓€涓ā鏉垮湪Linux缂栬瘧鍙互鑺傜渷涓€鍗婅€楁椂}銆傛嫆缁濇帴鍙楄繖浜涢夯鐑︾殑鍚屽涓嶅Θ灏濊瘯鏈妭浠嬬粛鐨勫湪绾跨紪璇戞柟娉曘€�
-
-\subsection{鍗楀ぇ\hologo{TeX}骞冲彴绠€浠媫
-
-\href{https://tex.nju.edu.cn}{鍗楀ぇ\hologo{TeX}}鍩轰簬寮€婧愮殑ShareLaTeX骞冲彴\footnote{鐞嗚涓婂湪\href{https://doc.nju.edu.cn/books/latex}{杩欎釜缃戠珯}鑳芥壘鍒颁竴娈靛钩鍙扮畝浠嬶紝瀹為檯涓婂ぇ瀹堕兘鏈夋剰鏃犳剰鍦伴附浜嗭紝涓嬫涓€瀹氳ˉ涓娿€倉锛屼簬2021骞�3鏈�4鏃ユ寮忎笂绾匡紝闈㈠悜鍗椾含澶у鍏ㄤ綋甯堢敓寮€鏀撅紝棣栨浣跨敤闇€鍑鏍￠偖绠辫嚜鍔╂敞鍐岃处鍙枫€�
-
-\subsection{鎿嶄綔姝ラ}
-
-\begin{enumerate}
- \item 涓嬭浇\href{https://github.com/nju-lug/NJUThesisUndergraduate/archive/refs/heads/master.zip}{妯℃澘鍏ㄩ儴鏂囦欢}
- \item 璁块棶\href{https://tex.nju.edu.cn}{鍗楀ぇ\hologo{TeX}}锛岀偣鍑荤晫闈㈠彸涓婃柟Register锛屼娇鐢╘emph{鍗椾含澶у閭}娉ㄥ唽璐﹀彿骞剁櫥褰�
- \item 鐐瑰嚮New Project -> Upload Project涓婁紶鍒氬垰寰楀埌鐨剒ip鏂囦欢锛屼笂浼犲悗njuthesis.tex銆乶juthesis.cls绛夋枃浠跺簲鍦ㄦ牴鐩綍锛岀洰褰曠粨鏋勫\cref{{sec:directory}}鎵€绀�
- \item 鍦ㄩ」鐩〉闈㈠乏涓婅鐨凪enu涓紝灏嗙紪璇戝櫒鏇存敼涓烘敮鎸佷腑鏂囩殑\hologo{XeLaTeX}鎴栬€匼hologo{LuaLaTeX}
- \item 缂栧啓璁烘枃
- \item 鐐瑰嚮Compile鎸夐挳杩涜缂栬瘧鍜岄瑙�
- \item 鐐瑰嚮缂栬瘧鎸夐挳鍙充晶绗笁涓寜閽笅杞戒骇鐗�
-\end{enumerate}
-
-\subsection{鍏充簬Overleaf骞冲彴}
-
-鐢变簬\href{https://www.overleaf.com/}{Overleaf骞冲彴}鐨刓hologo{TeX}\,Live鐗堟湰鍋滅暀鍦�2020锛孿texttt{cleveref}鍖呭湪寮曠敤绔犺妭鏃朵細鐢熸垚閿欒鐨勬爣绛撅紝寮曞彂鏍煎紡閿欒锛涜€屽崡澶hologo{TeX}閫氳繃鍙婃椂鏇存柊瑙勯伩浜嗚繖涓€闂銆傚洜姝emph{璇峰姟蹇呬笉瑕佷娇鐢∣verleaf瀹樼綉杩涜缂栬瘧}銆�
-
-\section{瀛椾綋}
-
-瀛︽牎璁烘枃鏍煎紡瑕佹眰浣跨敤鐨勫瓧浣撲竴鑸凡缁忛瑁呭湪鍚勪釜鎿嶄綔绯荤粺锛屾湰妯℃澘閽堝涓嶅悓骞冲彴杩涜浜嗚嚜鍔ㄦ娴嬮€傞厤锛屽彲浠ュ紑绠卞嵆鐢ㄣ€�
-
-鍚勪釜绯荤粺鐨勯粯璁ゅ瓧浣撹鍙傝€僜cref{tab:defaultfontset}銆傚彲浠ョ湅鍒帮紝涓嶅悓绯荤粺涓婁娇鐢ㄧ殑瀛椾綋鏈夋墍宸埆锛屽疄闄呰緭鍑虹粨鏋滃彲鑳藉瓨鍦ㄧ粏寰笉鍚�, 浣跨敤鏃惰娉ㄦ剰銆備緥濡傦紝鍦↙inux骞冲彴鎴栬€呬娇鐢ㄤ簡Ubuntu鍚庣鐨勫崡澶hologo{TeX}涓婏紝瀹嬩綋鍔犵矖鏁堟灉鏇存槑鏄撅紱鍙︿竴鏂归潰锛屽湪Windows骞冲彴杩涜缂栬瘧鐨勬晥鏋滄洿鎺ヨ繎Word鍔犵矖\footnote{鍥犱负SimSun娌℃湁鍘熺敓绮椾綋锛岄€氳繃AutoFakeBold=2.17杩涜妯′豢}銆�
-
-% \begin{enumerate}
-% \item Ubuntu 涓嬮亣鍒扮己澶卞瓧浣� WenQuanYi Zen Hei Mono 鎴� Times New Roman鐨勯棶棰橈細
-
-% 瀹夎瀵瑰簲瀛椾綋鍗冲彲銆備娇鐢ㄤ互涓嬫寚浠や笅杞斤細
-
-% \begin{lstlisting}
-% sudo apt install fonts-wqy-zenhei ttf-mscorefonts-installer
-% \end{lstlisting}
-
-% \item macOS 涓嬫彁绀� Package fontspec Warning: Font "STSong" does not contain requested Script "CJK"
-
-% 蹇界暐鍗冲彲锛屼笉褰卞搷浣跨敤銆傝璀﹀憡宸茶鎶戝埗銆�
-% \end{enumerate}
-
-
-鎸囧畾瀛椾綋鐨勭浉鍏冲懡浠ゅ啓浜嶾texttt{profile/font.sty}銆�
-璇ユ枃浠朵腑涔熼鐣欐湁浣跨敤鏂规瀛椾綋鎴栬€呮€濇簮瀛椾綋鐨勫懡浠わ紝娑夊強鐨勫瓧浣撹\cref{tab:userfontset}锛屽彲鏍规嵁涓汉鍠滃ソ杩涜淇敼閫夋嫨銆�
-
-\begin{table}[htbp]
- \caption{鎿嶄綔绯荤粺棰勮瀛椾綋娓呭崟}
- \label{tab:defaultfontset}
- \begin{tabular}{cccc}
- \toprule
- 绫诲瀷 & Windows & macOS & Linux \\
- \midrule
- 瑗挎枃琛嚎 & Times~New~Roman & Times~New~Roman & TeX~Gyre~Termes \\
- 瑗挎枃鏃犺‖绾� & Arial & Arial & TeX~Gyre~Heros \\
- 瑗挎枃绛夊 & Courier~New & Menlo & TeX~Gyre~Cursor \\
- 瀹嬩綋 & SimSun & Songti~SC~Light &FandolSong-Regular \\
- 榛戜綋 & SimHei & Heiti~SC~Light & FandolHei-Regular \\
- 浠垮畫 & FangSong & STFangsong & FandolFang-Regular \\
- 妤蜂綋 & KaiTi & Kaiti~SC & FandolKai-Regular \\
- \bottomrule
- \end{tabular}
-\end{table}
-
-濡傛灉 Ubuntu 涓嬮亣鍒扮己澶卞瓧浣� Times New Roman 鐨勯棶棰橈紝瀹夎瀵瑰簲瀛椾綋鍗冲彲銆備娇鐢ㄤ互涓嬫寚浠や笅杞斤細
-\begin{lstlisting}
-sudo apt install ttf-mscorefonts-installer
-\end{lstlisting}
-
-\begin{table}[htbp]
- \caption{棰勭暀鐨勮嚜瀹氫箟涓枃瀛椾綋娓呭崟}
- \label{tab:userfontset}
- \begin{tabular}{ccc}
- \toprule
- 绫诲瀷 & 鏂规 & 鎬濇簮 \\
- \midrule
- 瀹嬩綋 & FZSSK & Noto~Serif~CJK~SC \\
- 榛戜綋 & FZHTK & Noto~Sans~CJK~SC \\
- 浠垮畫 & FZFSK & 鏂规浠垮畫绠€浣� \\
- 妤蜂綋 & FZKTK & 鏂规妤蜂綋绠€浣� \\
- \bottomrule
- \end{tabular}
-\end{table}
-
-\subsection{淇敼瀛椾綋閰嶇疆}
-
-鏈ā鏉挎彁渚涗簡鑻ュ共涓瓧浣撶浉鍏崇殑鎺у埗閫夐」锛屽凡浜嶾cref{sec:classoptions}鍒濇杩涜浠嬬粛銆傚鏋滃笇鏈涜鐩栨娴嬬郴缁熷瓧浣撶殑鍛戒护锛堣濡傚湪Linux缂栬瘧鏃朵娇鐢╓indows瀛椾綋鏍峰紡锛夛紝璇峰皢
-systemfont璁剧疆涓篺alse锛屽苟閫氳繃customlatinfont鍜宑ustomchinesefont杩涜閫夋嫨銆�
-
-鍏ㄩ儴瀛楃闆嗗懡浠ゅ涓嬫墍绀恒€�
-
-\begin{description}
- \item[\texttt{\textbackslash set\textunderscore latin\textunderscore fontset\textunderscore windows}] Windows鑻辨枃瀛楃闆�
- \item[\texttt{\textbackslash set\textunderscore chinese\textunderscore fontset\textunderscore windows}] Windows涓枃瀛楃闆�
- \item[\texttt{\textbackslash set\textunderscore latin\textunderscore fontset\textunderscore macos}] macOS鑻辨枃瀛楃闆�
- \item[\texttt{\textbackslash set\textunderscore chinese\textunderscore fontset\textunderscore macos}] macOS涓枃瀛楃闆�
- \item[\texttt{\textbackslash set\textunderscore latin\textunderscore fontset\textunderscore gyre}] Linux鑻辨枃瀛楃闆�
- \item[\texttt{\textbackslash set\textunderscore chinese\textunderscore fontset\textunderscore fandol}] Linux涓枃瀛楃闆�
- \item[\texttt{\textbackslash set\textunderscore chinese\textunderscore fontset\textunderscore founder}] 鏂规涓枃瀛楃闆�
- \item[\texttt{\textbackslash set\textunderscore chinese\textunderscore fontset\textunderscore noto}] 鎬濇簮涓枃瀛楃闆�
-\end{description}
-
-瀵逛簬闇€瑕佽繘涓€姝ヨ嚜瀹氫箟鐨勫悓瀛︼紝鍙互灏咰ustomEnFont鍜孋ustomZhFont璁剧疆涓簄ull锛岃嚜琛屽湪瀵艰█鍖鸿缃瓧浣撱€�
diff --git a/test/chapters/Introduction.tex b/test/chapters/Introduction.tex
deleted file mode 100644
index ee1469e2a910d7fcbaf9e2683504e4918b4a060b..0000000000000000000000000000000000000000
--- a/test/chapters/Introduction.tex
+++ /dev/null
@@ -1,66 +0,0 @@
-\chapter{缁}
-
-\textbf{鐗瑰埆鎻愰啋锛氭湰绔犳枃瀛椾粎渚涙牸寮忕ず渚嬶紝鍐呭宸插仠姝㈢淮鎶わ紝璇峰弬鑰冨畯鍖呮墜鍐岃繘琛岃缃畗
-
-\section{绠€浠媫
-鍗椾含澶у瀛︿綅璁烘枃\hologo{LaTeX}妯℃澘\cite{njuthesis}鍩轰簬鏈鐢熼櫌鐨勮鏂囨挵鍐欒鑼冨埗浣滐紝鍚屾椂鍙傝€冪爺绌剁敓闄㈡彁渚涚殑纭曞＋銆佸崥澹浣嶆潗鏂欏寘锛岀敤浜庣敓鎴愮鍚堝崡浜ぇ瀛﹀浣嶈鏂囨帓鐗堣姹傚拰鐩稿簲鐨勫浗瀹惰鑼冦€佽涓氭爣鍑嗙殑瀛︿綅璁烘枃锛屾棬鍦ㄤ负鍚屽鎻愪緵姣曚笟璁烘枃涔﹀啓鐨勬柟渚裤€�
-
-姝ゆā鏉块€氳繃LPPL鍗忚寮€婧愶紝鐩墠宸瞈href{https://ctan.org/pkg/njuthesis}{鍙戝竷鍦–TAN}銆�
-
-濡傛湁妯℃澘闂鎴栬€呯増鏉冮棶棰橈紝璇蜂簬Github椤圭洰涓婚〉涓奬href{https://github.com/nju-lug/NJUThesis/issues}{鎻愬嚭issue}銆�
-
-\begin{quotation}
- 璇锋敞鎰忥紝鏈ず渚嬫枃妗ｅ唴瀹筡textbf{瀛樺湪杈冨杩囨椂涔嬪}锛岃鍙傝€�.dtx鏂囦欢鐢熸垚鐨勪娇鐢ㄦ墜鍐屼互鑾峰緱鍑嗙‘鐨勫弬鑰冦€�
-\end{quotation}
-
-\section{寮€鍙戠幆澧儅
-
-鏈ā鏉跨殑寮€鍙戠淮鎶や富瑕佸湪\hologo{MiKTeX}涓嶾hologo{TeX}\,Live\,2021涓嬭繘琛岋紝鍐呴儴浠ｇ爜涓昏鐢盶lstinline|expl3|瀹忓寘鎻愪緵鐨刓hologo{LaTeX3}璇硶瀹炵幇銆�
-
-\section{鐩綍缁撴瀯}
-\label{sec:directory}
-
-\begin{lstlisting}[language=bash]
- 鈹� njuthesis.bib
- 鈹� njuthesis.cls
- 鈹� njuthesis.tex
- 鈹�
- 鈹溾攢figure
- 鈹� njulogo.pdf
- 鈹� njuname.pdf
- 鈹�
- 鈹斺攢profile
- abstract.sty
- components.sty
- cover.sty
- font.sty
- packages.sty
- page.sty
- reference.sty
-\end{lstlisting}
-
-\subsection{鏂囦欢璇存槑}
-\begin{description}
- \item [\texttt{abstract.sty}] 瀹氫箟涓嫳鏂囨憳瑕佺幆澧冨強鐩稿叧鏍煎紡
- \item [\texttt{components.sty}] 瀹氫箟鍥剧墖銆佽〃鏍笺€佷唬鐮併€佹暟瀛︾幆澧冩牱寮�
- \item [\texttt{cover.sty}] 瀹氫箟璁烘枃灏侀潰鍐呭
- \item [\texttt{font.sty}] 閲嶅畾涔塁TeX瀹忛泦鐨勯粯璁ゅ瓧浣擄紝鍥犱负CTeX瀛椾綋鍔犵矖瑕佹眰涓嶆弧瓒宠鏂囪瀹�
- \item [\texttt{package.sty}] 瀛樻斁鎵€鏈夎寮曠敤鐨勫寘
- \item [\texttt{page.sty}] 瀹氫箟姝ｆ枃椤甸潰銆佹爣棰樹互鍙婄洰褰曟潯鐩牸寮�
- \item [\texttt{reference.sty}] 瀹氫箟寮曟枃鏍煎紡
-\end{description}
-
-\section{鑷畾涔夐€夐」}
-\label{sec:classoptions}
-
-njuthesis绫绘彁渚涗簡鑻ュ共涓彲浠ヨ嚜瀹氫箟鐨勯€夐」锛屽涓嬫墍绀恒€�
-\begin{description}
- \item[\texttt{titlelength}] 鏍囬闀垮害锛岀敤浜庢帶鍒跺皝闈㈡爣棰樼殑琛屾暟銆傚彲閫夊€间负1銆�2銆�3锛岀己鐪佸€间负1銆�
- \item[\texttt{secondmentor}] 鏄惁鏈夌浜屽甯堬紝鐢ㄤ簬鍦ㄥ皝闈㈠拰鎽樿娣诲姞绗簩瀵煎笀锛岀己鐪佸€间负false銆�
- \item[\texttt{nlcover}] 鏄惁闇€瑕佸浗瀹跺浘涔﹂灏侀潰锛岀己鐪佸€间负false銆�
- \item[\texttt{degree}] 瀛︿綅绫诲瀷锛屾湰绉戝浣嶄负ug锛屽嵆undergraduate鐨勭缉鍐欙紱瀛︽湳鍨嬬澹浣嶄负mg锛涚澹笓涓氬浣嶄负mf锛涘崥澹浣嶄负phd銆�
- \item[\texttt{type}] 鐢ㄤ簬閫夋嫨鏂囨。绫诲瀷骞跺皢鐩稿叧瀛楁杈撳嚭鍦ㄥ皝闈㈠拰鎽樿椤点€傚彲閫夊€煎寘鎷瑃hesis锛堣〃绀烘瘯涓氳鏂囷級鍜宒esign锛堣〃绀烘瘯涓氳璁★級锛岀己鐪佸€间负thesis銆�
- \item[\texttt{systemfont}] 鏄惁鐢ㄧ郴缁熷瓧浣擄紝鐢ㄤ簬鑷姩妫€娴嬭繍琛岀郴缁熷苟浣跨敤棰勮瀛椾綋锛岀己鐪佸€间负true銆�
- \item[\texttt{customlatinfont}] 鐢ㄤ簬閫夋嫨鑷畾涔夎嫳鏂囧瓧绗﹂泦銆傚彲閫夊€煎寘鎷瑆indows, macos, gyre, null锛岀己鐪佸€间负windows銆�
- \item[\texttt{customchinesefont}] 鐢ㄤ簬閫夋嫨鑷畾涔変腑鏂囧瓧绗﹂泦銆傚彲閫夊€煎寘鎷瑆indows, macos, fandol, founder, noto, null锛岀己鐪佸€间负windows銆�
-\end{description}
diff --git a/test/chapters/Layout.tex b/test/chapters/Layout.tex
deleted file mode 100644
index 83b3b978dd7b24c189206fa2a6b66c46d474d7a1..0000000000000000000000000000000000000000
--- a/test/chapters/Layout.tex
+++ /dev/null
@@ -1,175 +0,0 @@
-\chapter{椤甸潰甯冨眬}
-
-\textbf{鐗瑰埆鎻愰啋锛氭湰绔犳枃瀛椾粎渚涙牸寮忕ず渚嬶紝鍐呭宸插仠姝㈢淮鎶わ紝璇峰弬鑰冨畯鍖呮墜鍐岃繘琛岃缃畗
-
-鏈ā鏉挎牸寮忎緷鐓с€�11-鍗椾含澶у姣曚笟璁烘枃锛堣璁★級鐨勬挵鍐欒鑼冨拰瑁呰瑕佹眰銆嬭繘琛岃皟鏁达紝鏂囦欢鍐呭璇﹁\cref{chap:standard}
-
-\section{灏侀潰椤祡
-
-
-\texttt{cover.sty}涓畾涔変簡鐢熸垚灏侀潰鐨勭浉鍏冲懡浠�
-
-
-\subsection{绗簩瀵煎笀}
-
-secondmentor 鐢ㄤ簬鎸囧畾鏄惁鍦ㄥ皝闈㈡墦鍗扮浜屽甯�
-
-\subsection{鍥藉鍥句功棣嗗皝闈
-
-瀵逛簬鐮旂┒鐢燂紝鏈ā鏉挎彁渚涗簡nlcover 鐢ㄤ簬鐢熸垚鍥藉鍥句功棣嗗皝闈�
-
-\subsection{鏂囨。绫诲瀷}
-
-濡傛灉缂栧啓鐨勬槸姣曚笟璁捐锛岃鍙傝€僜cref{sec:classoptions}锛屽皢Type閫夐」鏀逛负design銆�
-\subsection{澶氳鏍囬}
-
-涓轰簡浣胯緝闀跨殑璁烘枃棰樼洰涔熻兘缇庤鍦板憟鐜板湪灏侀潰椤典笂锛宯juthesis绫绘彁渚涗簡\texttt{TitleLength}杩欎竴閫夐」锛岀敤浜庢帶鍒跺皝闈㈡爣棰樼殑琛屾暟銆傝鍛戒护宸蹭簬\cref{sec:classoptions}杩涜浠嬬粛锛屽彲浠ュ湪\texttt{njuthesis.tex}鏂囦欢寮€澶寸殑绫诲畾涔変腑鎵惧埌锛屽彲閫夊€间负1銆�2銆�3锛岀己鐪佸€间负鍗曡鏍囬銆�
-
-
-\subsection{杈撳叆涓汉淇℃伅}
-
-\texttt{njusetup}瀹氫箟浜嗙敤浜庢枃妗ｅ皝闈㈢殑璇稿灞炴€у弬鏁帮紝
-鍐欎綔鏃朵慨鏀圭浉搴斿瓧绗︿覆鍗冲彲銆傛敞鎰忎笉瑕佹湁绌鸿锛屽惁鍒欏彲鑳芥姤閿�
-
-\begin{lstlisting}
-\njusetup {
- info = {
- <type> = <myinfo>;
- }
-}
-\end{lstlisting}
-
-\subsubsection{璁烘枃鏍囬}
-\begin{description}
- \item[\texttt{TitleA}] 鍗曡鏍囬锛屾垨澶氳鏍囬鐨勭涓€琛屻€傚叧浜庢槸鍚﹀簲璇ユ姌琛岋紝鍗曡鑳藉绾崇殑鏈€闀挎爣棰樹负\emph{15涓腑鏂囧瓧绗锛岃鑷閫夋嫨鍚堥€傜殑鎴柇澶勩€�
- \item[\texttt{TitleB}] 澶氳鏍囬鐨勭浜岃
- \item[\texttt{TitleC}] 澶氳鏍囬鐨勭涓夎
- \item[\texttt{TitleEN}] 鑻辨枃鏍囬锛屾敞鎰忕┖鏍艰鐢ㄦ尝娴嚎锛圽textasciitilde锛夋浛浠�
-\end{description}
-
-\subsubsection{涓汉骞寸骇銆佸鍙枫€佸鍚峿
-\begin{description}
- \item[\texttt{Grade}] 骞寸骇
- \item[\texttt{StudentID}] 鏈鐢熶负9浣嶆暟瀛楀鍙凤紝鐮旂┒鐢熶负涓や綅鑻辨枃瀛楁瘝鏍囪瘑鍔�8浣嶆暟瀛楀鍙凤紝涓や綅瀛楁瘝鑷姩澶у啓
- \item[\texttt{StudentName}] 濮撳悕
- \item[\texttt{StudentNameEN}] 濮撳悕鎷奸煶
-\end{description}
-
-\subsubsection{灏辫闄㈢郴涓撲笟}
-
-鏈鐢熸棤闇€濉啓鐮旂┒鏂瑰悜銆�
-\begin{description}
- \item[\texttt{Department}] 瀛﹂櫌鍚嶇О
- \item[\texttt{DepartmentEN}] 瀛﹂櫌鑻辨枃鍚嶇О
- \item[\texttt{Major}] 涓撲笟鍚嶇О
- \item[\texttt{MajorEN}] 涓撲笟鑻辨枃鍚嶇О
- \item[\texttt{Field}] 鐮旂┒鏂瑰悜
- \item[\texttt{FieldEN}] 鐮旂┒鏂瑰悜鑻辨枃鍚嶇О
-\end{description}
-
-\subsubsection{瀵煎笀淇℃伅}
-娉ㄦ剰鏍囨敞A鐨勪负绗竴瀵煎笀
-\begin{description}
- \item[\texttt{Mentor<A/B>}] 瀵煎笀濮撳悕
- \item[\texttt{Mentor<A/B>EN}] 瀵煎笀濮撳悕鐨勮嫳鏂囨嫾闊�
- \item[\texttt{Mentor<A/B>Title}] 瀵煎笀鑱岀О
- \item[\texttt{Mentor<A/B>TitleEN}] 瀵煎笀鑱岀О鑻辨枃
-\end{description}
-
-\subsubsection{鎻愪氦鏃ユ湡}
-\begin{description}
- \item[\texttt{SubmitDate}] 璁烘枃鎻愪氦鏃ユ湡
-\end{description}
-
-\subsubsection{绛旇京淇℃伅}
-
-闄ょ瓟杈╂棩鏈熶互澶栵紝鏈儴鍒嗗唴瀹逛粎鐢ㄤ簬鍥藉鍥句功棣嗗皝闈€€傛湰绉戠敓蹇界暐鍗冲彲銆�
-绛旇京濮斿憳浼氬鍚嶄笌鑱岀О涔嬮棿闇€浣跨敤娉㈡氮绾胯繛鎺ャ€�
-
-\begin{description}
- \item[\texttt{DefendDate}] 绛旇京鏃ユ湡
- \item[\texttt{ReviewerChairman}] 绛旇京濮斿憳浼氫富甯殑濮撳悕鍙婅亴绉�
- \item[\texttt{Reviewer<A/B/C/D>}] 鍥涗綅璇勯槄浜虹殑濮撳悕鍙婅亴绉�
-\end{description}
-
-\subsubsection{鍥藉鍥句功棣嗗皝闈㈢浉鍏充俊鎭瘆
-
-鏈儴鍒嗗唴瀹逛粎鐢ㄤ簬鍥藉鍥句功棣嗗皝闈€€傛湰绉戠敓蹇界暐鍗冲彲銆�
-
-\begin{description}
- \item[\texttt{Classification}] 鍒嗙被鍙�
- \item[\texttt{SecurityLevel}] 闄愬埗
- \item[\texttt{UDC}] UDC
- \item[\texttt{MentorInfo}] 鎸囧鏁欏笀鑱屽姟銆佽亴绉般€佸浣嶃€佸崟浣嶅悕绉板強鍦板潃
-\end{description}
-
-\section{鎽樿椤祡
-
-\texttt{profile/abstract.sty}鎻愪緵浜嗘憳瑕侀〉鏍煎紡鐨勫畾涔夈€�
-
-\begin{lstlisting}
-\begin{abstract}
- <text>
- \keywords{<keywords>}
-\end{abstract}
-
-\begin{englishabstract}
- <text>
- \englishkeywords{<keywords>}
-\end{englishabstract}
-\end{lstlisting}
-
-鎽樿椤典竴鑸笉鎻掑叆鐩綍锛岄粯璁ゅ彧娣诲姞pdf涔︾銆傚纭疄鏈夋彃鍏ョ洰褰曠殑闇€姹傦紝璇峰湪\texttt{abstract.sty}鏂囦欢涓畾浣嶅埌濡備笅璇彞
-\begin{lstlisting}[language=TeX]
-% \phantomsection\addcontentsline{toc}{chapter}{涓枃鎽樿}
-\pdfbookmark[0]{涓枃鎽樿}{涓枃鎽樿}
-\end{lstlisting}
-灏嗗叾淇敼涓�
-\begin{lstlisting}[language=TeX]
-\phantomsection\addcontentsline{toc}{chapter}{涓枃鎽樿}
-% \pdfbookmark[0]{涓枃鎽樿}{涓枃鎽樿}
-\end{lstlisting}
-
-鍦ㄤ娇鐢╘hologo{LuaLaTeX}缂栬瘧鏃讹紝鐮旂┒鐢熶腑鏂囨憳瑕侀〉鐨勬爣棰樹細鍑虹幇绌烘牸鏃犱笅鍒掔嚎鐨勯棶棰橈紝鐩墠姝ｅ湪绉瀬瀵绘眰瑙ｅ喅鏂规硶銆�
-
-\section{鍓嶈█椤祡
-
-浣跨敤preface鐜瀹氫箟
-
-\begin{lstlisting}
-\begin{preface}
- <text>
-\end{preface}
-\end{lstlisting}
-
-\section{鐩綍椤祡
-
-鐩綍椤垫牸寮忓畾鍒朵簬\texttt{profile/page.sty}
-
-\section{姝ｆ枃}
-
-姝ｆ枃鏍煎紡瀹氬埗浜嶾texttt{profile/page.sty}銆�
-
-椤佃竟璺濆湪\texttt{profile/packages.sty}銆�
-
-鏈鐢熸棤椤电湁锛岄〉闈㈢紪鍙峰眳涓綅浜庨〉鑴氾紱鐮旂┒鐢熸棤椤佃剼锛岄〉鐪夊寘鎷珷鑺傚悕鍜岄〉闈㈢紪鍙枫€�
-
-% 瀵逛腑鏂囧姞涓嬪垝绾胯浣跨敤xeCJKfntef鍖呯殑CJKunderline鍛戒护浠ｆ浛uline锛屼互瑙ｅ喅涓枃鐨勬崲琛岄棶棰�
-
-\section{鍙傝€冩枃鐚〉}
-
-闇€瑕佷娇鐢╞iber鎵嬪姩缂栬瘧鎵嶄細鏄剧ず锛屽叿浣撳唴瀹瑰弬鑰僜cref{chap:reference}
-
-\section{鑷磋阿椤祡
-
-鍚屽墠瑷€锛屼娇鐢╝cknowledgement鐜
-
-\begin{lstlisting}
-\begin{acknowledgement}
- <text>
-\end{acknowledgement}
-\end{lstlisting}
-
-\section{闄勫綍椤祡
-
-闄勫綍鏀惧湪\lstinline|\appendix|鍛戒护鍚庯紝浠ヨ嫳鏂囧瓧姣嶈繘琛岀紪鍙�
diff --git a/test/test.tex b/test/test.tex
index 2004e8f51f5c13def0d1cb31950de06aed49e597..470ff5d8a309f8db4553954f64b0fa26d3adff90 100644
--- a/test/test.tex
+++ b/test/test.tex
@@ -2,7 +2,10 @@
% 鏈枃妗ｇ敤浜庢祴璇� njuthesis 鏄惁姝ｅ父宸ヤ綔
% 鍏跺唴瀹逛笉鍏锋湁浠讳綍鍙傝€冩剰涔�
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[degree=phd,nlcover]{njuthesis}
+% \documentclass{njuthesis}
+% \documentclass[degree=mg]{njuthesis}
+\documentclass[degree=mf]{njuthesis}
+% \documentclass[degree=phd,nlcover]{njuthesis}
\njusetup {
info = {
@@ -46,6 +49,7 @@
\begin{document}
+% \frontmatter
\maketitle
\input{chapters/Abstract}
@@ -57,9 +61,14 @@
\mainmatter
-\input{chapters/Introduction}
-\input{chapters/Environments}
-\input{chapters/Layout}
+% \flushbottom
+
+\chapter[闈炲父闀跨殑鏍囬涓嶅ソ鐪媇{濡傛灉鏍囬闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闀夸細鎬庢牱鍛
+\section[杩樻槸鐢ㄧ煭鐐圭殑鍚{濡傛灉鏍囬闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闈炲父闀夸細鎬庢牱鍛
+绛旀鏄娇鐢ㄥ彲閫夊弬鏁帮細\verb+\chapter[鐭弿杩癩{瀹屾暣鐨勯暱鏍囬}+
+
+\zhlipsum[1-20][name=zhufu]
+
\input{chapters/FigTabCode}
\input{chapters/Mathematics}
\input{chapters/Reference}