diff --git a/makefile b/makefile index 1aed752..26f3398 100644 --- a/makefile +++ b/makefile @@ -60,7 +60,7 @@ close: @$(CLOSE) || echo not found clean: - $(RM) *.gls *.glo *.ind *.idx + $(RM) *.gls *.glo *.ind yanputhesis.idx $(RM) *.ilg *.aux *.toc *.aux $(RM) *.hd *.out *.thm *.gz *.nlo *.nls $(RM) *.log *.lof *.lot *.bbl *.blg diff --git a/yanputhesis-sample.tex b/yanputhesis-sample.tex index c6d8dc1..216b3ad 100644 --- a/yanputhesis-sample.tex +++ b/yanputhesis-sample.tex @@ -385,12 +385,12 @@ \section{插图} \centering \begin{subfigure}[t]{0.47\textwidth} \centering - \includegraphics[scale=0.12]{poster.png} + \includegraphics[scale=0.1]{poster.png} \caption{\label{subfig:example2-subfig1}} \end{subfigure} \begin{subfigure}[t]{0.47\textwidth} \centering - \includegraphics[scale=0.12]{poster.png} + \includegraphics[scale=0.1]{poster.png} \caption{\label{subfig:example2-subfig2}} \end{subfigure} \end{minipage} diff --git a/yanputhesis.cls b/yanputhesis.cls index 6063376..a288c7f 100644 --- a/yanputhesis.cls +++ b/yanputhesis.cls @@ -255,10 +255,10 @@ \RequirePackage{setspace} % 空白长度控制 \RequirePackage{ragged2e} % 对齐 \DeclareCaptionFont{cWuhao}{\sWuhao} % 图表标题为五号 -\captionsetup[table]{labelfont=cWuhao,textfont=cWuhao, aboveskip=10pt, belowskip=0pt} % -\captionsetup[figure]{labelfont=cWuhao,textfont=cWuhao, aboveskip=10pt, belowskip=0pt} % -\captionsetup[subtable]{labelformat=simple, aboveskip=10pt, belowskip=-5pt} % -\captionsetup[subfigure]{labelformat=simple, aboveskip=10pt, belowskip=-5pt}% +\captionsetup[table]{labelfont=cWuhao, textfont=cWuhao, aboveskip=10pt, belowskip=0pt} +\captionsetup[figure]{labelfont=cWuhao, textfont=cWuhao, aboveskip=10pt, belowskip=0pt} +\captionsetup[subtable]{labelformat=simple, aboveskip=10pt, belowskip=-5pt} +\captionsetup[subfigure]{labelformat=simple, aboveskip=10pt, belowskip=-5pt} \AtBeginEnvironment{tabular}{\sWuhao} % 表格内容为五号 \AtBeginEnvironment{tabularx}{\sWuhao} % \newcolumntype{C}{>{\centering\arraybackslash}X} % 等宽居中 @@ -842,8 +842,8 @@ %% 附页部分 %%-----------------------------------------------------------------------------% \newenvironment{acknowledgements}{ % 致谢 - \renewcommand{\baselinestretch}{1.5} % - \fontsize{12pt}{13pt}\selectfont % + \renewcommand{\baselinestretch}{1.0} % + \sDefault % \phantomsection\chapter*{\nwpu@page@ack} % \markboth{\nwpu@page@ack}{\nwpu@page@ack} % \addcontentsline{toc}{chapter}{\nwpu@page@ack} % @@ -851,8 +851,8 @@ }{\par \cleardoublepage} % %%-----------------------------------------------------------------------------% \newenvironment{accomplishments}{ % 参加科研情况 - \renewcommand{\baselinestretch}{1.5} % - \fontsize{12pt}{13pt}\selectfont % + \renewcommand{\baselinestretch}{1.0} % + \sDefault % \phantomsection\chapter*{\nwpu@page@acp} % \markboth{\nwpu@page@acp}{} % \addcontentsline{toc}{chapter}{\nwpu@page@acp} % diff --git a/yanputhesis.dtx b/yanputhesis.dtx index a43842f..045f5c3 100644 --- a/yanputhesis.dtx +++ b/yanputhesis.dtx @@ -541,12 +541,12 @@ $$a_0+a_1+a_2=\sqrt{233}$$ \centering \begin{subfigure}[t]{0.47\textwidth} \centering - \includegraphics[scale=0.12]{poster.png} + \includegraphics[scale=0.1]{poster.png} \caption{\label{subfig:example2-subfig1}} \end{subfigure} \begin{subfigure}[t]{0.47\textwidth} \centering - \includegraphics[scale=0.12]{poster.png} + \includegraphics[scale=0.1]{poster.png} \caption{\label{subfig:example2-subfig2}} \end{subfigure} \end{minipage} @@ -796,7 +796,7 @@ int main() %%-----------------------------------------------------------------------------% \RequirePackage{geometry} % 纸张尺寸及页边距 % \end{macrocode} -% \markdtxchanges{v1.8.5}{2023/11/29}{微调页眉页脚设置} +% \markdtxchanges{v1.8.1}{2022/12/06}{摘要关键词之间空一行} % \begin{macrocode} \geometry{a4paper, % A4 纸张 left=2.5cm, right=2.5cm, top=2.54cm, bottom=2.54cm, % 页边距 @@ -1020,16 +1020,16 @@ int main() \RequirePackage{setspace} % 空白长度控制 \RequirePackage{ragged2e} % 对齐 \DeclareCaptionFont{cWuhao}{\sWuhao} % 图表标题为五号 -\captionsetup[table]{labelfont=cWuhao,textfont=cWuhao, aboveskip=10pt, belowskip=0pt} % -\captionsetup[figure]{labelfont=cWuhao,textfont=cWuhao, aboveskip=10pt, belowskip=0pt} % +\captionsetup[table]{labelfont=cWuhao, textfont=cWuhao, aboveskip=10pt, belowskip=0pt} +\captionsetup[figure]{labelfont=cWuhao, textfont=cWuhao, aboveskip=10pt, belowskip=0pt} % \end{macrocode} % \markdtxchanges{v1.7.0}{2022/10/31}{更新子图、子表格式} % \begin{macrocode} -\captionsetup[subtable]{labelformat=simple, aboveskip=10pt, belowskip=-5pt} % +\captionsetup[subtable]{labelformat=simple, aboveskip=10pt, belowskip=-5pt} % \end{macrocode} % \markdtxchanges{v1.8.5}{2023/11/29}{更新子图与子图标题间距} % \begin{macrocode} -\captionsetup[subfigure]{labelformat=simple, aboveskip=10pt, belowskip=-5pt}% +\captionsetup[subfigure]{labelformat=simple, aboveskip=10pt, belowskip=-5pt} % \end{macrocode} % \markdtxchanges{v1.8.1}{2022/12/06}{重写表格内容为五号格式语句} % \begin{macrocode} @@ -1804,8 +1804,11 @@ int main() %% 附页部分 %%-----------------------------------------------------------------------------% \newenvironment{acknowledgements}{ % 致谢 - \renewcommand{\baselinestretch}{1.5} % - \fontsize{12pt}{13pt}\selectfont % + \renewcommand{\baselinestretch}{1.0} % + \sDefault % +% \end{macrocode} +% \markdtxchanges{v1.8.6}{2024/01/16}{微调致谢与页眉间距} +% \begin{macrocode} \phantomsection\chapter*{\nwpu@page@ack} % \markboth{\nwpu@page@ack}{\nwpu@page@ack} % \addcontentsline{toc}{chapter}{\nwpu@page@ack} % @@ -1816,8 +1819,11 @@ int main() }{\par \cleardoublepage} % %%-----------------------------------------------------------------------------% \newenvironment{accomplishments}{ % 参加科研情况 - \renewcommand{\baselinestretch}{1.5} % - \fontsize{12pt}{13pt}\selectfont % + \renewcommand{\baselinestretch}{1.0} % + \sDefault % +% \end{macrocode} +% \markdtxchanges{v1.8.6}{2024/01/16}{微调参与科研情况与页眉间距} +% \begin{macrocode} \phantomsection\chapter*{\nwpu@page@acp} % \markboth{\nwpu@page@acp}{} % \addcontentsline{toc}{chapter}{\nwpu@page@acp} %