Merge pull request #68 from NWPUMetaphysicsOffice/public-dev

Public dev
NWPUMetaphysicsOffice · Dec 11, 2022 · b15572f · b15572f
2 parents 702105c + 49e4e24
commit b15572f
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 23 deletions.
diff --git a/yanputhesis-sample.pdf b/yanputhesis-sample.pdf
diff --git a/yanputhesis-sample.tex b/yanputhesis-sample.tex
@@ -6,7 +6,7 @@
 %%
 %% yanputhesis.dtx  (with options: `sample')
 %% Copyright (C) 2022 by Shangkun Shen
-%%
+%% 
 %% It may be distributed and/or modified under the conditions of the LaTeX
 %% Project Public License, either version 1.3b of this license or (at your
 %% option) any later version. The latest version of this license is in
@@ -106,7 +106,7 @@
 \date{2022年6月}{Jun 2022}                                  % 答辩日期
 \school{数学与统计学院}{School of Mathematics and Statistics}% 学院
 \major{数学}{Philosophy in Mathematics}                     % 专业 博士请添加 Ph
-\advisor{李四海{\enspace}教授}{Sihai Li}                    % 导师
+\advisor{李四海 \enspace 教授}{Sihai Li}                    % 导师
 \studentnumber{2016123456}                                  % 学号
 \funding{本研究得到玄学基金（编号23336666）资助。}{         % 基金资助
     The present work is supported by Funding of Metaphysics %
@@ -376,11 +376,11 @@ \chapter{另一份说明}
 %%=============================================================================%
 
 
-%%
+%% 
 %% This work consists of the file  yanputhesis.dtx
 %% and the derived files           yanputhesis.ins,
 %%                                 yanputhesis.pdf,
 %%                                 yanputhesis.cls.
-%%
+%% 
 %%
 %% End of file `yanputhesis-sample.tex'.
diff --git a/yanputhesis.cls b/yanputhesis.cls
@@ -15,7 +15,7 @@
 %% 2005/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesClass{yanputhesis}
-    [2022/12/05 v1.8.1 Yet Another NPU Thesis Template]
+    [2022/12/11 v1.8.2 Yet Another NPU Thesis Template]
 %%=============================================================================%
 %% 文档选项和基础文档类型控制
 %%-----------------------------------------------------------------------------%
@@ -270,7 +270,7 @@
     \setlength{\belowdisplayskip}{0pt}                      %
     \setlength{\abovedisplayshortskip}{0pt}                 %
     \setlength{\belowdisplayshortskip}{0pt}}                %
-\theoremsymbol{\ensuremath{\square}                         % 证明环境 囗
+{\theoremsymbol{\ensuremath{\square}}                       % 证明环境 囗
 \if@npu@lang@chs\newtheorem*{proof}{证明}\else\newtheorem*{proof}{Proof}\fi}
 \newcommand{\qedinEquation}{{\rlap{$\qquad\square$}}}       % 公式中添加证毕符号
 \if@npu@lang@chs                                            % 定制中文定理环境
@@ -553,7 +553,7 @@
             \bf 申{\enspace}请{\enspace}日{\enspace}期}{    %
             \uline{\hfill \makebox{\bf \nwpu@chs@date} \hfill}}
         \end{minipage}                                      % 排版结束
-        \vspace{2.5\baselineskip}                           % => 2.5 * 24pt * 1.25
+        \vspace{2.5\baselineskip}                           % 2.5 * 24pt * 1.25
     \end{center}                                            %
 \end{titlepage} \fSong \normalsize \newpage \clearpage      %
 }                                                           %
@@ -695,7 +695,7 @@
 %%-----------------------------------------------------------------------------%
 \let\old@bibliography\bibliography                          % 保护原有附录环境
 \renewcommand{\bibliography}[1]{                            %
-    \phantomsection \addcontentsline{toc}{chapter}{参考文献}%
+    \phantomsection\addcontentsline{toc}{chapter}{参考文献} %
     \renewcommand{\baselinestretch}{1.0}                    %
     \fontsize{12pt}{13pt}\selectfont                        %
     \setlength{\bibsep}{0.5ex}                              %
@@ -770,6 +770,7 @@
     \phantomsection\chapter*{\nwpu@page@ack}                %
     \markboth{\nwpu@page@ack}{\nwpu@page@ack}               %
     \addcontentsline{toc}{chapter}{\nwpu@page@ack}          %
+    \addtocontents{toc}{\protect\setcounter{tocdepth}{2}}   %
 }{\par \cleardoublepage}                                    %
 %%-----------------------------------------------------------------------------%
 \newenvironment{accomplishments}{                           % 参加科研情况
@@ -801,12 +802,15 @@
         数据库进行检索，可以采用影印、缩印或扫描等复制手段保存和汇编本学位论文。同时本人
         保证，毕业后结合学位论文研究课题再撰写的文章一律注明作者单位为西北工业大学。\par
         {\qquad}本学位论文属于（在以下方框内打“√”）：\par
-        {\qquad}$\square$\hspace*{0.7em}保密论文，保密期（\hspace*{2.5em}年\hspace*{2.5em}月\hspace*{2.5em}日至\hspace*{2.5em}年\hspace*{2.5em}月\hspace*{2.5em}日）。\par
+        {\qquad}$\square$\hspace*{0.7em}保密论文，保密期
+        （\hspace*{2.5em}年\hspace*{2.5em}月\hspace*{2.5em}日
+        至\hspace*{2.5em}年\hspace*{2.5em}月\hspace*{2.5em}日）。\par
         {\qquad}$\square$\hspace*{0.7em}公开论文。\par
         {\qquad}~\par
-        {\qquad}学位论文作者签名{~:~}\underline{\qquad\qquad\qquad} \hfill
-        指导教师签名{~:~}\underline{\qquad\qquad\qquad} \par
-        \hspace*{8em}{年\hspace*{1.5em}月\hspace*{1.5em}日} \hfill\hspace*{12em} {年\hspace*{1.5em}月\hspace*{1.5em}日}\hspace*{1.5em}\par
+        {\qquad}学位论文作者签名{~:~}\underline{\qquad\qquad\qquad}\hfill
+        指导教师签名{~:~}\underline{\qquad\qquad\qquad}\par
+        \hspace*{8em}{年\hspace*{1.5em}月\hspace*{1.5em}日}\hfill
+        \hspace*{12em}{年\hspace*{1.5em}月\hspace*{1.5em}日}\hspace*{1.5em}\par
         {\qquad}~\par
         \vspace*{2.1mm}
         \hbox to \hsize{\leaders\hbox to 0.6em{\hss--\hss}\hfill} \par
@@ -829,7 +833,7 @@
             \vspace*{1.5mm}
             \hspace*{21em}\hfill 学位论文作者签名{~:~}\underline{\qquad\qquad\quad}\par
             \vspace*{2mm}
-            \hspace*{10em}\hfill {年\hspace*{1.5em}月\hspace*{1.5em}日}\hspace*{1.5em}
+            \hspace*{10em}\hfill{年\hspace*{1.5em}月\hspace*{1.5em}日}\hspace*{1.5em}
         \end{minipage}
     \end{minipage}
 \end{titlepage}

diff --git a/yanputhesis.dtx b/yanputhesis.dtx
@@ -90,7 +90,7 @@ and the derived files           yanputhesis.ins,
 %<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<class>\ProvidesClass{yanputhesis}
 %<*class>
-    [2022/12/05 v1.8.1 Yet Another NPU Thesis Template]
+    [2022/12/11 v1.8.2 Yet Another NPU Thesis Template]
 %</class>
 %
 %<*driver>
@@ -253,7 +253,7 @@ and the derived files           yanputhesis.ins,
 \date{2022年6月}{Jun 2022}                                  % 答辩日期
 \school{数学与统计学院}{School of Mathematics and Statistics}% 学院
 \major{数学}{Philosophy in Mathematics}                     % 专业 博士请添加 Ph
-\advisor{李四海{\enspace}教授}{Sihai Li}                    % 导师
+\advisor{李四海 \enspace 教授}{Sihai Li}                    % 导师
 \studentnumber{2016123456}                                  % 学号
 \funding{本研究得到玄学基金（编号23336666）资助。}{         % 基金资助
     The present work is supported by Funding of Metaphysics %
@@ -885,7 +885,10 @@ int main()
     \setlength{\belowdisplayskip}{0pt}                      %
     \setlength{\abovedisplayshortskip}{0pt}                 %
     \setlength{\belowdisplayshortskip}{0pt}}                %
-\theoremsymbol{\ensuremath{\square}                         % 证明环境 囗
+%    \end{macrocode}
+% \markdtxchanges{v1.8.2}{2022/12/11}{修复证明环境}
+%    \begin{macrocode}
+{\theoremsymbol{\ensuremath{\square}}                       % 证明环境 囗
 \if@npu@lang@chs\newtheorem*{proof}{证明}\else\newtheorem*{proof}{Proof}\fi}
 \newcommand{\qedinEquation}{{\rlap{$\qquad\square$}}}       % 公式中添加证毕符号
 \if@npu@lang@chs                                            % 定制中文定理环境
@@ -1237,7 +1240,7 @@ int main()
             \bf 申{\enspace}请{\enspace}日{\enspace}期}{    %
             \uline{\hfill \makebox{\bf \nwpu@chs@date} \hfill}}
         \end{minipage}                                      % 排版结束
-        \vspace{2.5\baselineskip}                           % => 2.5 * 24pt * 1.25
+        \vspace{2.5\baselineskip}                           % 2.5 * 24pt * 1.25
     \end{center}                                            %
 \end{titlepage} \fSong \normalsize \newpage \clearpage      %
 }                                                           %
@@ -1436,7 +1439,7 @@ int main()
 %    \begin{macrocode}
 \let\old@bibliography\bibliography                          % 保护原有附录环境
 \renewcommand{\bibliography}[1]{                            %
-    \phantomsection \addcontentsline{toc}{chapter}{参考文献}%
+    \phantomsection\addcontentsline{toc}{chapter}{参考文献} %
     \renewcommand{\baselinestretch}{1.0}                    %
     \fontsize{12pt}{13pt}\selectfont                        %
     \setlength{\bibsep}{0.5ex}                              %
@@ -1533,6 +1536,10 @@ int main()
     \phantomsection\chapter*{\nwpu@page@ack}                %
     \markboth{\nwpu@page@ack}{\nwpu@page@ack}               %
     \addcontentsline{toc}{chapter}{\nwpu@page@ack}          %
+%    \end{macrocode}
+% \markdtxchanges{v1.8.2}{2022/12/11}{修复目录环境}
+%    \begin{macrocode}
+    \addtocontents{toc}{\protect\setcounter{tocdepth}{2}}   %
 }{\par \cleardoublepage}                                    %
 %%-----------------------------------------------------------------------------%
 \newenvironment{accomplishments}{                           % 参加科研情况
@@ -1567,12 +1574,15 @@ int main()
         数据库进行检索，可以采用影印、缩印或扫描等复制手段保存和汇编本学位论文。同时本人
         保证，毕业后结合学位论文研究课题再撰写的文章一律注明作者单位为西北工业大学。\par
         {\qquad}本学位论文属于（在以下方框内打“√”）：\par
-        {\qquad}$\square$\hspace*{0.7em}保密论文，保密期（\hspace*{2.5em}年\hspace*{2.5em}月\hspace*{2.5em}日至\hspace*{2.5em}年\hspace*{2.5em}月\hspace*{2.5em}日）。\par
+        {\qquad}$\square$\hspace*{0.7em}保密论文，保密期
+        （\hspace*{2.5em}年\hspace*{2.5em}月\hspace*{2.5em}日
+        至\hspace*{2.5em}年\hspace*{2.5em}月\hspace*{2.5em}日）。\par
         {\qquad}$\square$\hspace*{0.7em}公开论文。\par
         {\qquad}~\par
-        {\qquad}学位论文作者签名{~:~}\underline{\qquad\qquad\qquad} \hfill
-        指导教师签名{~:~}\underline{\qquad\qquad\qquad} \par
-        \hspace*{8em}{年\hspace*{1.5em}月\hspace*{1.5em}日} \hfill\hspace*{12em} {年\hspace*{1.5em}月\hspace*{1.5em}日}\hspace*{1.5em}\par
+        {\qquad}学位论文作者签名{~:~}\underline{\qquad\qquad\qquad}\hfill
+        指导教师签名{~:~}\underline{\qquad\qquad\qquad}\par
+        \hspace*{8em}{年\hspace*{1.5em}月\hspace*{1.5em}日}\hfill
+        \hspace*{12em}{年\hspace*{1.5em}月\hspace*{1.5em}日}\hspace*{1.5em}\par
         {\qquad}~\par
         \vspace*{2.1mm}
         \hbox to \hsize{\leaders\hbox to 0.6em{\hss--\hss}\hfill} \par
@@ -1595,7 +1605,7 @@ int main()
             \vspace*{1.5mm}
             \hspace*{21em}\hfill 学位论文作者签名{~:~}\underline{\qquad\qquad\quad}\par
             \vspace*{2mm}
-            \hspace*{10em}\hfill {年\hspace*{1.5em}月\hspace*{1.5em}日}\hspace*{1.5em}
+            \hspace*{10em}\hfill{年\hspace*{1.5em}月\hspace*{1.5em}日}\hspace*{1.5em}
         \end{minipage}
     \end{minipage}
 \end{titlepage}

diff --git a/yanputhesis.pdf b/yanputhesis.pdf