summaryrefslogtreecommitdiff
path: root/macros/xetex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-11-24 03:03:00 +0000
committerNorbert Preining <norbert@preining.info>2024-11-24 03:03:00 +0000
commitab3e387a1833469d8e25383302cac8970b17ab69 (patch)
tree3347328ba0b14c057b33e5576669a2bbdc91a674 /macros/xetex
parentc5ea838e494313690309865715e27f79305f14ae (diff)
CTAN sync 202411240302
Diffstat (limited to 'macros/xetex')
-rw-r--r--macros/xetex/latex/hduthesis/README.md57
-rw-r--r--macros/xetex/latex/hduthesis/doc/hduthesis.pdfbin642137 -> 668739 bytes
-rw-r--r--macros/xetex/latex/hduthesis/doc/hduthesis.tex24
-rw-r--r--macros/xetex/latex/hduthesis/examples/cha/cha3.tex2
-rw-r--r--macros/xetex/latex/hduthesis/examples/cha/cha4.tex4
-rw-r--r--macros/xetex/latex/hduthesis/examples/hduthesis-bc.pdfbin464473 -> 478706 bytes
-rw-r--r--macros/xetex/latex/hduthesis/examples/hduthesis-bc.tex9
-rw-r--r--macros/xetex/latex/hduthesis/examples/hduthesis-pg.pdfbin147863 -> 153643 bytes
-rw-r--r--macros/xetex/latex/hduthesis/examples/hduthesis-pg.tex7
-rw-r--r--macros/xetex/latex/hduthesis/tex/hdubadge.pdfbin22109 -> 42717 bytes
-rw-r--r--macros/xetex/latex/hduthesis/tex/hduthesis-bc.config-module.code.tex179
-rw-r--r--macros/xetex/latex/hduthesis/tex/hduthesis-bc.layout-module.code.tex173
-rw-r--r--macros/xetex/latex/hduthesis/tex/hduthesis-layout-module.code.tex (renamed from macros/xetex/latex/hduthesis/tex/hduthesis-unv.layout-module.code.tex)127
-rw-r--r--macros/xetex/latex/hduthesis/tex/hduthesis-pg.config-module.code.tex (renamed from macros/xetex/latex/hduthesis/tex/hduthesis-pg.layout-module.code.tex)212
-rw-r--r--macros/xetex/latex/hduthesis/tex/hduthesis-typeset-module.code.tex (renamed from macros/xetex/latex/hduthesis/tex/hduthesis-font-module.code.tex)24
-rw-r--r--macros/xetex/latex/hduthesis/tex/hduthesis.cls36
-rw-r--r--macros/xetex/latex/hduthesis/tex/hdutitle.pdfbin0 -> 22109 bytes
17 files changed, 462 insertions, 392 deletions
diff --git a/macros/xetex/latex/hduthesis/README.md b/macros/xetex/latex/hduthesis/README.md
index 016c5b30c7..3a6d6c11c3 100644
--- a/macros/xetex/latex/hduthesis/README.md
+++ b/macros/xetex/latex/hduthesis/README.md
@@ -1,6 +1,39 @@
-# The `hduThesiS` class
+## 杭州电子科技大学学位论文 LaTeX 模板
-This class provides the thesis template for Hangzhou Dianzi University.
+杭州电子科技大学学位论文 LaTeX 模板以 `LaTeX-expl3` 构建.
+模板提供杭州电子科技大学学士和硕士学位论文模板.
+
+`hduThesiS` 的模块提供以下支持:
+
+- `typeset`: 数学和文本排版
+
+- `layout`: 封面和浮动题布局
+
+- `bc.config`: 学士论文格式配置
+
+- `pg.config`: 硕士论文格式配置
+
+- `hdu.l3doc`: 模板 `l3doc` 用户手册配置
+
+---
+
+## The `hduThesiS` class: LaTeX class for Hangzhou Dianzi University.
+
+LaTeX class for bachelor and postgraduate theses in Hangzhou Dianzi University
+is constructed by `LaTeX-expl3` now. This class provides the bachelors' and
+postgraduates' thesis template for Hangzhou Dianzi University.
+
+Modules of `hduThesiS` provide the following supports:
+
+- `typeset`: Math and text Typeset
+
+- `layout`: Layout for cover and figures
+
+- `bc.config`: Configuration for bachelor thesis' format
+
+- `pg.config`: Configuration for postgraduate thesis' format
+
+- `hdu.l3doc`: Configuration for class's `l3doc` manual
**Welcome to pull requests [here](https://github.com/xiamyphys/hduthesis).**
@@ -11,3 +44,23 @@ This work may be distributed and/or modified under the conditions of the [LaTeX
This work has the LPPL maintenance status `maintained`.
The Current Maintainer of this work is [Mingyu Xia](https://www.ctan.org/author/xia-my).
+
+---
+
+#### References
+
+> [1]. The LaTeX3 Interfaces
+
+> [2]. CTeX 宏集
+
+> [3]. LaTeX for package and class authors current version
+
+> [4]. The LaTeX2e Sources
+
+> [4]. The LaTeX3 kernel: style guide for code authors
+
+> [5]. Package `etoolbox`, `geometry`, `tocloft`, `fancyhdr`, etc.
+
+> [6]. [毕业设计(论文)的写作规范及格式要求(含写作模板)](https://jwc.hdu.edu.cn/2022/0428/c4555a153813/page.htm)
+
+> [7]. [杭州电子科技大学研究生学位论文格式统一要求(杭电研〔2012〕311号)](https://grs.hdu.edu.cn/2013/0507/c1730a51754/page.htm)
diff --git a/macros/xetex/latex/hduthesis/doc/hduthesis.pdf b/macros/xetex/latex/hduthesis/doc/hduthesis.pdf
index e107387864..545384987d 100644
--- a/macros/xetex/latex/hduthesis/doc/hduthesis.pdf
+++ b/macros/xetex/latex/hduthesis/doc/hduthesis.pdf
Binary files differ
diff --git a/macros/xetex/latex/hduthesis/doc/hduthesis.tex b/macros/xetex/latex/hduthesis/doc/hduthesis.tex
index 4db3f85939..101f8e7120 100644
--- a/macros/xetex/latex/hduthesis/doc/hduthesis.tex
+++ b/macros/xetex/latex/hduthesis/doc/hduthesis.tex
@@ -33,9 +33,9 @@
\section{Introduction \& Loading \hologo{hduthesis}}
本模板为杭州电子科技大学学位论文 \underline{非官方} \hologo{LaTeX} 模板,
-支持学士和硕士学位论文排版. 加载 \hologo{hduthesis} 时遇到``编译受阻''报错,
-请认真阅读上页的用户协议. 键入全局选项 \cmd{agreed} 后,
-方可顺利进行编译,并默认您已同意用户协议.
+以 \hologo{LaTeX3} 构建,支持学士和硕士学位论文排版.
+加载 \hologo{hduthesis} 时遇到``编译受阻''报错,请认真阅读上页的用户协议.
+键入全局选项 \cmd{agreed} 后,方可顺利进行编译,并默认您已同意用户协议.
\begin{framed}
\begin{verbatim}
@@ -74,7 +74,7 @@
[ angle = -90, nup = 1x2, frame, linktodoc, scale = 0.96, delta = 0 .25in ]
{ /Users/xiamyphys/Desktop/LaTeXer/hduthesis/examples/hduthesis-bc.pdf, 1-2 }
-研究生输入样例如下. 硕士学位论文扉页需同时有英文版,因此需要在键 \keys{\cmdmac~title} \keys{\cmdmac~author} \keys{\cmdmac~supervisor} 中分别输入中文和英文信息,使用斜线 (/) 分隔. 如作者中文姓名为 \cmd{申智能},英文姓名为 \cmd{SAN Chi Nan},则键值输入格式为 \cmd{author = 申智能/SAN Chi Nan}.
+研究生输入样例如下. 硕士学位论文扉页需同时有英文版,因此需要在键 \keys{\cmdmac~title} \keys{\cmdmac~author} \keys{\cmdmac~supervisor} 中分别输入中文和英文信息,中英信息使用斜线 (\cmd/) 分隔. 如作者中文姓名为 \cmd{申智能},英文姓名为 \cmd{SAN Chi Nan},则键值输入格式为 \cmd{author = 申智能/SAN Chi Nan}. 指导教师职称和姓名之间用半角冒号 (\cmd:) 分隔.
\begin{framed}
\begin{verbatim}
@@ -84,9 +84,9 @@
title = 杭州电子科技大学学位论文 \hologo{LaTeX} 模板/
\hologo{LaTeX} Template for Thesis at
Hangzhou Dianzi University,
- major = 物理学, stdntid = 216686680,
- author = 申智能/SAN Chi Nan, supervisor = 李智能/LEE Chi Nan,
- bibsource = reference
+ major = 物理学, stdntid = 216686680,
+ author = 申智能/SAN Chi Nan, bibsource = reference
+ supervisor = 教授:葉芷晴/Prof.:YIP Tsz Ching,
}
\begin{document} \maketitle ... \end{document}
\end{verbatim}
@@ -101,7 +101,7 @@
下页包含所生成的硕士学位论文封面、扉页和承诺书缩略图. 此文档样例可在终端执行 \cmd{texdoc hduthesis-pg} 获取.
-文档类同时提供了校徽 (\file{hdulogo.pdf})、校牌 (\file{hdubadge.pd}) 与校训 (\file{hdumotto.pdf}) 的矢量素材,可直接使用. 以上文件均由 \href{https://www.hdu.edu.cn/666/list.htm}{校情纵览/校标规范} 所提供素材裁切制成,均支持在 \hologo{XeLaTeX} 和 \hologo{pdfLaTeX} 编译器下使用 \pkg{tikz} 等方式设置透明度.
+文档类同时提供了校徽 (\file{hdulogo.pdf})、校名 (\file{hdutitle.pdf}) 、校训 (\file{hdumotto.pdf})和校牌 (\file{hdubadge.pdf}) 的矢量素材,可直接使用. 以上文件均由 \href{https://www.hdu.edu.cn/666/list.htm}{校情纵览/校标规范} 所提供素材裁切制成,均支持在 \hologo{XeLaTeX} 和 \hologo{pdfLaTeX} 编译器下使用 \pkg{Ti\textit k\/Z} 等方式设置透明度.
\includepdfmerge
[ nup = 2x2, frame, linktodoc, scale = 0.96, delta = .25in .25in ]
@@ -192,15 +192,15 @@
\begin{center}
\fbox
- { \parbox[c][1.5em]{16em}{\centering\file{hduthesis-bc.layout-module}} }
+ { \parbox[c][1.5em]{16em}{\centering\file{hduthesis-bc.config-module}} }
\quad\fbox
{
- \parbox[c][1.5em]{16em}{\centering\file{hduthesis-pg.layout-module}}
+ \parbox[c][1.5em]{16em}{\centering\file{hduthesis-pg.config-module}}
}\\[2ex]
\quad\fbox
- { \parbox[c][1.5em]{14em}{\centering\file{hduthesis-font-module}} }
+ { \parbox[c][1.5em]{14em}{\centering\file{hduthesis-typeset-module}} }
\qquad\fbox
- { \parbox[c][1.5em]{16em}{\centering\file{hduthesis-unv.layout-module}} }
+ { \parbox[c][1.5em]{16em}{\centering\file{hduthesis-layout-module}} }
\end{center}
\hrule
diff --git a/macros/xetex/latex/hduthesis/examples/cha/cha3.tex b/macros/xetex/latex/hduthesis/examples/cha/cha3.tex
index eda79c66bc..bfa795380f 100644
--- a/macros/xetex/latex/hduthesis/examples/cha/cha3.tex
+++ b/macros/xetex/latex/hduthesis/examples/cha/cha3.tex
@@ -36,7 +36,7 @@
\label{3-1}
\end{figure}
-\section{激光的检测\cite{cn7,cn8}}
+\section[激光的检测]{激光的检测\cite{cn7,cn8}}
每次打靶,激光枪发出一个激光脉冲。如果激光脉冲击中光电靶,利用光生伏特效应,光电
靶上的探测器把光信号转换成电信号,因此激光的检测就是对探测器响应电信号的检测。光
diff --git a/macros/xetex/latex/hduthesis/examples/cha/cha4.tex b/macros/xetex/latex/hduthesis/examples/cha/cha4.tex
index b9fff1e848..697b58bcc9 100644
--- a/macros/xetex/latex/hduthesis/examples/cha/cha4.tex
+++ b/macros/xetex/latex/hduthesis/examples/cha/cha4.tex
@@ -113,7 +113,7 @@ $R_3$和$R_7$为输入匹配电阻。
\clearpage
\vspace*{-1.5em}
-\section{整形电路\cite{cn11}}
+\section[整形电路]{整形电路\cite{cn11}}
光电池的输出脉冲并不是规则的矩形脉冲信号,而是类似升余弦信号。再经放大后也会产生
失真,因此必须对信号进行整形。采用常用的 CD4093 施密特触发器便可实现整形功能,改
@@ -138,7 +138,7 @@ $R_3$和$R_7$为输入匹配电阻。
\label{4-5}
\end{figure}
-\section{编码电路\cite{cn11}}
+\section[编码电路]{编码电路\cite{cn11}}
对于 38 路信号通道,必须对其进行编码以便于信号识别和传输。38 路信号按照设计方案
编码为 1--38 号,脱靶无信号记为 0 号。对多个探测器同时接收到信号的情况,对应于
diff --git a/macros/xetex/latex/hduthesis/examples/hduthesis-bc.pdf b/macros/xetex/latex/hduthesis/examples/hduthesis-bc.pdf
index 743ceca2f4..7a87591efa 100644
--- a/macros/xetex/latex/hduthesis/examples/hduthesis-bc.pdf
+++ b/macros/xetex/latex/hduthesis/examples/hduthesis-bc.pdf
Binary files differ
diff --git a/macros/xetex/latex/hduthesis/examples/hduthesis-bc.tex b/macros/xetex/latex/hduthesis/examples/hduthesis-bc.tex
index 381047a948..1c36b498a4 100644
--- a/macros/xetex/latex/hduthesis/examples/hduthesis-bc.tex
+++ b/macros/xetex/latex/hduthesis/examples/hduthesis-bc.tex
@@ -1,7 +1,7 @@
\documentclass
[
math-font = STIX Two Math, agreed,
- CJKmain-font = { {Songti SC}[AutoFakeSlant] },
+ CJKmain-font = { {Songti SC}[AutoFakeSlant, AutoFakeBold = 2.5] },
CJKsans-font = { {STHeiti}[AutoFakeBold = 2] }
] {hduthesis}
\tikzset{ > = stealth }
@@ -9,13 +9,13 @@
\DocInfo
{
- title = 杭州电子科技大学学位论文 \hologo{LaTeX} 模板/毕业设计,
+ title = 杭州电子科技大学学位论文 \hologo{LaTeX} 模板/本科毕业设计~ (论文),
department = 理学院,
major = 物理学,
class = 英才班,
stdntid = C668668E,
author = 申智能,
- supervisor = 李智能,
+ supervisor = 教授:葉芷晴,
bibsource = reference
}
@@ -25,10 +25,7 @@
\input{cha/abstract.tex}
-\pagestyle{fancy}
-\frontmatter
\tableofcontents
-\mainmatter
\input{cha/cha1.tex}
\input{cha/cha2.tex}
diff --git a/macros/xetex/latex/hduthesis/examples/hduthesis-pg.pdf b/macros/xetex/latex/hduthesis/examples/hduthesis-pg.pdf
index e921508b0c..9b24ba3585 100644
--- a/macros/xetex/latex/hduthesis/examples/hduthesis-pg.pdf
+++ b/macros/xetex/latex/hduthesis/examples/hduthesis-pg.pdf
Binary files differ
diff --git a/macros/xetex/latex/hduthesis/examples/hduthesis-pg.tex b/macros/xetex/latex/hduthesis/examples/hduthesis-pg.tex
index d60d8fc9ae..dcf27d155a 100644
--- a/macros/xetex/latex/hduthesis/examples/hduthesis-pg.tex
+++ b/macros/xetex/latex/hduthesis/examples/hduthesis-pg.tex
@@ -16,7 +16,7 @@
major = 凝聚态物理,
stdntid = C668668E0,
author = 申智能/SAN Chi Nan,
- supervisor = 李智能/LEE Chi Nan,
+ supervisor = 教授:葉芷晴/Prof.:YIP Tsz Ching,
bibsource = reference
}
@@ -37,7 +37,8 @@
\end{abstract}
\begin{abstract}[en]
- \setstretch{1.35}
+
+ \setstretch{1.3}
Design patterns are widely used to address the recurring design problems during the process of software design and development. The information about design patterns used in software source code-design pattern instances reveal much about the high-level abstract design ideas. Accurately identifying and detecting design pattern instances in a software system can help developers and maintainers to understand its original design and implementation, facilitating maintenance, update and re-development.
In recent years, many approaches have been proposed to automatically or semi-automatically detecting design pattern instances from software source code. Among these approaches, some approaches transform software source code and design patterns into certain graphs, and then exploit subgraph isomorphism techniques to detect design pattern instances. However, as mining isomorphic subgraphs is an NP-complete problem, those approaches usually fail to achieve satisfactory efficiency.
@@ -51,7 +52,7 @@
}
\end{abstract}
-\frontmatter \tableofcontents \mainmatter
+\tableofcontents
\chapter{绪论}
diff --git a/macros/xetex/latex/hduthesis/tex/hdubadge.pdf b/macros/xetex/latex/hduthesis/tex/hdubadge.pdf
index ae87ea461e..8a03469684 100644
--- a/macros/xetex/latex/hduthesis/tex/hdubadge.pdf
+++ b/macros/xetex/latex/hduthesis/tex/hdubadge.pdf
Binary files differ
diff --git a/macros/xetex/latex/hduthesis/tex/hduthesis-bc.config-module.code.tex b/macros/xetex/latex/hduthesis/tex/hduthesis-bc.config-module.code.tex
new file mode 100644
index 0000000000..fa36d01ca6
--- /dev/null
+++ b/macros/xetex/latex/hduthesis/tex/hduthesis-bc.config-module.code.tex
@@ -0,0 +1,179 @@
+\ExplSyntaxOn \makeatletter
+\hduthesis_provide_module:n {bc.config}
+
+\geometry { top = 3.25cm, bottom = 2.4cm, left = 4cm, right = 2cm,
+ headheight = 15pt, headsep = .72cm }
+\fancyhead[C]
+ { \raisebox { .12ex } { \small 杭州电子科技大学 \l__docinfo_entitle_tl } }
+\hook_gput_code:nnn {cmd/tableofcontents/before} { . }
+ {
+ \clearpage
+ \pagenumbering{Roman} \cfoot{\small \thepage}
+ }
+\hook_gput_code:nnn { cmd/tableofcontents/after } { . }
+ {
+ \thispagestyle{fancy} \clearpage
+ \pagenumbering{arabic} \cfoot{}
+ }
+
+\RenewDocumentCommand \maketitle {}
+ {
+ \newgeometry{ margin = 3cm }
+ \begin{titlepage}
+ \__hduthesis_cover_bc_aux:
+ \end{titlepage}
+ \titlepage
+ \__hduthesis_promise_bc_aux:
+ \endtitlepage
+ \restoregeometry
+ }
+
+\int_new:N \l__hduthesis_grade_int
+\int_set:Nn \l__hduthesis_grade_int
+ {
+ \int_compare:nNnTF {\c_sys_month_int} < 9
+ {\c_sys_year_int} {\int_eval:n {\c_sys_year_int+1}}
+ }
+\cs_new_protected_nopar:Nn \__hduthesis_cover_bc_aux:
+ {
+ \begin{center}
+ \vspace*{14\p@}
+ \includegraphics[ width = .64\linewidth ]{hdutitle}
+ \par \vspace*{36\p@}
+ \scalebox{2.75}
+ {
+ \textbf
+ {
+ \exp_args:Nne \__hduthesis_cover_spread_box:nn
+ { .205\paperwidth } { \l__docinfo_entitle_tl }
+ }
+ }
+ \par \vspace*{1.5\baselineskip}
+ { \LARGE (\int_use:N \l__hduthesis_grade_int \bfseries 届) }
+ \par \vspace*{3.0\baselineskip}
+ \begin{tabular}
+ {
+ >{\large\bfseries}p{5.5\ccwd}@{}
+ >{\large\centering\arraybackslash\kaishu}p{.65\linewidth}@{}
+ }
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 题目 } &
+ \__hduthesis_cover_center_box:nn { .95\linewidth }
+ { \l__docinfo_cntitle_tl }\\[5.2ex]
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 学院 } &
+ \__hduthesis_cover_center_box:nn { .95\linewidth }
+ { \l__docinfo_department_tl }\\[5.2ex]
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 专业 } &
+ \__hduthesis_cover_center_box:nn { .95\linewidth }
+ { \l__docinfo_major_tl }\\[5.2ex]
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 班级 } &
+ \__hduthesis_cover_center_box:nn { .95\linewidth }
+ { \l__docinfo_class_tl }\\[5.2ex]
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 学号 } &
+ \__hduthesis_cover_center_box:nn { .95\linewidth }
+ { \l__docinfo_stdntid_tl }\\[5.2ex]
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 学生姓名 } &
+ \__hduthesis_cover_center_box:nn { .95\linewidth }
+ { \l__docinfo_cnauthor_tl }\\[5.2ex]
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 指导教师 } &
+ \__hduthesis_cover_center_box:nn { .95\linewidth }
+ { \l__docinfo_cnsupervisor_tl \quad \l__docinfo_cnrole_tl }\\[5.2ex]
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 完成日期 } &
+ \__hduthesis_cover_center_box:nn { .95\linewidth }
+ {
+ \textsf{\int_use:N \c_sys_year_int} 年
+ \textsf{\int_use:N \c_sys_month_int} 月
+ }
+ \end{tabular}
+ \end{center}
+ }
+
+\cs_new_protected_nopar:Nn \__hduthesis_promise_bc_aux:
+ {
+ \vspace*{65\p@}
+ \begin{center}
+ \@beginparpenalty \@lowpenalty
+ \Large \textsf{\bfseries \__hduthesis_cover_spread_box:nn {6\ccwd}{诚信承诺}}
+ \@endparpenalty \@M
+ \end{center}
+ \vspace*{.4\baselineskip} \par
+ \linespread{2.1}
+ {\semilarge
+ 我谨在此承诺:本人所写的毕业论文《\l__docinfo_cntitle_tl》均系本人独立完成,
+ 没有抄袭行为,凡涉及其他作者的观点和材料,均作了注释,若有不实,后果由本人承担。
+ \par\vspace*{\baselineskip} \bfseries\sffamily
+ \hskip.48\linewidth 承诺人(签名):
+ \vspace*{.5\baselineskip}\par
+ \hskip \dim_eval:n{ .48\linewidth + 2em } 年\qquad 月\qquad 日
+ }
+ }
+
+\RenewDocumentEnvironment {abstract} { O{en} }
+ {
+ \str_if_eq:nnT {#1} {en}
+ {
+ \tl_set:Nn \l__keywords_name_tl {Keywords:~}
+ \tl_set:Nn \l__keywords_sep_tl {;~}
+ }
+ \str_if_eq:nnT {#1} {cn}
+ {
+ \tl_set:Nn \l__keywords_name_tl {\textsf{关键词:}}
+ \tl_set:Nn \l__keywords_sep_tl {;}
+ }
+ \@beginparpenalty\@lowpenalty
+ \str_if_eq:nnT {#1} {en} {\chapter*{\normalfont\bfseries ABSTRACT}}
+ \str_if_eq:nnT {#1} {cn} {\chapter*{摘\qquad 要}}
+ }
+ {
+ \tl_clear:N \l__abstract_name_tl
+ \cfoot{} \clearpage
+ }
+\clist_new:N \l__abstract_keywords_clist
+\NewDocumentCommand \keywords { m }
+ {
+ \par \vspace*{\baselineskip}
+ \noindent\textbf{\l__keywords_name_tl}
+ \clist_set:Nn \l__abstract_keywords_clist {#1}
+ \clist_use:Nn \l__abstract_keywords_clist {\l__keywords_sep_tl}
+ }
+
+\RequirePackage{tocloft}
+\renewcommand \contentsname {\hfill 目 \qquad 录 \hfill}
+\renewcommand* \cfttoctitlefont {\sffamily\semiLarge}
+\dim_set:Nn \cftbeforetoctitleskip {3pt}
+\dim_set:Nn \cftaftertoctitleskip {24pt}
+\dim_set:Nn \cftbeforechapskip {1pt}
+\dim_set:Nn \cftbeforesecskip {-.2pt}
+\patchcmd { \@dottedtocline }
+ { \leaders \hbox { $\m@th\mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$ } }
+ { \kern 4pt \leaders \hbox { $\m@th\mkern .4 mu\hbox{-}\mkern .4 mu$ } } {}{}
+\renewcommand* \l@chapter {\@dottedtocline{1}{0em}{1.6em}}
+\renewcommand* \l@section {\@dottedtocline{1}{2.3em}{2.1em}}
+\renewcommand* \@dotsep {1.7}
+\renewcommand* \@pnumwidth {2.5ex}
+\renewcommand* \cftchapfont {\normalfont}
+\setcounter{tocdepth}{1}
+
+\ctexset
+ {
+ chapter =
+ {
+ name = {}, fixskip = true,
+ beforeskip = 21pt, afterskip = 34pt,
+ number = \arabic{chapter},
+ format+ = \sffamily\large,
+ pagestyle = fancy
+ },
+ section =
+ {
+ beforeskip = 1.25ex, afterskip = 1.5ex,
+ fixskip = true, format = \sffamily\semilarge
+ },
+ subsection =
+ {
+ beforeskip = 1.25ex, afterskip = 1.5ex,
+ fixskip = true, format = \sffamily
+ }
+ }
+
+\makeatother \ExplSyntaxOff
+\endinput
diff --git a/macros/xetex/latex/hduthesis/tex/hduthesis-bc.layout-module.code.tex b/macros/xetex/latex/hduthesis/tex/hduthesis-bc.layout-module.code.tex
deleted file mode 100644
index b9e5952086..0000000000
--- a/macros/xetex/latex/hduthesis/tex/hduthesis-bc.layout-module.code.tex
+++ /dev/null
@@ -1,173 +0,0 @@
-\ExplSyntaxOn \makeatletter
-\hduthesis_provide_module:n {bc.layout}
-
-\geometry { top = 3.25cm, bottom = 2.4cm, left = 4cm, right = 2cm,
- headheight = 15pt, headsep = .72cm }
-\chead
- { \raisebox { .12ex } { \small 杭州电子科技大学本科 \l__docinfo_entitle_tl } }
-\lhead{}\rhead{}
-
-\int_new:N \l__hduthesis_grade_int
-\int_set:Nn \l__hduthesis_grade_int
- {
- \int_compare:nNnTF {\c_sys_month_int} < 9
- {\c_sys_year_int} {\int_eval:n {\c_sys_year_int+1}}
- }
-\cs_new_protected_nopar:Nn \__hduthesis_cover_bc_aux:
- {
- \begin{center}
- \vspace*{36\p@}
- \includegraphics{hdubadge}
- \par \vspace*{36\p@}
- \scalebox{3.2}
- {
- \textbf
- {
- \exp_args:Nne \l_spread_box:nn
- { .191\paperwidth } { 本科 \l__docinfo_entitle_tl }
- }
- }
- \par\vspace*{1.3\baselineskip}
- {
- \LARGE(\int_use:N \l__hduthesis_grade_int\bfseries 届)
- }
- \par\vspace*{4\baselineskip}
- \begin{tabular}
- {
- >{\large\bfseries}p{5.5\ccwd}@{}
- >{\large\centering\arraybackslash\kaishu}p{.65\linewidth}
- }
- 题\qquad 目 &
- \l_center_box:nn { .95\linewidth }
- { \l__docinfo_cntitle_tl }\\[5.2ex]
- 学\qquad 院 &
- \l_center_box:nn { .95\linewidth }
- { \l__docinfo_department_tl }\\[5.2ex]
- 专\qquad 业 &
- \l_center_box:nn { .95\linewidth }
- { \l__docinfo_major_tl }\\[5.2ex]
- 班\qquad 级 &
- \l_center_box:nn { .95\linewidth }
- { \l__docinfo_class_tl }\\[5.2ex]
- 学\qquad 号 &
- \l_center_box:nn { .95\linewidth }
- { \l__docinfo_stdntid_tl }\\[5.2ex]
- 学生姓名 &
- \l_center_box:nn { .95\linewidth }
- { \l__docinfo_cnauthor_tl }\\[5.2ex]
- 指导教师 &
- \l_center_box:nn { .95\linewidth }
- { \l__docinfo_cnsupervisor_tl }\\[5.2ex]
- 完成日期 &
- \l_center_box:nn { .95\linewidth }
- {
- \textsf{\int_use:N \c_sys_year_int} 年
- \textsf{\int_use:N \c_sys_month_int} 月
- }
- \end{tabular}
- \end{center}
- }
-
-\cs_new_protected_nopar:Nn \__hduthesis_promise_bc_aux:
- {
- \vspace*{70\p@}
- \begin{center}
- \@beginparpenalty \@lowpenalty
- \Large \textsf{\bfseries \l_spread_box:nn {6\ccwd}{诚信承诺}}
- \@endparpenalty \@M
- \end{center}
- \vspace*{.5\baselineskip} \par
- \linespread{2.1}
- {\semilarge
- 我谨在此承诺:本人所写的毕业论文《\l__docinfo_cntitle_tl》均系本人独立完成,
- 没有抄袭行为,凡涉及其他作者的观点和材料,均作了注释,若有不实,后果由本人承担。
- \par\vspace*{\baselineskip} \bfseries\sffamily
- \hskip.48\linewidth 承诺人(签名):
- \vspace*{.5\baselineskip}\par
- \hskip \dim_eval:n{ .48\linewidth + 2em } 年\qquad 月\qquad 日
- }
- }
-
-\RenewDocumentCommand \maketitle {}
- {
- \newgeometry{ left = 4cm, right = 2cm, top = 3cm, bottom = 1cm }
- \begin{titlepage}
- \__hduthesis_cover_bc_aux:
- \end{titlepage}
- \titlepage
- \__hduthesis_promise_bc_aux:
- \endtitlepage
- \restoregeometry
- }
-
-\RenewDocumentEnvironment {abstract} { O{en} }
- {
- \str_if_eq:nnT {#1} {en}
- {
- \tl_set:Nn \l__keywords_name_tl {Keywords:~}
- \tl_set:Nn \l__keywords_sep_tl {;~}
- }
- \str_if_eq:nnT {#1} {cn}
- {
- \tl_set:Nn \l__keywords_name_tl {\textsf{关键词:}}
- \tl_set:Nn \l__keywords_sep_tl {;}
- }
- \@beginparpenalty\@lowpenalty
- \str_if_eq:nnT {#1} {en} {\chapter*{\normalfont\bfseries ABSTRACT}}
- \str_if_eq:nnT {#1} {cn} {\chapter*{摘\qquad 要}}
- }
- {
- \par\null
- \tl_clear:N \l__abstract_name_tl
- \cfoot{}
- \clearpage
- }
-\clist_new:N \l__abstract_keywords_clist
-\NewDocumentCommand \keywords { m }
- {
- \par \vspace*{\baselineskip}
- \noindent\textbf{\l__keywords_name_tl}
- \clist_set:Nn \l__abstract_keywords_clist {#1}
- \clist_use:Nn \l__abstract_keywords_clist {\l__keywords_sep_tl}
- }
-
-\hook_gput_code:nnn { cmd/tableofcontents/after } { . }
- { \thispagestyle{fancy} }
-\RequirePackage{tocloft}
-\renewcommand \contentsname {\hfill 目 \qquad 录 \hfill}
-\renewcommand \cfttoctitlefont {\sffamily\semiLarge}
-\dim_set:Nn \cftbeforetoctitleskip {3pt}
-\dim_set:Nn \cftaftertoctitleskip {24pt}
-\dim_set:Nn \cftbeforechapskip {1pt}
-\dim_set:Nn \cftbeforesecskip {-.2pt}
-\renewcommand*\l@chapter {\@dottedtocline{1}{0em}{1.6em}}
-\renewcommand*\l@section {\@dottedtocline{1}{2.3em}{2.1em}}
-\renewcommand \@dotsep{1.7}
-\renewcommand \@pnumwidth{2.5ex}
-\renewcommand \cftchapfont{\normalfont}
-\setcounter{tocdepth}{1}
-
-\ctexset
- {
- chapter =
- {
- name = {}, fixskip = true,
- beforeskip = 21pt, afterskip = 34pt,
- number = \arabic{chapter},
- format = \sffamily\centering\large,
- pagestyle = fancy
- },
- section =
- {
- beforeskip = 1.25ex, afterskip = 1.5ex,
- fixskip = true, format = \sffamily\semilarge
- },
- subsection =
- {
- beforeskip = 1.25ex, afterskip = 1.5ex,
- fixskip = true, format = \sffamily
- }
- }
-
-\makeatother \ExplSyntaxOff
-\endinput
diff --git a/macros/xetex/latex/hduthesis/tex/hduthesis-unv.layout-module.code.tex b/macros/xetex/latex/hduthesis/tex/hduthesis-layout-module.code.tex
index a2b9e21102..8ff3467350 100644
--- a/macros/xetex/latex/hduthesis/tex/hduthesis-unv.layout-module.code.tex
+++ b/macros/xetex/latex/hduthesis/tex/hduthesis-layout-module.code.tex
@@ -1,28 +1,32 @@
-\hduthesis_provide_module:n {unv.layout}
+\hduthesis_provide_module:n {layout}
-\RequirePackage{geometry, array, setspace}
-
-\newcommand\frontmatter
- {
- \clearpage
- \pagenumbering{Roman}
- \cfoot{}
- }
-\newcommand\mainmatter
+\RequirePackage{geometry, array, setspace, fancyhdr, enumitem, cleveref}
+\RequirePackage[skip = 1.75ex, labelsep = quad, font = small]{caption}
+\fancyhf{}
+\pagestyle{fancy}
+\renewcommand*\headrulewidth {.8pt}
+\renewcommand*\thefigure {\arabic{chapter}-\arabic{figure}}
+\renewcommand*\thetable {\arabic{chapter}-\arabic{table}}
+\renewcommand*\theequation {\arabic{chapter}-\arabic{equation}}
+\AddToHook{env/figure/after}{\vspace*{-2.3ex}}
+\AddToHook{env/table/after}{\vskip-1.9ex}
+\setlist[enumerate,1]
{
- \clearpage
- \pagenumbering{arabic}
- \cfoot \thepage
+ label = (\,\arabic*\,), itemindent = 4em, leftmargin = 0em,
+ labelsep = 1ex, topsep = 0pt, itemsep = 0pt, partopsep = 0pt,
+ parsep = 0em, listparindent = 2\ccwd
}
+\crefformat{figure}{图#2#1#3}
+\crefformat{table}{表#2#1#3}
-\cs_new_protected:Npn \l_spread_box:nn #1#2
+\cs_new_protected:Npn \__hduthesis_cover_spread_box:nn #1#2
{
\mode_leave_vertical:
\hbox_to_wd:nn {#1}
- { \tl_map_inline:Nn {#2} { ##1 \hfil } \unskip }
+ { \exp_args:Nee \tl_map_inline:Nn {#2} { ##1 \hfil } \unskip }
}
-\cs_new_protected:Npn \l_center_box:nn #1#2
- {
+\cs_new_protected:Npn \__hduthesis_cover_center_box:nn #1#2
+ { % by @egreg on tex.stackexchange.com
\mode_leave_vertical:
\dim_set:Nn \l_tmpa_dim {#1}
\global\setbox1 = \box\voidb@x
@@ -40,7 +44,7 @@
\unless\ifvoid2
\global\setbox1 = \vtop
{ \hbox to\hsize{\strut\unhbox2}
- \vskip-3.8pt \hrule height .8pt
+ \vskip-4pt \hrule height .5pt
\vskip9.6pt \unvbox1
}
\unskip\unpenalty
@@ -50,28 +54,23 @@
\box1
}
-\RequirePackage[skip = 1.75ex, labelsep = quad, font = small]{caption}
-\renewcommand*\thefigure {\arabic{chapter}-\arabic{figure}}
-\renewcommand*\thetable {\arabic{chapter}-\arabic{table}}
-\renewcommand*\theequation {\arabic{chapter}-\arabic{equation}}
-\AddToHook{env/figure/after}{\vspace*{-2.3ex}}
-\AddToHook{env/table/after}{\vskip-1.9ex}
-
-\RequirePackage{enumitem, cleveref}
-\setlist[enumerate,1]
+\cs_new_protected_nopar:Npn \__hduthesis_process_array:NnnN #1#2#3#4
{
- label = (\,\arabic*\,), itemindent = 4em, leftmargin = 0em,
- labelsep = 1ex, topsep = 0pt, itemsep = 0pt, partopsep = 0pt,
- parsep = 0em, listparindent = 2\ccwd
- }
-\crefformat{figure}{图#2#1#3}
-\crefformat{table}{表#2#1#3}
-\graphicspath
- {
- {./figure/}{./figures/}{./image/}{./images/}
- {./graphics/}{./graphic/}{./pictures/}{./picture/}
+ \seq_set_split:Nee \l__hduthesis_process_array_seq { / } {#1}
+ \seq_set_split:Nee \l__hduthesis_process_array_row_seq { \c_colon_str }
+ { \seq_item:Nn \l__hduthesis_process_array_seq {#2} }
+ \tl_if_eq:nnTF {#3} {~}
+ {
+ \tl_set:Ne #4
+ { \seq_use:Nn \l__hduthesis_process_array_row_seq {} }
+ }
+ {
+ \tl_set:Ne #4
+ { \seq_item:Nn \l__hduthesis_process_array_row_seq {#3} }
+ }
+ \seq_clear:N \l__hduthesis_process_array_seq
+ \seq_clear:N \l__hduthesis_process_array_row_seq
}
-
\clist_set:Nn \g_system_month_clist
{
January, February, March, April, May, June, July,
@@ -79,43 +78,39 @@
}
\keys_define:nn { hduthesis / docinfo }
{
- title .clist_set:N = \l__docinfo_title_clist,
- department .tl_set:N = \l__docinfo_department_tl,
- major .tl_set:N = \l__docinfo_major_tl,
- class .tl_set:N = \l__docinfo_class_tl,
- stdntid .tl_set:N = \l__docinfo_stdntid_tl,
- author .clist_set:N = \l__docinfo_author_clist,
- supervisor .clist_set:N = \l__docinfo_supervisor_clist,
- bibsource .tl_set:N = \l__docinfo_bibsource_tl,
+ title .clist_set:N = \l__docinfo_title_clist,
+ department .tl_set:N = \l__docinfo_department_tl,
+ major .tl_set:N = \l__docinfo_major_tl,
+ class .tl_set:N = \l__docinfo_class_tl,
+ stdntid .tl_set:N = \l__docinfo_stdntid_tl,
+ author .clist_set:N = \l__docinfo_author_clist,
+ supervisor .tl_set:N = \l__docinfo_supervisor_tl,
+ bibsource .tl_set:N = \l__docinfo_bibsource_tl,
}
-
\NewDocumentCommand \DocInfo { m }
{
\keys_set:nn { hduthesis / docinfo } {#1}
\__hduthesis_docinfo_process_aux:
\__hduthesis_docinfo_degree_if_aux:
}
-
\cs_set_protected_nopar:Nn \__hduthesis_docinfo_process_aux:
{
- \exp_args:NNne \seq_set_split:Nnn
- \l__title_tmp_seq {/} {\l__docinfo_title_clist}
- \exp_args:NNe \tl_set:Nn
- \l__docinfo_cntitle_tl { \seq_item:Nn \l__title_tmp_seq {1} }
- \exp_args:NNe \tl_set:Nn
- \l__docinfo_entitle_tl { \seq_item:Nn \l__title_tmp_seq {2} }
- \exp_args:NNne \seq_set_split:Nnn
- \l__author_tmp_seq {/} {\l__docinfo_author_clist}
- \exp_args:NNe \tl_set:Nn
- \l__docinfo_cnauthor_tl { \seq_item:Nn \l__author_tmp_seq {1} }
- \exp_args:NNe \tl_set:Nn
- \l__docinfo_enauthor_tl { \seq_item:Nn \l__author_tmp_seq {2} }
- \exp_args:NNne \seq_set_split:Nnn
- \l__supervisor_tmp_seq {/} {\l__docinfo_supervisor_clist}
- \exp_args:NNe \tl_set:Nn
- \l__docinfo_cnsupervisor_tl { \seq_item:Nn \l__supervisor_tmp_seq {1} }
- \exp_args:NNe \tl_set:Nn
- \l__docinfo_ensupervisor_tl { \seq_item:Nn \l__supervisor_tmp_seq {2} }
+ \__hduthesis_process_array:NnnN \l__docinfo_title_clist {1} {~}
+ \l__docinfo_cntitle_tl
+ \__hduthesis_process_array:NnnN \l__docinfo_title_clist {2} {~}
+ \l__docinfo_entitle_tl
+ \__hduthesis_process_array:NnnN \l__docinfo_author_clist {1} {~}
+ \l__docinfo_cnauthor_tl
+ \__hduthesis_process_array:NnnN \l__docinfo_author_clist {2} {~}
+ \l__docinfo_enauthor_tl
+ \__hduthesis_process_array:NnnN \l__docinfo_supervisor_tl {1} {1}
+ \l__docinfo_cnrole_tl
+ \__hduthesis_process_array:NnnN \l__docinfo_supervisor_tl {1} {2}
+ \l__docinfo_cnsupervisor_tl
+ \__hduthesis_process_array:NnnN \l__docinfo_supervisor_tl {2} {1}
+ \l__docinfo_enrole_tl
+ \__hduthesis_process_array:NnnN \l__docinfo_supervisor_tl {2} {2}
+ \l__docinfo_ensupervisor_tl
\bool_if:NF \g__hduthesis_agreement_bool
{ \tl_clear:N \l__docinfo_bibsource_tl }
\tl_if_empty:NTF \l__docinfo_bibsource_tl
diff --git a/macros/xetex/latex/hduthesis/tex/hduthesis-pg.layout-module.code.tex b/macros/xetex/latex/hduthesis/tex/hduthesis-pg.config-module.code.tex
index 321822a42e..291f6a8b99 100644
--- a/macros/xetex/latex/hduthesis/tex/hduthesis-pg.layout-module.code.tex
+++ b/macros/xetex/latex/hduthesis/tex/hduthesis-pg.config-module.code.tex
@@ -1,38 +1,68 @@
\ExplSyntaxOn \makeatletter
-\hduthesis_provide_module:n {pg.layout}
+\hduthesis_provide_module:n {pg.config}
-\geometry { top = 2.75cm, bottom = 2cm, left = 3.2cm, right = 3.2cm,
- headheight = 15pt, headsep = .72cm }
-\chead{\raisebox{.12ex}{\small 杭州电子科技大学硕士学位论文}}\lhead{}\rhead{}
+\geometry { top = 2.8cm, bottom = 3.2cm, left = 3.2cm, right = 3.2cm,
+ headheight = 15pt, headsep = .72cm, footskip = 1.5cm }
+\fancyhead[C]
+ { \raisebox { .12ex } { \small 杭州电子科技大学硕士学位论文 } }
+\hook_gput_code:nnn { cmd/tableofcontents/after } { . }
+ {
+ \clearpage
+ \pagenumbering{arabic}
+ \cfoot{\small \thepage}
+ }
+\RenewDocumentCommand \maketitle {}
+ {
+ \newgeometry{margin = 2.75cm}
+ \begin{titlepage}
+ \__hduthesis_cover_pg_aux:
+ \end{titlepage}
+ \titlepage
+ \__hduthesis_cnoverleaf_pg_aux:
+ \endtitlepage
+ \titlepage
+ \__hduthesis_enoverleaf_pg_aux:
+ \endtitlepage
+ \titlepage
+ \__hduthesis_promise_pg_aux:
+ \endtitlepage
+ \restoregeometry
+ \pagenumbering{Roman}
+ \cfoot {\small \thepage}
+ }
\cs_new_protected_nopar:Nn \__hduthesis_cover_pg_aux:
{
\begin{center}
\null
- \includegraphics[scale = 1.6]{hdubadge}
- \par \vspace*{42\p@}
- { \LARGE\l_spread_box:nn {.575\linewidth} {硕士学位论文} }
- \par\vspace*{98\p@}
+ \includegraphics[height = 2.35cm]{hdutitle}
+ \par \vspace*{40\p@}
+ { \LARGE\__hduthesis_cover_spread_box:nn {.575\linewidth} {硕士学位论文} }
+ \par\vspace*{100\p@}
\semiLarge 题 \qquad 目:
- \l_center_box:nn { .75\linewidth } { \kaishu \l__docinfo_cntitle_tl }
- \vspace*{21\p@}\par
+ \__hduthesis_cover_center_box:nn { .75\linewidth }
+ { \kaishu \l__docinfo_cntitle_tl }
+ \vspace*{24\p@}\par
\begin{tabular}
{ >{\semiLarge\centering\arraybackslash}p{4\ccwd}@{}
- >{\semiLarge\centering\arraybackslash\kaishu}p{.65\linewidth} }
- \l_spread_box:nn { 4\ccwd } { 研究生 } &
- \l_center_box:nn { .96\linewidth }
- { \seq_item:Nn \l__author_tmp_seq {1} }\\[.8ex]
- \l_spread_box:nn { 4\ccwd } { 专业 } &
- \l_center_box:nn { .96\linewidth } { \l__docinfo_major_tl }\\[.8ex]
- \l_spread_box:nn { 4\ccwd } { 指导教师 } &
- \l_center_box:nn { .96\linewidth }
- { \l__docinfo_cnsupervisor_tl\qquad 教授 }\\[13.5ex]
+ >{\semiLarge\centering\arraybackslash\kaishu}p{.65\linewidth}@{} }
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 研究生 } &
+ \__hduthesis_cover_center_box:nn { .96\linewidth }
+ { \l__docinfo_cnauthor_tl }\\
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 专业 } &
+ \__hduthesis_cover_center_box:nn { .96\linewidth }
+ { \l__docinfo_major_tl }\\
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } { 指导教师 } &
+ \__hduthesis_cover_center_box:nn { .96\linewidth }
+ {
+ \l__docinfo_cnsupervisor_tl \qquad \l__docinfo_cnrole_tl
+ }\\[13.5ex]
\semilarge 完成日期 &
- \l_center_box:nn { .96\linewidth }
- { \semilarge
- \textsf{\int_use:N \c_sys_year_int} 年
- \textsf{\int_use:N \c_sys_month_int} 月
- }
+ \__hduthesis_cover_center_box:nn { .96\linewidth }
+ { \semilarge
+ \textsf{\int_use:N \c_sys_year_int} 年
+ \textsf{\int_use:N \c_sys_month_int} 月
+ }
\end{tabular}
\end{center}
}
@@ -40,48 +70,54 @@
\cs_new_protected_nopar:Nn \__hduthesis_cnoverleaf_pg_aux:
{
\begin{center}
- \vspace*{25\p@}{
- \LARGE 杭州电子科技大学硕士学位论文}
- \vspace*{142\p@} \par
+ \vspace*{25\p@}
+ { \LARGE 杭州电子科技大学硕士学位论文 }
+ \vspace*{140\p@} \par
\begin{spacing}{1.15}
\huge\textsf{\l__docinfo_cntitle_tl}
\end{spacing}
- \vspace*{125\p@} \par
- \begin{tabular}{>{\large}p{7\ccwd}@{}>{\large\kaishu}p{.43\linewidth}}
- \l_spread_box:nn { 4em } {研究生}:&
- \l_spread_box:nn { 5\ccwd } { \l__docinfo_cnauthor_tl }\\[2ex]
- \l_spread_box:nn { 4em } {指导教师}:&
- \l_spread_box:nn { 5\ccwd }
- { \l__docinfo_cnsupervisor_tl } \qquad 教授\\[11ex] &
- \quad \textsf{\int_use:N \c_sys_year_int} 年
- \textsf{\int_use:N \c_sys_month_int} 月
+ \vspace*{128\p@} \par
+ \begin{tabular}{>{\semiLarge}p{6.25\ccwd}>{\semiLarge\kaishu}l}
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } {研究生}:&
+ \__hduthesis_cover_spread_box:nn { 4\ccwd }
+ { \l__docinfo_cnauthor_tl }\\[2ex]
+ \__hduthesis_cover_spread_box:nn { 4\ccwd } {指导教师}:&
+ % \exp_args:Nne
+ \__hduthesis_cover_spread_box:nn { 4\ccwd }
+ { \l__docinfo_cnsupervisor_tl } \hskip1.5em
+ \l__docinfo_cnrole_tl
\end{tabular}
+ \par \vspace{60\p@} \semilarge
+ \textsf{\int_use:N \c_sys_year_int} \kaishu 年
+ \textsf{\int_use:N \c_sys_month_int} \kaishu 月
\end{center}
}
\cs_new_protected_nopar:Nn \__hduthesis_enoverleaf_pg_aux:
{
\begin{center}
- \vspace*{25\p@}{\bfseries
+ \vspace*{16\p@}{\bfseries \semilarge
Dissertation~Submitted~to~Hangzhou~Dianzi~University\\[.8ex]
for~the~Degree~of~Master}
- \vspace*{124\p@} \par
- \begin{spacing}{1.09}
+ \vspace*{120\p@} \par
+ \begin{spacing}{1.12}
\huge\bfseries\l__docinfo_entitle_tl
\end{spacing}
- \vspace*{114\p@} \par
+ \vspace*{112\p@} \par
\begin{tabular}
- { >{\bfseries\large}p{7.5\ccwd}@{}
- >{\bfseries\large}p{.32\linewidth}
+ { >{\bfseries\large}l
+ >{\bfseries\large}l
}
- \l_spread_box:nn { 4.65em } {Candidate}: &
- \l__docinfo_enauthor_tl\\[3.5ex]
- \l_spread_box:nn { 4.65em } {Supervisor}: &
- Prof.~\l__docinfo_ensupervisor_tl\\[11ex]
+ \__hduthesis_cover_spread_box:nn { 5em } {Candidate:~} &
+ \l__docinfo_enauthor_tl\\[3ex]
+ \__hduthesis_cover_spread_box:nn { 5em } {Supervisor:~} &
+ \l__docinfo_enrole_tl{}~ \l__docinfo_ensupervisor_tl
+ \\[11ex]
\end{tabular}
- \vspace*{5\p@}\par
- \bfseries\clist_item:Nn
- \g_system_month_clist {\int_use:N \c_sys_month_int},~
+ \vspace*{8\p@}\par
+ \bfseries \large
+ \clist_item:Nn
+ \g_system_month_clist { \int_use:N \c_sys_month_int },~
\int_use:N \c_sys_year_int
\end{center}
}
@@ -93,31 +129,31 @@
\large
杭州电子科技大学\\[1ex] 学位论文原创性声明和使用授权说明
\end{center}
- \vspace*{15\p@}
+ \vspace*{20\p@}
\begin{center}
\semilarge 原创性声明
\end{center}
- \par \vspace*{.5\baselineskip}
+ \par \vspace*{.4\baselineskip}
\begin{spacing}{1.65}
本人郑重声明:所呈交的学位论文,是本人在导师的指导下,独立进行研究工作所取得的成果。
除文中已经注明引用的内容外,本论文不含任何其他个人或集体已经发表或撰写过的作品或成果。
对本文的研究做出重要贡献的个人和集体,均已在文中以明确方式标明。\par
\noindent 申请学位论文与资料若有不实之处,本人承担一切相关责任。
- \par \vspace*{\baselineskip}
+ \par \vspace*{1.25\baselineskip}
\noindent \makebox[.45\linewidth][l]{论文作者签名:}
日期:\qquad 年\qquad 月\qquad 日
- \par\vspace*{35\p@}
+ \par\vspace*{20\p@}
\begin{center}
\semilarge 学位论文使用授权说明
\end{center}
- \par \vspace*{.5\baselineskip}
+ \par \vspace*{.4\baselineskip}
\begin{spacing}{1.65}
本人完全了解杭州电子科技大学关于保留和使用学位论文的规定,
即:研究生在校攻读学位期间论文工作的知识产权单位属杭州电子科技大学。
本人保证毕业离校后,发表论文或使用论文工作成果时署名单位仍然为杭州电子科技大学。
学校有权保留送交论文的复印件,允许查阅和借阅论文;学校可以公布论文的全部或部分内容,
可以允许采用影印、缩印或其它复制手段保存论文。(保密论文在解密后遵守此规定)
- \par \vspace*{\baselineskip}
+ \par \vspace*{1.25\baselineskip}
\noindent \makebox[.45\linewidth][l]{论文作者签名:}
日期:\qquad 年\qquad 月\qquad 日
\par \vspace*{\baselineskip}
@@ -127,36 +163,18 @@
\end{spacing}
}
-\RenewDocumentCommand \maketitle {}
- {
- \newgeometry{margin = 2.75cm}
- \begin{titlepage}
- \__hduthesis_cover_pg_aux:
- \end{titlepage}
- \titlepage
- \__hduthesis_cnoverleaf_pg_aux:
- \endtitlepage
- \titlepage
- \__hduthesis_enoverleaf_pg_aux:
- \endtitlepage
- \titlepage
- \__hduthesis_promise_pg_aux:
- \endtitlepage
- \restoregeometry
- }
-
\RenewDocumentEnvironment {abstract} { O{en} }
{
\str_if_eq:nnT {#1} {en}
- {
- \tl_set:Nn \l__keywords_name_tl {Keywords:~}
- \tl_set:Nn \l__keywords_sep_tl {,~}
- }
+ {
+ \tl_set:Nn \l__keywords_name_tl {Keywords:~}
+ \tl_set:Nn \l__keywords_sep_tl {,~}
+ }
\str_if_eq:nnT {#1} {cn}
- {
- \tl_set:Nn \l__keywords_name_tl {\textsf{关键词:}}
- \tl_set:Nn \l__keywords_sep_tl {,}
- }
+ {
+ \tl_set:Nn \l__keywords_name_tl {\textsf{关键词:}}
+ \tl_set:Nn \l__keywords_sep_tl {,}
+ }
\@beginparpenalty\@lowpenalty
\str_if_eq:nnT {#1} {cn}
{
@@ -170,9 +188,7 @@
}
}
{
- \par\null
\tl_clear:N \l__abstract_name_tl
- \cfoot{}
\clearpage
}
@@ -185,20 +201,21 @@
\clist_use:Nn \l__abstract_keywords_clist {\l__keywords_sep_tl}
}
-\hook_gput_code:nnn { cmd/tableofcontents/after } { . }
- { \thispagestyle{fancy} }
\RequirePackage{tocloft}
-\renewcommand{\contentsname}{\hfill 目录 \hfill}
-\renewcommand \cfttoctitlefont{\sffamily\semiLarge}
+\renewcommand \contentsname {\hfill 目录 \hfill}
+\renewcommand* \cfttoctitlefont{\sffamily\semiLarge}
\dim_set:Nn \cftbeforetoctitleskip {12pt}
\dim_set:Nn \cftaftertoctitleskip {24pt}
\dim_set:Nn \cftbeforechapskip {1pt}
\dim_set:Nn \cftbeforesecskip {-.2pt}
-\renewcommand*\l@chapter{\@dottedtocline{1}{0em}{1.6em}}
-\renewcommand*\l@section{\@dottedtocline{1}{2.3em}{2.1em}}
-\renewcommand*{\@dotsep}{1.7}
-\renewcommand*{\@pnumwidth}{2.5ex}
-\renewcommand{\cftchapfont}{\normalfont}
+\patchcmd { \@dottedtocline }
+ { \leaders \hbox { $\m@th\mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$ } }
+ { \kern 4pt \leaders \hbox { $\m@th\mkern .4 mu\hbox{.}\mkern .4 mu$ } } {}{}
+\renewcommand* \l@chapter {\@dottedtocline{1}{0em}{1.6em}}
+\renewcommand* \l@section {\@dottedtocline{1}{2.3em}{2.1em}}
+\renewcommand* \@dotsep {1.7}
+\renewcommand* \@pnumwidth {2.5ex}
+\renewcommand* \cftchapfont {\normalfont}
\setcounter{tocdepth}{1}
\ctexset
@@ -206,21 +223,20 @@
chapter =
{
aftername = \hspace{.5\ccwd}, fixskip = true,
- beforeskip = 35pt, afterskip = 30pt,
- format = \sffamily\centering\semiLarge,
+ beforeskip = 32pt, afterskip = 32pt,
+ format+ = \sffamily\semiLarge,
pagestyle = fancy
},
section =
{
aftername = \hspace{.5\ccwd}, fixskip = true,
- beforeskip = 2ex, afterskip = 2.5ex,
- format = \sffamily\large
- ,
+ beforeskip = 2ex, afterskip = 2.75ex,
+ format = \sffamily\large
},
subsection =
{
aftername = \hspace{.5\ccwd}, fixskip = true,
- beforeskip = 2ex, afterskip = 3ex,
+ beforeskip = 2ex, afterskip = 2.75ex,
format = \sffamily\semilarge
}
}
diff --git a/macros/xetex/latex/hduthesis/tex/hduthesis-font-module.code.tex b/macros/xetex/latex/hduthesis/tex/hduthesis-typeset-module.code.tex
index 5e659bd7c6..24b069a646 100644
--- a/macros/xetex/latex/hduthesis/tex/hduthesis-font-module.code.tex
+++ b/macros/xetex/latex/hduthesis/tex/hduthesis-typeset-module.code.tex
@@ -1,13 +1,13 @@
-\hduthesis_provide_module:n {font}
+\hduthesis_provide_module:n {typeset}
\linespread{1.39}
\dim_set:Nn \parindent { 2\ccwd }
\newcommand \semilarge { \@setfontsize \semilarge{14}{16.5} }
-\newcommand \semiLarge { \@setfontsize \semiLarge{16.5}{18} }
+\newcommand \semiLarge { \@setfontsize \semiLarge{16.5}{17.5} }
\setmainfont{texgyretermes}
[
- Extension = .otf, UprightFont = *-regular, BoldFont = *-bold, ItalicFont = *-italic, BoldItalicFont = *-bolditalic
+ Extension = .otf, UprightFont = *-regular, BoldFont = *-bold, ItalicFont = *-italic, BoldItalicFont = *-bolditalic
]
\setsansfont{texgyreheros}
[
@@ -16,16 +16,16 @@
ItalicFont = *-italic, scale = .9,
]
-\RequirePackage { amsmath, amssymb, mathtools, extarrows,
- bm, cancel, physics2, fixdif, derivative }
-\usephysicsmodule{ab, braket, ab.legacy, op.legacy}
+\RequirePackage { amssymb, extarrows, mathtools,
+ cancel, physics2, fixdif, derivative }
\RequirePackage
- [ warnings-off = { mathtools-colon, mathtools-overbracket } ]
- {unicode-math}
-\AtBeginDocument{
- \dim_set:Nn \abovedisplayskip {3pt}
- \dim_set:Nn \belowdisplayskip {3pt}
-}
+ [ warnings-off = { mathtools-colon, mathtools-overbracket } ] {unicode-math}
+\usephysicsmodule{ ab, braket, ab.legacy, op.legacy, bm-um.legacy }
+\AtBeginDocument
+ {
+ \dim_set:Nn \abovedisplayskip {3pt}
+ \dim_set:Nn \belowdisplayskip {3pt}
+ }
\tl_if_empty:NF \g__hduthesis_math_font
{ \setmathfont { \g__hduthesis_math_font } }
diff --git a/macros/xetex/latex/hduthesis/tex/hduthesis.cls b/macros/xetex/latex/hduthesis/tex/hduthesis.cls
index e73ead6ce2..7979b35d01 100644
--- a/macros/xetex/latex/hduthesis/tex/hduthesis.cls
+++ b/macros/xetex/latex/hduthesis/tex/hduthesis.cls
@@ -13,16 +13,16 @@
%% The Current Maintainers of this work is M.Y. XIA *
%% *
%% This work consists of the files hduthesis.cls, *
-%% hduthesis-font-module.code, *
-%% hduthesis-unv.layout-module.code, *
-%% hduthesis-bc.layout-module.code, *
-%% hduthesis-pg.layout-module.code, *
+%% hduthesis-typeset-module.code, *
+%% hduthesis-layout-module.code, *
+%% hduthesis-bc.config-module.code, *
+%% hduthesis-pg.config-module.code, *
%% hduthesis-hdu.l3doc-module.code, *
%% and README.md. *
%% available at https://github.com/xiamyphys/hduthesis *
%% ***********************************************************************
-\def\hduthesis@date{2024/11/21}
-\def\hduthesis@version{0.3.3}
+\def\hduthesis@date{2024/11/23}
+\def\hduthesis@version{0.3.4}
\RequirePackage{etoolbox}
\ProvidesExplClass{hduthesis} {\hduthesis@date} {\hduthesis@version}
@@ -115,22 +115,24 @@
{ \hypersetup { hidelinks, pdfproducer = hduThesiS~by~Mingyu~Xia } }
} { \hduthesis_msg_error:nn { 用户协议 } { 未确认 } }
-\RequirePackage { siunitx, circuitikz, pgfplots, listings, hologo,
- lipsum, zhlipsum, booktabs, multicol }
+\RequirePackage { siunitx, circuitikz, pgfplots, listings,
+ hologo, lipsum, zhlipsum, booktabs, multicol }
\pgfplotsset { compat = newest }
-\hduthesis_load_module:n { font }
-\hduthesis_load_module:n { unv.layout }
-\cs_new_protected_nopar:Nn \__hduthesis_docinfo_degree_if_aux:
+\hologoFontSetup{general = \sffamily}
+\graphicspath
+ {
+ {./figure/}{./figures/}{./image/}{./images/}
+ {./graphics/}{./graphic/}{./pictures/}{./picture/}
+ }
+\hduthesis_load_module:n { typeset }
+\hduthesis_load_module:n { layout }
+\cs_new_protected:Nn \__hduthesis_docinfo_degree_if_aux:
{
\int_compare:nNnTF { \tl_count:N \l__docinfo_stdntid_tl } = { 8 }
- { \hduthesis_load_module:n { bc.layout } }
- { \hduthesis_load_module:n { pg.layout } }
+ { \hduthesis_load_module:n { bc.config } }
+ { \hduthesis_load_module:n { pg.config } }
}
-\RequirePackage{fancyhdr}
-\pagestyle{fancy}
-\renewcommand*\headrulewidth {.6pt}
-
\endinput
% End of file hduthesis.cls
diff --git a/macros/xetex/latex/hduthesis/tex/hdutitle.pdf b/macros/xetex/latex/hduthesis/tex/hdutitle.pdf
new file mode 100644
index 0000000000..ae87ea461e
--- /dev/null
+++ b/macros/xetex/latex/hduthesis/tex/hdutitle.pdf
Binary files differ