texlive[74775] Master/texmf-dist: thuthesis (28mar25)
commits+karl at tug.org
commits+karl at tug.org
Fri Mar 28 22:32:32 CET 2025
Revision: 74775
https://tug.org/svn/texlive?view=revision&revision=74775
Author: karl
Date: 2025-03-28 22:32:32 +0100 (Fri, 28 Mar 2025)
Log Message:
-----------
thuthesis (28mar25)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst
trunk/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/thuthesis/README.md
trunk/Master/texmf-dist/doc/latex/thuthesis/data/chap02.tex
trunk/Master/texmf-dist/doc/latex/thuthesis/data/resume.tex
trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf
trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex
trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
trunk/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
trunk/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/thuthesis/thu-fig-logo.pdf
trunk/Master/texmf-dist/tex/latex/thuthesis/thu-text-logo.pdf
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/thuthesis/spine.pdf
trunk/Master/texmf-dist/tex/latex/thuthesis/tsinghua-name-bachelor.pdf
Modified: trunk/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst 2025-03-28 21:32:32 UTC (rev 74775)
@@ -163,7 +163,7 @@
FUNCTION {bbl.space}
{ entry.lang lang.zh =
- { "\ " }
+ { "" }
{ " " }
if$
}
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/doc/latex/thuthesis/CHANGELOG.md 2025-03-28 21:32:32 UTC (rev 74775)
@@ -6,6 +6,39 @@
## [Unreleased]
+## [v7.6.0] - 2025-03-28
+
+### Added
+
+- 同步研究生论文《写作指南》对 2025 年 3 月版本的修改:
+ - 非涉密论文的声明页中增加“不包含涉及国家秘密的内容”字样([#1000](https://github.com/tuna/thuthesis/issues/1000))
+ - 授权页的“《中华人民共和国学位条例暂行实施办法》”更新为“《中华人民共和国学位法》”([#1003](https://github.com/tuna/thuthesis/issues/1003))。
+- 根据 2025 年 1 月教务处发布的《清华大学综合论文训练写作规范(试行)》更新本科生格式。
+ - 本次格式修改幅度较大,不再一一列出。具体请参见 [#987](https://github.com/tuna/thuthesis/issues/987)、[#1002](https://github.com/tuna/thuthesis/issues/1002)。尤其感谢 @lrf21 的整理!
+
+### Changed
+
+- 研究生的声明页改为编译时默认不含页眉页脚、插入扫描页时加上页眉页脚([#999](https://github.com/tuna/thuthesis/issues/999))。
+
+### Deprecated
+
+- 带星号版本的 `\listoffigures*` 等命令已过时。
+- 公式索引 `\listofequations` 和相关的 `\equcaption` 命令已过时。
+- `toc-chapter-style` 选项已过时。
+
+### Removed
+
+- 移除 `statement-page-numer` 选项,请使用 `\statement` 命令的 `page-style` 参数控制行为(可参见样例文档)。
+- 移除 `degree-name` 选项,请改为 `degree-category`(包括带星号的版本)。
+
+### Fixed
+
+- 修正目录中顶格标题的断行问题([#963](https://github.com/tuna/thuthesis/issues/963))。
+- 统一选题报告与学位论文的封面格式,修复信息偏移问题([#977](https://github.com/tuna/thuthesis/issues/977))。
+- 修正 `siunitx` 的连接符设置([#990](https://github.com/tuna/thuthesis/issues/990))。
+- 修正“符号和缩略语说明”的行距。
+- 修正参考文献表内容的第一项段前距离。
+
## [v7.5.2] - 2024-07-01
### Added
@@ -999,7 +1032,8 @@
-[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.5.2...HEAD
+[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.6.0...HEAD
+[v7.6.0]: https://github.com/tuna/thuthesis/compare/v7.5.2...v7.6.0
[v7.5.2]: https://github.com/tuna/thuthesis/compare/v7.5.1...v7.5.2
[v7.5.1]: https://github.com/tuna/thuthesis/compare/v7.5.0...v7.5.1
[v7.5.0]: https://github.com/tuna/thuthesis/compare/v7.4.0...v7.5.0
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/thuthesis/README.md 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/doc/latex/thuthesis/README.md 2025-03-28 21:32:32 UTC (rev 74775)
@@ -7,7 +7,7 @@
# ThuThesis
-Scroll down for the English version of README.
+> Scroll down for the English version of README.
**ThuThesis** 是 **T**sing**h**ua **U**niversity **Thesis** LaTeX Template 的缩写。
@@ -15,8 +15,13 @@
**由于模板升级频繁,在开始使用和提问前,请确保您已经认真完整地阅读了使用说明文档和示例代码。**
-任何违反 [LaTeX项目公共许可证 v1.3c](https://www.latex-project.org/lppl/lppl-1-3c/) 使用 ThuThesis 的行为将被记录在 [耻辱柱](https://github.com/tuna/thuthesis/issues/754) 页面中,以示警告。
+## 版权
+本项目采用 [LaTeX项目公共许可证 v1.3c](https://www.latex-project.org/lppl/lppl-1-3c/) 授权,任何违反该许可证使用 ThuThesis 的行为将被记录在 [耻辱柱](https://github.com/tuna/thuthesis/issues/754) 页面中,以示警告。
+
+本项目分发的 `thu-fig-logo.pdf` 与 `thu-text-logo.pdf` 为载有清华大学校徽与校名的图形文件,用于制作制作本科生综合论文训练封面。这些图形从 [清华大学视觉形象系统](https://vi.tsinghua.edu.cn/) 获取,除裁剪周边空白外,项目维护者未进行任何其他修改。
+请注意:相关图形与文字都是清华大学的注册商标,除此模板外,请勿用于任何其他用途。
+
## 下载
推荐下载**发布版**模板,里面包括具体使用说明以及示例文档:
@@ -35,7 +40,7 @@
* [TUNA 镜像站](https://mirrors.tuna.tsinghua.edu.cn/github-release/tuna/thuthesis/):GitHub Releases 的镜像。
* 在线编辑:
* [TeXPage 模板](https://www.texpage.com/template/72b580ca-51fa-4ecc-82b3-0509bc1d6a07)(提供 Windows 中文字体)
- * [Overleaf 模板](https://www.overleaf.com/latex/templates/thuthesis-tsinghua-university-thesis-latex-template/cfwgcxtvkbsx)
+ * [Overleaf 模板](https://www.overleaf.com/latex/templates/thuthesis-tsinghua-university-thesis-latex-template/cfwgcxtvkbsx) ([Overleaf 降低了免费账户的编译时间](https://www.overleaf.com/blog/changes-to-free-compile-timeouts-and-servers), 使用本模板的项目会因为规模较大[容易超时](https://github.com/tuna/thuthesis/issues/984))
* 开发版:[GitHub](https://github.com/tuna/thuthesis)
### 注意事项
@@ -57,7 +62,7 @@
#### 发布版
-下载发布版的的 zip 包,使用其中的 `thuthesis.cls` 等文件覆盖原有的即可,无须额外操作。
+下载发布版的 zip 包,使用其中的 `thuthesis.cls` 等文件覆盖原有的即可,无须额外操作。
#### 开发版
@@ -73,6 +78,7 @@
* 先到 [FAQ](https://github.com/tuna/thuthesis/wiki/FAQ) 看看常见问题;
* 在 [GitHub Discussions](https://github.com/tuna/thuthesis/discussions) 搜索已有讨论,如果没有则提出新问题;
* 如果认为模板存在问题,可在 Issues 中使用相应的模板提出。
+* 入门问题可以参考[wiki/新手指南](https://github.com/tuna/thuthesis/wiki/新手指南)学习
## Makefile的用法
@@ -97,8 +103,14 @@
**This template is subject to frequent changes. Please make sure you have read the usage documentation and example code completely and carefully before using and asking questions.**
-Any use of ThuThesis in violation of [The LaTeX project public license v1.3c](https://www.latex-project.org/lppl/lppl-1-3c/) will be recorded in the [Hall of Shame](https://github.com/tuna/thuthesis/issues/754).
+## Copyright
+This project is licensed under the [The LaTeX project public license v1.3c](https://www.latex-project.org/lppl/lppl-1-3c/). Any use of ThuThesis that violates this license will be recorded in the [Hall of Shame](https://github.com/tuna/thuthesis/issues/754).
+
+The distributed `thu-fig-logo.pdf` and `thu-text-logo.pdf` files in this project contain the graphical emblem and name of Tsinghua University, and are used for creating undergraduate thesis covers only.
+These graphics were obtained from the [Tsinghua University Visual Identity System](https://vi.tsinghua.edu.cn). No modifications were made by the project maintainers except cropping the white space.
+Note: Both the relevant graphics and text are registered trademarks of Tsinghua University. You must not use them for any other purposes except within this template.
+
## Downloads
**Published versions** are recommended. Specific usage documentation and examples can be found in the archive. At present, these documents are **only available in Chinese**:
@@ -117,7 +129,7 @@
* [TUNA Mirrors](https://mirrors.tuna.tsinghua.edu.cn/github-release/tuna/thuthesis/): mirror of GitHub Releases
* Online editor:
* [TeXPage template](https://www.texpage.com/template/72b580ca-51fa-4ecc-82b3-0509bc1d6a07) (providing Chinese fonts of Windows)
- * [Overleaf template](https://www.overleaf.com/latex/templates/thuthesis-tsinghua-university-thesis-latex-template/cfwgcxtvkbsx)
+ * [Overleaf template](https://www.overleaf.com/latex/templates/thuthesis-tsinghua-university-thesis-latex-template/cfwgcxtvkbsx) ([free compile time was reduced](https://www.overleaf.com/blog/changes-to-free-compile-timeouts-and-servers); projects using this template will be relatively large, and thus [likely to time-out](https://github.com/tuna/thuthesis/issues/984))
* Developer versions: [GitHub](https://github.com/tuna/thuthesis)
### Notes
@@ -155,6 +167,7 @@
* Check the [FAQ](https://github.com/tuna/thuthesis/wiki/FAQ).
* Search [GitHub Discussions](https://github.com/tuna/thuthesis/discussions) and create if not existed.
* Create an issue (with specified template) if you believe there is a bug.
+* Beginners may go to [wiki/新手指南](https://github.com/tuna/thuthesis/wiki/新手指南) for basic information.
## Makefile Usage
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/data/chap02.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/thuthesis/data/chap02.tex 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/doc/latex/thuthesis/data/chap02.tex 2025-03-28 21:32:32 UTC (rev 74775)
@@ -38,13 +38,17 @@
\section{表格}
-表应具有自明性。为使表格简洁易读,尽可能采用三线表,如表~\ref{tab:three-line}。
-三条线可以使用 \pkg{booktabs} 宏包提供的命令生成。
+表应具有自明性。表中参数应标明量和单位的符号。
+为使表格简洁易读,均采用三线表(例如表~\ref{tab:three-line})。
+必要时可加辅助线,三线表无法清晰表达时可采用其他格式。
+表序与表题置于表的上方。表单元格中的文字一般应居中书写(上下居中,左右居中),
+不宜左右居中书写的,可采取两端对齐的方式书写。
+
\begin{table}
\centering
\caption{三线表示例}
- \begin{tabular}{ll}
+ \begin{tabular}{cc}
\toprule
文件名 & 描述 \\
\midrule
@@ -56,8 +60,8 @@
\label{tab:three-line}
\end{table}
-表格如果有附注,尤其是需要在表格中进行标注时,可以使用 \pkg{threeparttable} 宏包。
-研究生要求使用英文小写字母 a、b、c……顺序编号,本科生使用圈码 ①、②、③……编号。
+若表中有附注,采用英文小写字母顺序编号,附注写在表的下方。
+推荐使用 \pkg{threeparttable} 宏包。
\begin{table}
\centering
@@ -64,7 +68,7 @@
\begin{threeparttable}[c]
\caption{带附注的表格示例}
\label{tab:three-part-table}
- \begin{tabular}{ll}
+ \begin{tabular}{cc}
\toprule
文件名 & 描述 \\
\midrule
@@ -81,8 +85,9 @@
\end{threeparttable}
\end{table}
-如某个表需要转页接排,可以使用 \pkg{longtable} 宏包,需要在随后的各页上重复表的编号。
-编号后跟表题(可省略)和“(续)”,置于表上方。续表均应重复表头。
+如某个表需要转页接排,可以“续表”的形式另页打印,格式同前,只需在每页表序前加“续”字即可。
+续表均应重复表头。
+推荐使用 \pkg{longtable} 宏包。
\begin{longtable}{cccc}
\caption{跨页长表格的表题}
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/data/resume.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/thuthesis/data/resume.tex 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/doc/latex/thuthesis/data/resume.tex 2025-03-28 21:32:32 UTC (rev 74775)
@@ -31,3 +31,36 @@
\end{achievements}
\end{resume}
+
+
+
+% 本科生格式:
+
+% \begin{resume}
+% \section*{学术论文}
+%
+% \begin{achievements}
+% \item ZHOU R, HU C, OU T, et al. Intelligent GRU-RIC Position-Loop
+% Feedforward Compensation Control Method with Application to an
+% Ultraprecision Motion Stage[J], IEEE Transactions on Industrial
+% Informatics, 2024, 20(4): 5609-5621.
+%
+% \item 杨轶, 张宁欣, 任天令, 等. 硅基铁电微声学器件中薄膜残余应力的研究[J].
+% 中国机械工程, 2005, 16(14):1289-1291.
+%
+% \item YANG Y, REN T L, ZHU Y P, et al. PMUTs for handwriting recognition.
+% In press[J]. (已被Integrated Ferroelectrics录用)
+%
+% \end{achievements}
+%
+%
+% \section*{专利}
+%
+% \begin{achievements}
+% \item 胡楚雄, 付宏, 朱煜, 等. 一种磁悬浮平面电机: ZL202011322520.6[P]. 2022-04-01.
+%
+% \item REN T L, YANG Y, ZHU Y P, et al. Piezoelectric micro acoustic sensor
+% based on ferroelectric materials: No.11/215, 102[P]. (美国发明专利申请号.)
+%
+% \end{achievements}
+% \end{resume}
Deleted: trunk/Master/texmf-dist/doc/latex/thuthesis/spine.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis-example.tex 2025-03-28 21:32:32 UTC (rev 74775)
@@ -40,10 +40,9 @@
\tableofcontents
% 插图和附表清单
-% 本科生的插图索引和表格索引需要移至正文之后、参考文献前
-% \listoffiguresandtables % 插图和附表清单(仅限研究生)
\listoffigures % 插图清单
\listoftables % 附表清单
+% \listoffiguresandtables % 插图和附表清单
% 符号对照表
\input{data/denotation}
@@ -56,34 +55,29 @@
\input{data/chap03}
\input{data/chap04}
-
-% 其他部分
-\backmatter
-
% 参考文献
\bibliography{ref/refs} % 参考文献使用 BibTeX 编译
% \printbibliography % 参考文献使用 BibLaTeX 编译
% 附录
-% 本科生需要将附录放到声明之后,个人简历之前
\appendix
% \input{data/appendix-survey} % 本科生:外文资料的调研阅读报告
% \input{data/appendix-translation} % 本科生:外文资料的书面翻译
\input{data/appendix}
+% 其他部分
+\backmatter
+
% 致谢
\input{data/acknowledgements}
% 声明
-% 本科生开题报告不需要
-\statement
-% 将签字扫描后的声明文件 scan-statement.pdf 替换原始页面
-% \statement[file=scan-statement.pdf]
-% 本科生编译生成的声明页默认不加页脚,插入扫描版时再补上;
-% 研究生编译生成时有页眉页脚,插入扫描版时不再重复。
-% 也可以手动控制是否加页眉页脚
-% \statement[page-style=empty]
-% \statement[file=scan-statement.pdf, page-style=plain]
+% 各类开题报告通常不需要
+\statement[page-style=empty] % 编译生成的声明页默认不含页眉页脚,以避免页码变化带来问题
+% 在提交终稿时,插入签字后的扫描件 scan-statement.pdf,并添加页眉页脚
+% \statement[page-style=plain, file=scan-statement.pdf]
+% 如确实需要在电子版中直接页眉页脚,则使用
+% \statement[page-style=plain]
% 个人简历、在学期间完成的相关学术成果
% 本科生可以附个人简历,也可以不附个人简历
Modified: trunk/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/source/latex/thuthesis/thuthesis.dtx 2025-03-28 21:32:32 UTC (rev 74775)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2005-2024 by Tsinghua University TUNA Association <tuna at tsinghua.edu.cn>
+% Copyright (C) 2005-2025 by Tsinghua University TUNA Association <tuna at tsinghua.edu.cn>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,7 +14,7 @@
%
% \iffalse
%<*driver>
-\ProvidesFile{thuthesis.dtx}[2024/07/01 7.5.2 Tsinghua University Thesis Template]
+\ProvidesFile{thuthesis.dtx}[2025/03/28 7.6.0 Tsinghua University Thesis Template]
\documentclass{ltxdoc}
\usepackage{dtx-style}
@@ -74,11 +74,11 @@
% \item 本模板为作者根据
% 清华大学研究生院颁发的《
% \href{https://info2021.tsinghua.edu.cn/f/info/xxfb_fg/xnzx/template/detail?xxid=fa880bdf60102a29fbe3c31f36b76c7e}{%
-% 研究生学位论文写作指南}》(更新到2023年3月版本,限校内网络访问)、
-% 英文版《Guide to Thesis Writing for Graduate Students》、
+% 研究生学位论文写作指南}》(更新到 2025 年 3 月版本,限校内网络访问)、
+% 英文版 \emph{Guide to Thesis Writing for Graduate Students}、
% 清华大学教务处颁发的《
-% \href{https://lib.tsinghua.edu.cn/info/1073/1978.htm}{%
-% 综合论文训练写作指南}》、
+% \href{https://info2021.tsinghua.edu.cn/f/info/xxfb_fg/xnzx/template/detail?xxid=b2d1a49d7e48c8e9b0f7e82f033dbb2b}{%
+% 清华大学综合论文训练写作规范(试行)}》、
% 外文系的《英语专业本科生综合论文训练》和
% 清华大学《
% \href{http://postdoctor.tsinghua.edu.cn/info/czxz/1283}{%
@@ -392,8 +392,6 @@
% 选择输出的格式是打印版还是电子版(用于提交),可选:\option{print}(默认)、\option{electronic}。
% 打印版 \option{print} 自动在单面打印的部分插入空白页(比如封面),并且保证正文第 1 页在右侧。
% 电子版 \option{electronic} 选项会去掉空白页,这是因为一些院系要求提交的电子版不含空白页。
-% 注意在不同选项下,生成的声明页码很可能不同。为了避免页码错误,
-% \thuthesis{}将会在插入扫描的 PDF 文件时自动生成页码,因此\textbf{扫描声明页时请移除底部的页码},以防重叠。
%
% \begin{latex}
% \thusetup{
@@ -419,7 +417,7 @@
% 论文的一些部分(如英文摘要、本科生的外文调研报告)要求使用特定的语言,
% 模板已经进行配置,并在这些部分结束后自动恢复为主要语言。
%
-% 注意,本科生《写作指南》要求“本科生(含国外来华留学本科生)非外语专业论文统一要求
+% 注意,本科生《写作规范》要求“本科生(含国外来华留学本科生)非外语专业论文统一要求
% 用中文书写。”研究生《写作指南》要求“外国人来华留学生可以用英文撰写学位论文,但
% 须采用中文封面”,“除留学生外,学位论文一律须用汉语书写”,用户须提前与导师和院系
% 的审查教师协商使用何种语言书写论文。
@@ -484,8 +482,8 @@
%
% \begin{latex}
% \thusetup{
-% degree-category = {您要申请什么学位},
-% degree-category* = {Degree in English},
+% degree-category = {工学硕士},
+% degree-category* = {Master of Science},
% }
% \end{latex}
%
@@ -493,7 +491,7 @@
% 院系名称。
% \begin{latex}
% \thusetup{
-% department = {系名全称},
+% department = {计算机科学与技术系},
% }
% \end{latex}
%
@@ -523,8 +521,8 @@
%
% \begin{latex}
% \thusetup{
-% professional-field = {专业领域},
-% professional-field* = {Professional field},
+% professional-field = {计算机技术},
+% professional-field* = {Computer Technology},
% }
% \end{latex}
%
@@ -583,7 +581,8 @@
%
% \subsubsection{密级}
% \label{sec:setup-secret}
-% 定义秘密级别和年限。
+% 定义秘密级别和年限。如果定义了 \option{secret-level},
+% 则会在封面上显示对应密级,并且从声明页中将移除“不包含涉及国家秘密的内容”字样(2025年3月写作指南更新有此要求)。
% \begin{latex}
% \thusetup{
% secret-year = 10,
@@ -672,39 +671,20 @@
%
% \DescribeMacro{\tableofcontents}
% \DescribeMacro{\listoffigures}
-% \DescribeMacro{\listoffigures*}
% \DescribeMacro{\listoftables}
-% \DescribeMacro{\listoftables*}
-% \DescribeMacro{\listofequations}
-% \DescribeMacro{\listofequations*}
+% \DescribeMacro{\listoffiguresandtables}
% \DescribeMacro{\listofalgorithms}
-% \DescribeMacro{\listofalgorithms*}
% \begin{longtable}{ll}
% \toprule
% {\heiti 用途} & {\heiti 命令} \\\midrule
-% 目录 & \cs{tableofcontents} \\\midrule
-% 插图索引 & \cs{listoffigures} \\
-% & \cs{listoffigures*} \\\midrule
-% 表格索引 & \cs{listoftables} \\
-% & \cs{listoftables*} \\\midrule
-% 公式索引 & \cs{listofequations} \\
-% & \cs{listofequations*}\\\midrule
-% 算法索引 & \cs{listofalgorithms} \\
-% & \cs{listofalgorithms*}\\\bottomrule
+% 目录 & \cs{tableofcontents} \\
+% 插图清单 & \cs{listoffigures} \\
+% 附表清单 & \cs{listoftables} \\
+% 插图和附表清单 & \cs{listoffiguresandtables} \\
+% 算法清单 & \cs{listofalgorithms} \\
+% \bottomrule
% \end{longtable}
%
-% \DescribeOption{toc-chapter-style}
-% 本科生《写作指南》关于目录章标题要求“目录从第 1 章开始,每章标题用黑体小四号字”,
-% 所以其中的西文和数字默认使用 Arial 字体,跟正文的章标题一致。
-% 但是论文样例\footnote{此前发布在法学院网站,目前已经无公开可获得的链接。}的目录章标题的西文和数字却使用了 Times。
-% 如果审查老师这样要求,需要在生成目录前设置
-% \begin{latex}
-% \thusetup{
-% toc-chapter-style = times,
-% }
-% \end{latex}
-% 该选项只对本科生有效。
-%
% \LaTeX{} 默认支持插图和表格索引,是通过 \cs{caption} 命令完成的,因此它们必须出
% 现在浮动环境中,否则不被计数。
%
@@ -714,29 +694,6 @@
%
% 如果的确想让其编号,但又不想出现在索引中的话,目前模板暂不支持。
%
-% 公式索引为本模板扩展,模板扩展了 \pkg{amsmath} 几个内部命令,使得公式编号样式和
-% 自动索引功能非常方便。一般来说,你用到的所有数学环境编号都没问题了,这个可以参
-% 看示例文档。如果你有个非常特殊的数学环境需要加入公式索引,那么请使
-% 用 \cs{equcaption}\marg{编号}。此命令表示 equation caption,带一个参数,即显示
-% 在索引中的编号。因为公式与图表不同,我们很少给一个公式附加一个标题,之所以起这
-% 么个名字是因为图表就是通过 \cs{caption} 加入索引的,\cs{equcaption} 完全就是为
-% 了生成公式列表,不产生什么标题。
-%
-% 使用方法如下。假如有一个非 equation 数学环境 \texttt{mymath},只要在其中写一
-% 句 \cs{equcaption} 就可以将它加入公式列表。
-% \begin{latex}
-% \begin{mymath}
-% \label{eq:emc2}\equcaption{\ref{eq:emc2}}
-% E=mc^2
-% \end{mymath}
-% \end{latex}
-%
-% \texttt{mymath} 中公式的编号需要自己来做。
-%
-% 同图表一样,附录中的公式有时也不希望它跟全文统一编号,而且不希望它出现在公式
-% 索引中。目前的办法是利用 \cs{tag*}\marg{公式编号} 来解决。用法比较简单,此
-% 处不再罗嗦,实例请参看示例文档附录 A 的前两个公式。
-%
% \subsubsection{符号对照表}
% \DescribeEnv{denotation}
% 主要符号表环境,跟 \env{description} 类似,使用方法参见示例文件。带一个可选参数,
@@ -809,7 +766,7 @@
% \option{GB}(中文默认),\option{TeX}(英文默认)和 \option{ISO}),比如:
% \begin{latex}
% \thusetup{
-% math-style = ISO,
+% math-style = TeX,
% }
% \end{latex}
%
@@ -835,7 +792,7 @@
% \item \DescribeOption{math-ellipsis}
% 省略号 \cs{dots} 的样式,可选:\option{centered}(按照中文的习惯固定居中)、
% \option{lower} 和 \option{AMS}(取决于前后符号的位置)。
-% 其他的省略号命令如 \cs{lots}、\cs{cdots} 则不受影响。
+% 其他的省略号命令如 \cs{ldots}、\cs{cdots} 则不受影响。
% \item \DescribeOption{real-part}
% 实部 \cs{Re} 和虚部 \cs{Im} 的字体,可选:\option{roman} 和 \option{fraktur}。
% \end{enumerate}
@@ -1098,24 +1055,21 @@
% \subsubsection{声明}
% \DescribeMacro{\statement}
% 直接使用 \cs{statement} 命令可以编译生成声明页。
-% 如果要插入扫描后的声明页,将可选参数指定为扫描后的 PDF 文件名,例如:
-%
+% 在打印、签字、扫描后如果要插入扫描页,将可选参数 \option{file} 指定为 PDF 文件名,例如:
% \begin{latex}
% \statement[file=scan-statement.pdf]
% \end{latex}
%
-% 由于本科生的打印版和电子版有空白页的差别,声明的页码可能不同。
-% 所以编译生成声明页时默认不加页脚(\option{empty}),
-% 在签字后插入扫描页时再补上页脚(\option{plain}),防止页码冲突。
-% 研究生不存在空白页的问题,在编译生成声明时默认加页眉页脚(\option{plain}),
-% 而插入扫描版时不再重复(\option{empty})。
+% 由于正文篇幅可能有变化,以及电子版和打印版和有空白页的差别,声明的页码可能不同。
+% 所以为了避免重复打印扫描,编译生成声明页时默认\textsf{不含}页眉页脚,
+% 插入扫描页时默认加上页眉页脚。
%
-% 声明的页眉页脚也可以通过 \option{page-style} 参数手动控制,
-% 比如编译生成时固定不加页眉页脚:
+% 用户也可以通过 \option{page-style} 参数手动控制声明页是否含页眉页脚。
+% 例如编译生成声明页时要求包含页眉页脚:
% \begin{latex}
-% \statement[page-style=empty]
+% \statement[page-style=plain]
% \end{latex}
-% 插入扫描版声明补上页眉页脚:
+% 插入扫描页时不加页眉页脚:
% \begin{latex}
% \statement[file=scan-statement.pdf, page-style=plain]
% \end{latex}
@@ -1141,7 +1095,7 @@
%
% \DescribeEnv{survey}
% \DescribeEnv{translation}
-% 本科生《写作指南》要求附录 A 为外文资料的调研阅读报告或书面翻译,二者择一。
+% 本科生《写作规范》要求附录 A 为外文资料的调研阅读报告或书面翻译,二者择一。
% 调研报告(或书面翻译)的题目和参考文献是独立于论文的,相当一篇独立的小文章,
% 所以模板相应定义了 \env{survey} 和 \env{translation}。在这两个环境内部可以
% 像论文正文一样使用标题和参考文献的命令,但不会影响外部。
@@ -1273,7 +1227,7 @@
% \begin{macrocode}
%<cls>\NeedsTeXFormat{LaTeX2e}[2017/04/15]
%<cls>\ProvidesClass{thuthesis}
-%<cls>[2024/07/01 7.5.2 Tsinghua University Thesis Template]
+%<cls>[2025/03/28 7.6.0 Tsinghua University Thesis Template]
% \end{macrocode}
%
% 报错
@@ -1334,7 +1288,7 @@
%<*cls>
\hyphenation{Thu-Thesis}
\def\thuthesis{ThuThesis}
-\def\version{7.5.2}
+\def\version{7.6.0}
\RequirePackage{kvdefinekeys}
\RequirePackage{kvsetkeys}
\RequirePackage{kvoptions}
@@ -1904,10 +1858,10 @@
% 页边距:上下左右均为 3.0 厘米,装订线 0 厘米;
% 页眉距边界:2.2 厘米,页脚距边界:2.2 厘米。
%
-% 本科生《写作指南》:
-% 页边距:上:3.8 厘米,下:3.2 厘米,左右:3 厘米,装订线:左 0.2 厘米。
+% 本科生《写作规范》:
+% 页边距:3 厘米,装订线:0 厘米。
% 本科生 Word 模板:
-% 无页眉,页脚距边界:1.75 厘米。
+% 无页眉,页脚距边界:1.5 厘米。
%
% \pkg{fancyhdr} 的页眉是沿底部对齐的,所以只需设置 \cs{headsep},
% \cs{headheight} 可以适当增加高度允许多行页眉。
@@ -1923,24 +1877,9 @@
\newcommand\thu at set@geometry{%
\ifthu at degree@bachelor
\geometry{
- top = 3.8cm,
- bottom = 3.2cm,
- left = 3.2cm,
- right = 3cm,
- headheight = 1.9cm,
- headsep = 1.9cm,
- footskip = 1.45cm,
+ margin = 3cm,
+ footskip = 1.5cm,
}%
- \ifthu at output@print
- \geometry{
- left = 3.2cm,
- right = 3cm,
- }%
- \else
- \geometry{
- hmargin = 3cm,
- }%
- \fi
\else
\geometry{
margin = 3cm,
@@ -1980,7 +1919,17 @@
% \option{language} 时会修改,而在正文局部切换语言时则不变。
% \begin{macrocode}
\newcommand\thu at set@chapter at names{%
+ \ifthu at degree@bachelor
+ \def\thu at statement@name{声明}%
+ \else
+ \def\thu at statement@name{声\hspace{1em}明}%
+ \fi
\ifthu at main@language at chinese
+ \def\listfigurename{插图清单}%
+ \def\listtablename{附表清单}%
+ \def\thu at list@figure at table@name{插图和附表清单}%
+ \def\thu at list@algorithm at name{算法清单}%
+ \def\thu at denotation@name{符号和缩略语说明}%
\def\thu at comments@name{指导教师评语}%
\def\bibname{参考文献}%
\def\appendixname{附录}%
@@ -1987,25 +1936,15 @@
\def\indexname{索引}%
\def\thu at resolution@name{答辩委员会决议书}%
\ifthu at degree@bachelor
- \def\contentsname{目\qquad 录}%
- \def\listfigurename{插图索引}%
- \def\listtablename{表格索引}%
- \def\thu at list@figure at table@name{插图和附表索引}%
- \def\thu at list@algorithm at name{算法索引}%
- \def\thu at acknowledgements@name{致\qquad 谢}%
+ \def\contentsname{目录}%
+ \def\thu at acknowledgements@name{致谢}%
\def\listequationname{公式索引}%
- \def\thu at denotation@name{主要符号表}%
\def\thu at resume@name{在学期间参加课题的研究成果}%
\else
- \def\listfigurename{插图清单}%
- \def\listtablename{附表清单}%
- \def\thu at list@figure at table@name{插图和附表清单}%
- \def\thu at list@algorithm at name{算法清单}%
\def\listequationname{公式清单}%
\def\thu at acknowledgements@name{致\quad 谢}%
\ifthu at degree@graduate
\def\contentsname{目\quad 录}%
- \def\thu at denotation@name{符号和缩略语说明}%
\def\thu at resume@name{个人简历、在学期间完成的相关学术成果}%
\else % degree = postdoc
\def\contentsname{目\qquad 次}%
@@ -3261,15 +3200,9 @@
\@mainmattertrue
\pagenumbering{arabic}%
}
-\newif\ifthu at backmatter
\renewcommand\backmatter{%
- \if at openright
- \cleardoublepage
- \else
- \clearpage
- \fi
+ \clearpage
\@mainmatterfalse
- \thu at backmattertrue
\thusetup{toc-depth = 0}%
}
% \end{macrocode}
@@ -3307,7 +3240,7 @@
\renewcommand\headrulewidth{0pt}%
\fancyfoot[C]{
\ifthu at main@language at chinese
- \xiaowu
+ \fontsize{10.5bp}{12.075bp}\selectfont
\else
\normalsize
\fi
@@ -3766,13 +3699,8 @@
% \subsubsection{章节标题}
% \label{sec:theor}
% \begin{macrocode}
-\ifthu at degree@bachelor
- \newcommand{\thu at abstract@name}{中文摘要}
- \newcommand{\thu at abstract@name at en}{ABSTRACT}
-\else
- \newcommand{\thu at abstract@name}{摘\quad 要}
- \newcommand{\thu at abstract@name at en}{Abstract}
-\fi
+\newcommand{\thu at abstract@name}{摘\quad 要}
+\newcommand{\thu at abstract@name at en}{Abstract}
% \end{macrocode}
%
% 各级标题格式设置。
@@ -3807,10 +3735,10 @@
% \toprule
% 标题 & 中文 & 英文 & 段前/后间距 & 行距 \\
% \midrule
-% 一级节标题 & 黑体小三号 & Arial 15pt & 30/20 pt & 20pt \\
-% 二级节标题 & 黑体四号 & Arial 14pt & 25/12 pt & 18pt \\
-% 三级节标题 & 黑体小四号 & Arial 13pt & 12/6 pt & 15pt \\
-% 四级节标题 & 黑体小四号 & Arial 12pt & 12/6 pt & \\
+% 章标题 & 黑体三号 & Arial 16pt & 24/18 pt & 单倍 \\
+% 一级节标题 & 黑体四号 & Arial 14pt & 24/6 pt & 20pt \\
+% 二级节标题 & 黑体 13pt & Arial 13pt & 12/6 pt & 20pt \\
+% 三级节标题 & 黑体小四号 & Arial 12pt & 12/6 pt & 20pt \\
% \bottomrule
% \end{tabular}
% \end{center}
@@ -3821,25 +3749,26 @@
\ifthu at degree@bachelor
\ctexset{%
chapter = {
- format = \centering\sffamily\fontsize{15bp}{20bp}\selectfont,
+ format = \centering\sffamily\fontsize{16bp}{20.8bp}\selectfont,
+ titleformat = \thu at stretch{3em},
aftername = \quad,
- beforeskip = 30bp,
- afterskip = 20bp,
+ beforeskip = 27bp,
+ afterskip = 27bp,
},
section = {
- format = \sffamily\fontsize{14bp}{18bp}\selectfont,
+ format = \sffamily\fontsize{14bp}{20bp}\selectfont,
aftername = \quad,
- beforeskip = 25bp,
- afterskip = 12bp,
+ beforeskip = 24bp,
+ afterskip = 6bp,
},
subsection = {
- format = \sffamily\fontsize{13bp}{15bp}\selectfont,
+ format = \sffamily\fontsize{13bp}{20bp}\selectfont,
aftername = \quad,
beforeskip = 12bp,
afterskip = 6bp,
},
subsubsection = {
- format = \sffamily\fontsize{12bp}{14bp}\selectfont,
+ format = \sffamily\fontsize{12bp}{20bp}\selectfont,
aftername = \quad,
beforeskip = 12bp,
afterskip = 6bp,
@@ -3892,6 +3821,7 @@
\else
\ctexset{%
chapter = {
+ titleformat = {},
beforeskip = 27bp,
afterskip = 27bp,
number = \thechapter,
@@ -4020,9 +3950,7 @@
\thu at phantomsection
\addcontentsline{toc}{chapter}{#3}%
}%
- \ifthu at degree@bachelor\ctexset{chapter/beforeskip=40bp}\fi
\chapter*{#3}%
- \ifthu at degree@bachelor\ctexset{chapter/beforeskip=30bp}\fi
\IfValueTF{#4}{%
\ifthenelse{\equal{#4}{}}{%
\@mkboth{}{}%
@@ -4053,7 +3981,13 @@
\ifthu at degree@graduate
\thu at chapter*{\contentsname}%
\else
- \thu at chapter*[]{\contentsname}%
+ \ifthu at degree@bachelor
+ \ctexset{chapter/titleformat = \thu at stretch{2.5em}}%
+ \thu at chapter*[]{\contentsname}%
+ \ctexset{chapter/titleformat = \thu at stretch{3em}}%
+ \else
+ \thu at chapter*[]{\contentsname}%
+ \fi
\fi
\@starttoc{toc}%
}
@@ -4067,7 +4001,19 @@
default = arial,
},
}
-\newcommand\thu at leaders{\titlerule*[4bp]{.}}
+\thu at option@hook{toc-chapter-style}{\thu at deprecate{"toc-chapter-style" option}{}}
+\newcommand\thu at contents@label at delimiter{%
+ \ifthu at degree@bachelor
+ \ifthu at main@language at chinese
+ \space
+ \else
+ \quad
+ \fi
+ \else
+ \quad
+ \fi
+}
+\newcommand\thu at leaders{\nobreak\titlerule*[4bp]{.}\nobreak}
\newcommand\thu at set@toc at format{%
\contentsmargin{\z@}%
% \end{macrocode}
@@ -4083,22 +4029,16 @@
\ifthu at degree@bachelor
\ifthu at main@language at chinese
\titlecontents{chapter}
- [\z@]{\addvspace{6bp}
- \ifthu at toc@chapter at style@arial
- \sffamily
- \else
- \heiti
- \fi
- }
- {\contentspush{\thecontentslabel\quad}}{}
+ [0pt]{\sffamily}
+ {\contentspush{\thecontentslabel\space}\thu at stretch{3em}}{\thu at stretch{3em}}
{\rmfamily\thu at leaders\thecontentspage}%
\titlecontents{section}
[1em]{}
- {\contentspush{\thecontentslabel\quad}}{}
+ {\contentspush{\thecontentslabel\space}}{}
{\thu at leaders\thecontentspage}%
\titlecontents{subsection}
- [1.5em]{}
- {\contentspush{\thecontentslabel\quad}}{}
+ [2em]{}
+ {\contentspush{\thecontentslabel\space}}{}
{\thu at leaders\thecontentspage}%
\else
% \end{macrocode}
@@ -4245,20 +4185,7 @@
default = {Doctor of Philosophy},
name = degree at category@en,
},
- % 为了向后兼容
- degree-name = {
- name = degree at category,
- },
- degree-name* = {
- name = degree at category@en,
- },
}
-\thu at option@hook{degree-name}{%
- \thu at warning{`degree-name' is deprecated. Use `degree-category' instead.}
-}
-\thu at option@hook{degree-name*}{%
- \thu at warning{`degree-name*' is deprecated. Use `degree-category*' instead.}
-}
% \end{macrocode}
%
% 院系中英文名称。
@@ -4491,15 +4418,7 @@
\thusetup{language = chinese}%
\ifthu at degree@graduate
% 研究生
- \ifthu at thesis@type at thesis
- % 学位论文
- \thu at titlepage@thesis
- \else
- \ifthu at thesis@type at proposal
- % 选题报告
- \thu at titlepage@proposal
- \fi
- \fi
+ \thu at titlepage@thesis
\else
\ifthu at degree@bachelor
% 本科生
@@ -4573,44 +4492,8 @@
}
% \end{macrocode}
%
-% 选题报告封面
+% 选题报告封面需要提供学号
% \begin{macrocode}
-\newcommand\thu at titlepage@proposal{%
- \newgeometry{
- top = 5cm,
- bottom = 3.25cm,
- hmargin = 3.17cm,
- }%
- \thispagestyle{empty}%
- \begingroup
- % \vspace*{0.1cm}%
- \centering
- % {\thu at titlepage@title}%
- \parbox[t][3cm]{\textwidth}{%
- \vskip 0.1cm%
- \centering
- \sffamily\fontsize{26bp}{46.8bp}\selectfont
- \thu at title\par
- }%
- \vskip 0.85cm%
- \thu at title@page at degree@category
- \vfill
- \parbox[t][8.5cm][t]{\textwidth}{%
- \centering
- \fangsong
- \ifLuaTeX
- \fontspec{\CJK at family}%
- \else
- \CJKfamily+{}%
- \fi
- \sanhao[1.95]%
- \thu at titlepage@info
- }\par
- \parbox[t][2.5cm][t]{\textwidth}{\centering\thu at titlepage@date}\par
- \endgroup
- \clearpage
- \restoregeometry
-}
\newcommand\thu at set@student at id{%
\ifthu at thesis@type at proposal\else
\ifx\thu at student@id\@empty\else
@@ -4687,7 +4570,7 @@
\fi
\ifthu at thesis@type at proposal
\ifx\thu at student@id\@empty
- \thu at warning{Missing option `student-id' in "\protect\thusetup", ID will not appear on cover.}
+ \thu at warning{Missing option `student-id' in "\protect\thusetup", ID will not appear on cover.}%
\else
\thu at info@item{学号}{}{\thu at student@id}%
\fi
@@ -4873,8 +4756,10 @@
% \begin{macrocode}
\newcommand\thu at titlepage@bachelor{%
\newgeometry{
- vmargin = 2.54cm,
- hmargin = 3.17cm,
+ top = 3.8cm,
+ bottom = 3.2cm,
+ left = 3.2cm, % 装订线靠左 0.2 cm
+ right = 3cm,
}%
\thispagestyle{empty}%
\begingroup
@@ -4885,77 +4770,63 @@
\ifx\thu at secret@level\@empty\else
\thu at secret@level\space\thu at secret@year 年\par
\fi
- }%
+ }\par
\endgroup
- \vfill
+ \vspace{19bp}%
\begingroup
\centering
- \includegraphics{tsinghua-name-bachelor.pdf}%
- \vskip 0.94cm%
- \ifthu at thesis@type at proposal
- {\sffamily\bfseries\xiaochu\ziju{0.5}综合论文训练\\开题报告\par}%
- \else
- {\sffamily\bfseries\xiaochu\ziju{0.5}综合论文训练\par}%
- \fi
- \endgroup
- \vskip 1.8cm%
- \begingroup
- \heiti
- % 21.0cm - 0.2cm - 3cm * 2 - 18bp * 4 = 347bp
- \noindent\hspace{1em}\makebox[54bp]{\xiaoer[1.2]题目:}%
- \parbox[t]{347bp}{%
- \ifthu at main@language at chinese
- \yihao[1.56]%
- \else
- \fontsize{26bp}{32bp}\selectfont
+ \hspace*{-5bp}%
+ \includegraphics[width=50.4bp]{thu-fig-logo.pdf}%
+ \hspace{10bp}%
+ \raisebox{7bp}{\includegraphics[width=117bp]{thu-text-logo.pdf}}%
+ \par
+ \vspace{17bp}%
+ \begingroup
+ \sffamily\bfseries\xiaochu\ziju{0.3}%
+ 综合论文训练%
+ \ifthu at thesis@type at proposal
+ \\开题报告
\fi
- \renewcommand\ULthickness{0.05em}%
- \renewcommand\ULdepth{0.17em}%
- \expandafter\uline\expandafter{\thu at title}\par
+ \par
+ \endgroup
+ \vspace{48bp}%
+ \parbox[t][136bp]{\linewidth}{%
+ \centering
+ \heiti\fontsize{26bp}{32.5bp}\selectfont
+ \thu at title\par
\ifthu at main@language at english
\thusetup{language=english}%
- \expandafter\uline\expandafter{\thu at title@en}\par
+ \thu at title@en\par
\thusetup{language=chinese}%
\fi
}\par
\endgroup
- \vskip 1.9cm%
\begingroup
- \fangsong\sanhao[2.32]%
- \leftskip=2.5cm%
- \parindent=\z@
- \def\thu at info@item##1##2##3{%
- \ifx##3\@empty\else
- \thu at fixed@box{%
- \ifx\thu at co@supervisor\@empty
- 4em%
- \else
- 5.5em%
- \fi
- }{##1}:##2{##3}\par
- \fi
- }%
+ \fangsong
+ \fontsize{16bp}{30.96bp}\selectfont
+ \noindent
\def\thu at name@title at format##1##2{%
- \thu at stretch{3em}{##1}\quad ##2%
+ \thu at stretch{4em}{##1}%
+ \hspace{1.5em}%
+ \thu at stretch{2.5em}{##2}%
}%
- \thu at info@item{系别}{}{\thu at department}%
- \thu at info@item{专业}{}{\thu at discipline}%
- \thu at info@item{姓名}{\thu at name@title}{\thu at author}%
- \thu at info@item{指导教师}{\thu at name@title}{\thu at supervisor}%
- \thu at info@item{辅导教师}{\thu at name@title}{\thu at associate@supervisor}%
- \thu at info@item{联合指导教师}{\thu at name@title}{\thu at co@supervisor}%
+ \thu at titlepage@info at tabular{81bp}{2.5cm}{4em}{0.82cm}{%
+ \thu at info@item{系别}{}{\thu at department}%
+ \thu at info@item{专业}{}{\thu at discipline}%
+ \thu at info@item{姓名}{\thu at name@title}{\thu at author}%
+ \thu at info@item{指导教师}{\thu at name@title}{\thu at supervisor}%
+ \thu at info@item{副指导教师}{\thu at name@title}{\thu at associate@supervisor}%
+ \thu at info@item{联合指导教师}{\thu at name@title}{\thu at co@supervisor}%
+ }\par
\endgroup
- \vskip 1.4cm%
+ \vfill
\begingroup
\centering
- \ifLuaTeX
- \fontspec{\CJK at family}%
- \else
- \CJKfamily+{}%
- \fi
- \xiaosi\thu at format@date{\thu at date@zh at digit}{\thu at date}\par
+ \fontsize{16bp}{24bp}\selectfont
+ \ziju{0.03}%
+ \thu at format@date{\thu at date@zh at short}{\thu at date}\par
\endgroup
- \vfill
+ \vspace*{60bp}%
\clearpage
\restoregeometry
}
@@ -5097,8 +4968,8 @@
% 授权说明
% \begin{macrocode}
\newcommand\copyrightpage[1][]{%
- \cleardoublepage
\ifthu at degree@postdoc\relax\else
+ \cleardoublepage
\def\thu@@tmp{#1}
\ifx\thu@@tmp\@empty
\thusetup{language=chinese}%
@@ -5107,6 +4978,7 @@
\else
\thu at copyright@page at graduate
\fi
+ \clearpage
\thu at reset@main at language
\else
\thispagestyle{empty}%
@@ -5140,8 +5012,8 @@
},
}%
\thu at chapter*[]{关于学位论文使用授权的说明}%
- \thispagestyle{empty}%
\endgroup
+ \thispagestyle{empty}%
\vskip 13bp%
\begingroup
\fontsize{14bp}{26bp}\selectfont
@@ -5152,7 +5024,7 @@
(2)\nobreak 为教学和科研目的,学校可以将公开的学位论文作为资料在图书馆、资料室等场所供校内师生阅读,%
或在校园网上供校内师生浏览部分内容;\allowbreak
\ifthu at degree@doctor
- (3)\nobreak 根据《中华人民共和国学位条例暂行实施办法》及上级教育主管部门具体要求,向国家图书馆报送相应的学位论文。%
+ (3)\nobreak 根据《中华人民共和国学位法》及上级教育主管部门具体要求,向国家图书馆报送相应的学位论文。%
\else
(3)\nobreak 按照上级教育主管部门督导、抽查等要求,报送相应的学位论文。%
\fi
@@ -5175,27 +5047,29 @@
\begingroup
\ctexset{
chapter = {
- format = {\centering\sffamily\erhao[1]},
- beforeskip = 1bp,
- afterskip = 24bp,
+ format = {\centering\sffamily\erhao},
+ beforeskip = 40bp,
+ afterskip = 37bp,
},
}%
- \thu at chapter*[]{关于学位论文使用授权的说明}%
- \thispagestyle{empty}%
+ \thu at chapter*[]{关于论文使用授权的说明}%
\endgroup
- \vskip 4bp%
- 本人完全了解清华大学有关保留、使用学位论文的规定,即:%
- 学校有权保留学位论文的复印件,允许该论文被查阅和借阅;%
- 学校可以公布该论文的全部或部分内容,可以采用影印、缩印或其他复制手段保存该论文。\par
- \textbf{(涉密的学位论文在解密后应遵守此规定)}\par
- \null\par
+ \thispagestyle{empty}%
+ \vspace*{13bp}%
\begingroup
- \centering
- 签\quad 名:\thu at underline[6em]{}%
- 导师签名:\thu at underline[6em]{}%
- 日\quad 期:\thu at underline[6em]{}%
- \par
+ \fontsize{14bp}{26bp}\selectfont
+ 本人完全了解清华大学有关保留、使用综合论文训练论文的规定,即:%
+ 学校有权保留论文的复印件,允许论文被查阅和借阅;%
+ 学校可以公布论文的全部或部分内容,可以采用影印、缩印或其他复制手段保存论文。\par
\endgroup
+ \vspace{71bp}%
+ \begingroup
+ \setlength{\parindent}{0pt}%
+ \fontsize{12bp}{18bp}\selectfont
+ \hspace*{42bp}作者签名:\hspace{118bp}导师签名:\par
+ \vspace{11bp}%
+ \hspace*{42bp}日\hspace{2em}期:\hspace{118bp}日\hspace{2em}期:\par
+ \endgroup
}
% \end{macrocode}
% \end{macro}
@@ -5235,9 +5109,6 @@
% 标点符号一律用中文输入状态下的标点符号。
% \begin{macrocode}
\newenvironment{abstract}{%
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
\thusetup{language = chinese}%
\ifthu at degree@graduate
\begingroup
@@ -5252,23 +5123,16 @@
\thu at chapter*[]{\thu at abstract@name}%
\fi
}{%
-% \end{macrocode}
-%
-% 每个关键词之间空两个汉字符宽度, 且为悬挂缩进。
-% \begin{macrocode}
\par
\null\par
- \ifthu at degree@graduate
+ \ifthu at degree@postdoc
+ \textbf{关键词:}%
+ \else
\noindent
\textsf{关键词:}%
- \else
- \textbf{关键词:}%
\fi
- \thu at clist@use{\thu at keywords}{;}%
+ \thu at clist@use{\thu at keywords}{;}\par
\gdef\thu at keywords{}%
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
\thu at reset@main at language % switch back to main language
}
% \end{macrocode}
@@ -5279,51 +5143,53 @@
% 摘要内容用小四号 Times New Roman。
% \begin{macrocode}
\newenvironment{abstract*}{%
+ \thusetup{language = english}%
\ifthu at degree@bachelor
- \cleardoublepage
- \fi
- \thusetup{language = english}%
- \ifthu at degree@graduate
- \thu at chapter*{\thu at abstract@name at en}%
+ \begingroup
+ \ctexset{chapter/afterskip = 30bp}%
+ \thu at chapter*[]{\thu at abstract@name at en}%
+ \endgroup
\else
- \thu at chapter*[]{\thu at abstract@name at en}%
+ \ifthu at degree@graduate
+ \thu at chapter*{\thu at abstract@name at en}%
+ \else
+ \thu at chapter*[]{\thu at abstract@name at en}%
+ \fi
\fi
}{%
\par
\null\par
- \ifthu at degree@graduate
+ \ifthu at degree@postdoc\else
\noindent
\fi
- \textbf{Keywords:}\space
- \thu at clist@use{\thu at keywords@en}{; }%
- \ifthu at degree@graduate
- \vspace*{\stretch{1}}%
- \fi
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
+ \textbf{Keywords:} \thu at clist@use{\thu at keywords@en}{; }\par
\thu at reset@main at language % switch back to main language
}
% \end{macrocode}
% \end{environment}
%
-% \subsubsection{主要符号表}
+% \subsubsection{符号和缩略语说明}
% \label{sec:denotationfmt}
% \begin{environment}{denotation}
-% 主要符号表。
+% 符号和缩略语说明。
% \begin{macrocode}
\newenvironment{denotation}[1][2.5cm]{%
\ifthu at degree@bachelor
- \cleardoublepage
- \fi
- \ifthu at degree@graduate
- \thu at chapter*{\thu at denotation@name}%
+ \ifthu at main@language at chinese
+ \thu at chapter*[]{\thu at denotation@name}%
+ \else
+ \thu at chapter*{\thu at denotation@name}%
+ \fi
\else
- \thu at chapter*[]{\thu at denotation@name}%
+ \ifthu at degree@graduate
+ \thu at chapter*{\thu at denotation@name}%
+ \else
+ \thu at chapter*[]{\thu at denotation@name}%
+ \fi
\fi
- \vskip-30bp\xiaosi[1.6]\begin{thu at denotation}[labelwidth=#1]
+ \begin{thu at denotation}[labelwidth=#1]%
}{%
- \end{thu at denotation}
+ \end{thu at denotation}%
}
\newlist{thu at denotation}{description}{1}
\setlist[thu at denotation]{%
@@ -5346,10 +5212,19 @@
% \begin{environment}{acknowledgements}
% 定义致谢环境
% \begin{macrocode}
-\newcommand{\thu at statement@text}{本人郑重声明:所呈交的学位论文,是本人在导师指导下
- ,独立进行研究工作所取得的成果。尽我所知,除文中已经注明引用的内容外,本学位论
- 文的研究成果不包含任何他人享有著作权的内容。对本论文所涉及的研究工作做出贡献的
- 其他个人和集体,均已在文中以明确方式标明。}
+\newcommand{\thu at statement@text at bachelor}{%
+ 本人郑重声明:所呈交的综合论文训练论文,是本人在导师指导下,独立进行研究工作所取得的成果。%
+ 尽我所知,除文中已经注明引用的内容外,本论文的研究成果不包含任何他人享有著作权的内容。%
+ 对本论文所涉及的研究工作做出贡献的其他个人和集体,均已在文中以明确方式标明。%
+}
+\newcommand{\thu at statement@text at graduate}{%
+ 本人郑重声明:所呈交的学位论文,是本人在导师指导下,独立进行研究工作所取得的成果%
+ \ifx\thu at secret@level\@empty
+ ,不包含涉及国家秘密的内容%
+ \fi%
+ 。尽我所知,除文中已经注明引用的内容外,本学位论文的研究成果不包含任何他人享有著作权的内容。%
+ 对本论文所涉及的研究工作做出贡献的其他个人和集体,均已在文中以明确方式标明。%
+}
\newcommand{\thu at signature}{签\hspace{1em}名:}
\newcommand{\thu at backdate}{日\hspace{1em}期:}
% \end{macrocode}
@@ -5359,20 +5234,14 @@
\newenvironment{acknowledgements}{%
\@mainmatterfalse
\thu at end@appendix at ref@section
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
\thu at chapter*{\thu at acknowledgements@name}%
}{%
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
}
% \end{macrocode}
% \end{environment}
%
% \begin{macro}{statement}
-% 声明部分(支持扫描文件替换)
+% 声明页面样式和插入声明页(支持扫描文件替换)。
% \begin{macrocode}
\thu at define@key{
statement-page-style = {
@@ -5383,38 +5252,11 @@
plain,
},
default = auto,
- },
- statement-page-number = {
- name = statement at page@number,
- choices = {
- false,
- true,
- },
- default = false,
- },
+ }
}
-\thu at option@hook{statement-page-number}{%
- \ifthu at statement@page at number@false
- \thusetup{statement-page-style=empty}%
- \else
- \thusetup{statement-page-style=plain}%
- \fi
- \thu at warning{%
- The "statement-page-number" option is deprecated.
- Use "page-style" option of \protect\statement command instead%
- }%
-}
-\newif\ifthu at statement@exists
\newcommand\statement[1][]{%
\@mainmatterfalse
\thu at end@appendix at ref@section
- \thu at statement@existstrue
- \ifthu at degree@bachelor
- \cleardoublepage
- \def\thu at statement@name{声\hspace{2em}明}%
- \else
- \def\thu at statement@name{声\hspace{1em}明}%
- \fi
\let\thu at statement@file\@empty
\kv at define@key{thu at statement}{page-style}{\thusetup{statement-page-style=##1}}%
\kv at define@key{thu at statement}{file}{\let\thu at statement@file\kv at value}%
@@ -5428,17 +5270,9 @@
\kvsetkeys{thu at statement}{#1}%
\ifthu at statement@page at style@auto
\ifx\thu at statement@file\@empty
- \ifthu at degree@bachelor
- \thusetup{statement-page-style = empty}%
- \else
- \thusetup{statement-page-style = plain}%
- \fi
+ \thusetup{statement-page-style = empty}%
\else
- \ifthu at degree@bachelor
- \thusetup{statement-page-style = plain}%
- \else
- \thusetup{statement-page-style = empty}%
- \fi
+ \thusetup{statement-page-style = plain}%
\fi
\fi
\ifx\thu at statement@file\@empty
@@ -5454,14 +5288,27 @@
\thu at chapter*{\thu at statement@name}%
\endgroup
\thispagestyle{\thu at statement@page at style}%
- \thu at statement@text\par
\ifthu at degree@graduate
- \vskip 2cm%
+ \vspace{12bp}%
+ \fontsize{12bp}{21bp}\selectfont
+ \thu at statement@text at graduate\par
+ \vspace{79bp}%
+ \begingroup
+ \noindent\hspace{5.4cm}\fontsize{13bp}{18bp}\selectfont
+ \thu at signature\thu at underline[2.8cm]{}\hspace{-6bp}%
+ \thu at backdate\thu at underline[2.3cm]{}\par
+ \endgroup
\else
- \null\par
+ \ifthu at degree@bachelor
+ \begingroup
+ \renewcommand\CJKglue{\hspace{.1bp}}%
+ \thu at statement@text at bachelor\par
+ \endgroup
+ \vspace{40bp}%
+ \hfill 签\hspace{.5em}名:\thu at underline[2.75cm]{}\hspace{.5em}%
+ 日\hspace{.5em}期:\thu at underline[2.75cm]{}\par
+ \fi
\fi
- {\hfill\thu at signature\thu at underline[2.5cm]\relax
- \thu at backdate\thu at underline[2.5cm]\relax}%
\thu at reset@main at language
\else
\includepdf[pagecommand={%
@@ -5471,9 +5318,6 @@
\thispagestyle{\thu at statement@page at style}%
}]{\thu at statement@file}%
\fi
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
}
% \end{macrocode}
% \end{macro}
@@ -5489,52 +5333,50 @@
% 定义图表以及公式目录样式。
% \begin{macrocode}
\def\thu at listof#1{% #1: float type
- \setcounter{tocdepth}{2} % restore tocdepth in case being modified
- \@ifstar
- {\thu at chapter*[]{\csname list#1name\endcsname}\@starttoc{\csname ext@#1\endcsname}}
- {\thu at chapter*{\csname list#1name\endcsname}\@starttoc{\csname ext@#1\endcsname}}%
+ \setcounter{tocdepth}{2}% restore tocdepth in case being modified
+ \@ifstar{\thu at deprecate{starred form of \protect\listof... command}{}}{}%
+ \ifthu at degree@bachelor
+ \ifthu at main@language at chinese
+ \thu at chapter*[]{\csname list#1name\endcsname}%
+ \else
+ \thu at chapter*{\csname list#1name\endcsname}%
+ \fi
+ \else
+ \ifthu at degree@graduate
+ \thu at chapter*{\csname list#1name\endcsname}%
+ \else
+ \thu at chapter*[]{\csname list#1name\endcsname}%
+ \fi
+ \fi
+ \@starttoc{\csname ext@#1\endcsname}%
}
% \end{macrocode}
%
% \begin{macro}{\listoffigures}
-% \begin{macro}{\listoffigures*}
% 插图清单。
% \begin{macrocode}
\renewcommand\listoffigures{%
- \ifthu at degree@bachelor
- \ifthu at backmatter\else
- \thu at warning{The list of figures should be placed in back matter}%
- \fi
- \fi
\thu at listof{figure}%
}
\titlecontents{figure}
[\z@]{}
- {\contentspush{\figurename~\thecontentslabel\quad}}{}
- {\nobreak\thu at leaders\nobreak\hfil\thecontentspage}
+ {\contentspush{\figurename~\thecontentslabel\thu at contents@label at delimiter}}{}
+ {\thu at leaders\thecontentspage}
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\listoftables}
-% \begin{macro}{\listoftables*}
% 附表清单。
% \begin{macrocode}
\renewcommand\listoftables{%
- \ifthu at degree@bachelor
- \ifthu at backmatter\else
- \thu at warning{The list of tables should be placed in back matter}%
- \fi
- \fi
\thu at listof{table}%
}
\titlecontents{table}
[\z@]{}
- {\contentspush{\tablename~\thecontentslabel\quad}}{}
+ {\contentspush{\tablename~\thecontentslabel\thu at contents@label at delimiter}}{}
{\thu at leaders\thecontentspage}
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\listoffiguresandtables}
% 将插图和附表合在一起列出“插图和附表清单”。
@@ -5541,53 +5383,47 @@
% \begin{macrocode}
\newcommand\listoffiguresandtables{%
\ifthu at degree@bachelor
- \thu at warning{The list of figures and tables are for graduates only}%
- \listoffigures
- \listoftables
+ \ifthu at main@language at chinese
+ \thu at chapter*[]{\thu at list@figure at table@name}%
+ \else
+ \thu at chapter*{\thu at list@figure at table@name}%
+ \fi
\else
- \thu at chapter*{\thu at list@figure at table@name}%
- \@starttoc{lof}%
- \par
- \null\par
- \@starttoc{lot}%
+ \ifthu at degree@graduate
+ \thu at chapter*{\thu at list@figure at table@name}%
+ \else
+ \thu at chapter*[]{\thu at list@figure at table@name}%
+ \fi
\fi
+ \@starttoc{lof}%
+ \par
+ \null\par
+ \@starttoc{lot}%
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\equcaption}
-% 本命令只是为了生成公式列表,所以这个 caption 是假的。如果要编号最好用
-% \env{equation} 环境,如果是其它编号环境,请手动添加 \cs{equcaption}。
-% 用法如下:
-%
-% \cs{equcaption}\marg{counter}
-%
-% \marg{counter} 指定出现在索引中的编号,一般取 \cs{theequation},如果你是用
-% \pkg{amsmath} 的 \cs{tag},那么默认是 \cs{tag} 的参数;除此之外可能需要你
-% 手工指定。
-%
+% 公式的 caption 已过时。
% \begin{macrocode}
\def\ext at equation{loe}
\def\equcaption#1{%
+ \thu at deprecate{"\protect\equcaption" command}{}%
\addcontentsline{\ext at equation}{equation}%
{\protect\numberline{#1}}}
% \end{macrocode}
-% \end{macro}
%
-% \begin{macro}{\listofequations}
-% \begin{macro}{\listofequations*}
-% \LaTeX{} 默认没有公式索引,此处定义自己的 \cs{listofequations}。
-% 公式索引没有名称,所以不设置固定的 label 宽度。
+% 公式索引 \cs{listofequations} 已过时。
% \begin{macrocode}
-\newcommand\listofequations{\thu at listof{equation}}
+\newcommand\listofequations{%
+ \thu at deprecate{"\protect\listofequations" command}{}%
+ \thu at listof{equation}%
+}
\titlecontents{equation}
[0pt]{\addvspace{6bp}}
- {\thu at equation@name~\thecontentslabel}{}
- {\nobreak\thu at leaders\nobreak\thecontentspage}
+ {\contentspush{\thu at equation@name~\thecontentslabel\thu at contents@label at delimiter}}{}
+ {\thu at leaders\thecontentspage}
\contentsuse{equation}{loe}
% \end{macrocode}
-% \end{macro}
-% \end{macro}
%
%
% \subsection{参考文献}
@@ -5927,25 +5763,27 @@
% 参考文献表的正文部分用五号字。
% 行距采用固定值 16 磅,段前空 3 磅,段后空 0 磅。
%
-% 本科生要求宋体五号/Times New Roman 10.5 pt,固定行距 17pt,段前后间距 3pt;
-% 英文专业要求悬挂缩进 0.5inch(1.27 厘米)。
+% 本科生要求用五号字,行距采用固定值 16 磅,段前空 3 磅,段后空 0 磅。
+% 采用悬挂格式,悬挂缩进 2 个汉字符或 1 厘米。
%
+% 英文专业要求字号 10.5pt,行距用固定值 17pt,段前后 3pt,悬挂缩进 0.5inch(1.27 厘米)。
+%
% 复用 \pkg{natbib} 的 \texttt{thebibliography} 环境,调整距离。
% \begin{macrocode}
\renewcommand\bibsection{\thu at chapter*{\bibname}}
\newcommand\thu at set@bibliography at format{%
+ \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}%
+ \setlength{\bibsep}{3bp \@plus 3bp \@minus 3bp}%
\ifthu at degree@bachelor
- \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}%
- \setlength{\bibsep}{6bp \@plus 3bp \@minus 3bp}%
\ifthu at main@language at chinese
- \setlength{\bibhang}{21bp}%
+ \setlength{\bibhang}{1cm}%
\else
+ \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}%
+ \setlength{\bibsep}{6bp \@plus 3bp \@minus 3bp}%
\setlength{\bibhang}{0.5in}%
\fi
\else
- \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}%
- \setlength{\bibsep}{3bp \@plus 3bp \@minus 3bp}%
- \setlength{\bibhang}{21bp}%
+ \setlength{\bibhang}{1cm}%
\fi
}
\thu at set@bibliography at format
@@ -5955,7 +5793,7 @@
%
% 研究生要求每一条文献的内容要尽量写在同一页内。
% 遇有被迫分页的情况,可通过“留白”或微调本页行距的方式尽量将同一条文献内容放在一页。
-% 所以上述 \cs{bibsep} 的设置允许 1pt 的伸缩,
+% 所以上述 \cs{bibsep} 的设置允许 3pt 的伸缩,
% 同时增加同一条文献内分页的惩罚,
% 这里参考 \href{https://github.com/plk/biblatex/blob/e5d6e69e61613cc33ab1fcc2083a8277eb9cfce5/tex/latex/biblatex/biblatex.def}{BibLaTeX 的设置}。
% \begin{macrocode}
@@ -6008,19 +5846,19 @@
\DeclareRobustCommand\inlinecite{\parencite}
\defbibheading{bibliography}[\bibname]{\thu at chapter*{\bibname}}
\newcommand\thu at set@bibliography at format{%
+ \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}%
+ \setlength{\bibitemsep}{3bp \@plus 3bp \@minus 3bp}%
\ifthu at degree@bachelor
- \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}%
- \setlength{\bibitemsep}{6bp \@plus 3bp \@minus 3bp}%
\ifthu at main@language at chinese
- \setlength{\bibhang}{21bp}%
+ \setlength{\bibhang}{1cm}%
\else
+ \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}%
+ \setlength{\bibitemsep}{6bp \@plus 3bp \@minus 3bp}%
\setlength{\bibhang}{0.5in}%
\fi
\else
- \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}%
- \setlength{\bibitemsep}{3bp \@plus 3bp \@minus 3bp}%
\setlength{\biblabelsep}{0.1cm}%
- \setlength{\bibhang}{21bp}%
+ \setlength{\bibhang}{1cm}%
\fi
}
\thu at set@bibliography at format
@@ -6038,10 +5876,16 @@
\AtBeginDocument{
\thu at set@chapter at names
}
- \renewcommand\bibliographytypesize{\fontsize{10.5bp}{17bp}\selectfont}
- \setlength{\bibitemsep}{6bp}
+ \renewcommand\bibliographytypesize{\fontsize{10.5bp}{16bp}\selectfont}
+ \setlength{\bibitemsep}{3bp \@plus 3bp \@minus 3bp}%
+ \ifthu at degree@bachelor
+ \ifthu at main@language at english
+ \renewcommand\bibliographytypesize{\fontsize{10.5bp}{17bp}\selectfont}%
+ \setlength{\bibitemsep}{6bp \@plus 3bp \@minus 3bp}%
+ \fi
+ \fi
\ifthu at main@language at chinese
- \setlength{\bibleftmargin}{21bp}
+ \setlength{\bibleftmargin}{1cm}
\setlength{\bibindent}{-\bibleftmargin}
\else
\setlength{\bibleftmargin}{0.5in}
@@ -6063,11 +5907,6 @@
% \begin{macrocode}
\g at addto@macro\appendix{%
\@mainmattertrue
- \ifthu at degree@bachelor
- \ifthu at statement@exists\else
- \thu at warning{The appendices should be placed after statement}%
- \fi
- \fi
}
% \end{macrocode}
%
@@ -6227,15 +6066,18 @@
\AtEndDocument{\thu at end@appendix at ref@section}
\renewcommand\thu at set@survey at bibheading{%
\renewcommand\bibsection{%
- \par
- \vskip 20bp%
- \thu at pdfbookmark{1}{\bibname}%
\begingroup
- \centering
- \xiaosi[1.667]\bibname\par
+ \ctexset{
+ section = {
+ numbering = false,
+ format = \centering\normalsize,
+ beforeskip = 20pt,
+ afterskip = 4pt,
+ },
+ }%
+ \section{\bibname}%
\endgroup
- \vskip 6bp%
- }%
+ }
}%
% \end{macrocode}
%
@@ -6264,14 +6106,18 @@
}
\renewcommand\thu at set@survey at bibheading{%
\defbibheading{bibliography}[\bibname]{%
- \par
- \vskip 20bp%
- \thu at pdfbookmark{1}{\bibname}%
+ \vspace{20bp}%
\begingroup
- \centering
- \xiaosi[1.667]##1\par
+ \ctexset{
+ section = {
+ numbering = false,
+ format = \centering\normalsize,
+ beforeskip = 0pt,
+ afterskip = 0pt,
+ },
+ }%
+ \section{\bibname}%
\endgroup
- \vskip 6bp%
}%
}%
\def\bibliographystyle#1{%
@@ -6280,7 +6126,7 @@
}
% \end{macrocode}
%
-% 本科生《写作指南》有独特的要求:附录 A 为外文资料的调研阅读报告或书面翻译,
+% 本科生《写作规范》有独特的要求:附录 A 为外文资料的调研阅读报告或书面翻译,
% 并且要分别附上独立的参考文献和外文资料的原文索引。
% 所以这里定义 \env{survey} 和 \env{translation} 专门处理这两种情况,
% 其中参考文献使用了 \pkg{bibunits} 宏包的功能。
@@ -6356,12 +6202,7 @@
\vskip 20bp%
}%
\let\appendix\thu at appendix@appendix
- \def\bibsection{%
- \begingroup
- \ctexset{section/numbering=false}%
- \section{\bibname}%
- \endgroup
- }%
+ \thu at set@survey at bibheading
\startcontents[translation]%
}{%
\stopcontents[translation]%
@@ -6370,7 +6211,7 @@
% \end{macrocode}
% \end{environment}
%
-% \begin{environment}{translation}
+% \begin{environment}{translation-index}
% 书面翻译对应的原文索引,区别于译文的参考文献。
% \begin{macrocode}
\newenvironment{translation-index}{}{}
@@ -6453,18 +6294,18 @@
\@mainmatterfalse
\thu at end@appendix at ref@section
\thu at chapter*{\thu at resume@name}%
- \ctexset{
- section = {
- format += \centering,
- numbering = false,
- },
- }%
+ \ctexset{section/numbering = false}%
+ \ifthu at degree@bachelor
+ \ctexset{section/aftertitle = {:\@@par}}%
+ \else
+ \ctexset{section/format += \centering}%
+ \fi
\ifthu at language@chinese
\ctexset{
subsection = {
format = \sffamily\fontsize{14bp}{20bp}\selectfont,
numbering = false,
- aftertitle = :,
+ aftertitle = {:\@@par},
},
}%
\setlist[achievements]{
@@ -6594,22 +6435,24 @@
%
% \begin{macrocode}
\newcommand{\record}[1]{%
- \let\thu at record@file\@empty
- \kv at define@key{thu at record}{file}{\let\thu at record@file\kv at value}%
- \kv at set@family at handler{thu at record}{%
- \ifx\kv at value\relax
- \let\thu at record@file\kv at key
- \else
- \kv at handled@false
+ \ifthu at degree@bachelor
+ \let\thu at record@file\@empty
+ \kv at define@key{thu at record}{file}{\let\thu at record@file\kv at value}%
+ \kv at set@family at handler{thu at record}{%
+ \ifx\kv at value\relax
+ \let\thu at record@file\kv at key
+ \else
+ \kv at handled@false
+ \fi
+ }%
+ \kvsetkeys{thu at record}{#1}%
+ \ifx\thu at record@file\@empty
+ \thu at error{File path of \protect\record\space is required}
\fi
- }%
- \kvsetkeys{thu at record}{#1}%
- \ifx\thu at record@file\@empty
- \thu at error{File path of \protect\record\space is required}
+ \clearpage
+ \thu at pdfbookmark{0}{综合论文训练记录表}%
+ \includepdf[pages=-]{\thu at record@file}%
\fi
- \cleardoublepage
- \thu at pdfbookmark{0}{综合论文训练记录表}%
- \includepdf[pages=-]{\thu at record@file}%
}
% \end{macrocode}
%
@@ -6729,16 +6572,16 @@
\newcommand\thu at set@siunitx at language{%
\ifthu at language@chinese
\sisetup{
- list-final-separator = { 和 },
- list-pair-separator = { 和 },
- range-phrase = {~},
+ list-final-separator = {\TextOrMath{\space}{\ }\text{和}\TextOrMath{\space}{\ }},
+ list-pair-separator = {\TextOrMath{\space}{\ }\text{和}\TextOrMath{\space}{\ }},
+ range-phrase = {\text{~}},
}%
\else
\ifthu at language@english
\sisetup{
- list-final-separator = {, and },
- list-pair-separator = { and },
- range-phrase = { to },
+ list-final-separator = {\TextOrMath{\space}{\ }\text{and}\TextOrMath{\space}{\ }},
+ list-pair-separator = {\TextOrMath{\space}{\ }\text{and}\TextOrMath{\space}{\ }},
+ range-phrase = {\TextOrMath{\space}{\ }\text{to}\TextOrMath{\space}{\ }},
}%
\fi
\fi
@@ -6834,7 +6677,7 @@
\contentsuse{algorithm}{loa}
\titlecontents{algorithm}
[\z@]{}
- {\contentspush{\fname at algorithm~\thecontentslabel\quad}}{}
+ {\contentspush{\fname at algorithm~\thecontentslabel\thu at contents@label at delimiter}}{}
{\thu at leaders\thecontentspage}
}
% \end{macrocode}
@@ -6859,7 +6702,7 @@
\contentsuse{algocf}{loa}
\titlecontents{algocf}
[\z@]{}
- {\contentspush{\algorithmcfname~\thecontentslabel\quad}}{}
+ {\contentspush{\algorithmcfname~\thecontentslabel\thu at contents@label at delimiter}}{}
{\thu at leaders\thecontentspage}
}
% \end{macrocode}
Added: trunk/Master/texmf-dist/tex/latex/thuthesis/thu-fig-logo.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/latex/thuthesis/thu-fig-logo.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/thuthesis/thu-fig-logo.pdf 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/tex/latex/thuthesis/thu-fig-logo.pdf 2025-03-28 21:32:32 UTC (rev 74775)
Property changes on: trunk/Master/texmf-dist/tex/latex/thuthesis/thu-fig-logo.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/thuthesis/thu-text-logo.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/latex/thuthesis/thu-text-logo.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/thuthesis/thu-text-logo.pdf 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/tex/latex/thuthesis/thu-text-logo.pdf 2025-03-28 21:32:32 UTC (rev 74775)
Property changes on: trunk/Master/texmf-dist/tex/latex/thuthesis/thu-text-logo.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls 2025-03-28 21:31:52 UTC (rev 74774)
+++ trunk/Master/texmf-dist/tex/latex/thuthesis/thuthesis.cls 2025-03-28 21:32:32 UTC (rev 74775)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2005-2024 by Tsinghua University TUNA Association <tuna at tsinghua.edu.cn>
+%% Copyright (C) 2005-2025 by Tsinghua University TUNA Association <tuna at tsinghua.edu.cn>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2017/04/15]
\ProvidesClass{thuthesis}
-[2024/07/01 7.5.2 Tsinghua University Thesis Template]
+[2025/03/28 7.6.0 Tsinghua University Thesis Template]
\newcommand\thu at error[1]{%
\ClassError{thuthesis}{#1}{}%
}
@@ -61,7 +61,7 @@
}
\hyphenation{Thu-Thesis}
\def\thuthesis{ThuThesis}
-\def\version{7.5.2}
+\def\version{7.6.0}
\RequirePackage{kvdefinekeys}
\RequirePackage{kvsetkeys}
\RequirePackage{kvoptions}
@@ -425,24 +425,9 @@
\newcommand\thu at set@geometry{%
\ifthu at degree@bachelor
\geometry{
- top = 3.8cm,
- bottom = 3.2cm,
- left = 3.2cm,
- right = 3cm,
- headheight = 1.9cm,
- headsep = 1.9cm,
- footskip = 1.45cm,
+ margin = 3cm,
+ footskip = 1.5cm,
}%
- \ifthu at output@print
- \geometry{
- left = 3.2cm,
- right = 3cm,
- }%
- \else
- \geometry{
- hmargin = 3cm,
- }%
- \fi
\else
\geometry{
margin = 3cm,
@@ -468,7 +453,17 @@
\let\thu at language\thu at main@language
}
\newcommand\thu at set@chapter at names{%
+ \ifthu at degree@bachelor
+ \def\thu at statement@name{声明}%
+ \else
+ \def\thu at statement@name{声\hspace{1em}明}%
+ \fi
\ifthu at main@language at chinese
+ \def\listfigurename{插图清单}%
+ \def\listtablename{附表清单}%
+ \def\thu at list@figure at table@name{插图和附表清单}%
+ \def\thu at list@algorithm at name{算法清单}%
+ \def\thu at denotation@name{符号和缩略语说明}%
\def\thu at comments@name{指导教师评语}%
\def\bibname{参考文献}%
\def\appendixname{附录}%
@@ -475,25 +470,15 @@
\def\indexname{索引}%
\def\thu at resolution@name{答辩委员会决议书}%
\ifthu at degree@bachelor
- \def\contentsname{目\qquad 录}%
- \def\listfigurename{插图索引}%
- \def\listtablename{表格索引}%
- \def\thu at list@figure at table@name{插图和附表索引}%
- \def\thu at list@algorithm at name{算法索引}%
- \def\thu at acknowledgements@name{致\qquad 谢}%
+ \def\contentsname{目录}%
+ \def\thu at acknowledgements@name{致谢}%
\def\listequationname{公式索引}%
- \def\thu at denotation@name{主要符号表}%
\def\thu at resume@name{在学期间参加课题的研究成果}%
\else
- \def\listfigurename{插图清单}%
- \def\listtablename{附表清单}%
- \def\thu at list@figure at table@name{插图和附表清单}%
- \def\thu at list@algorithm at name{算法清单}%
\def\listequationname{公式清单}%
\def\thu at acknowledgements@name{致\quad 谢}%
\ifthu at degree@graduate
\def\contentsname{目\quad 录}%
- \def\thu at denotation@name{符号和缩略语说明}%
\def\thu at resume@name{个人简历、在学期间完成的相关学术成果}%
\else % degree = postdoc
\def\contentsname{目\qquad 次}%
@@ -1499,15 +1484,9 @@
\@mainmattertrue
\pagenumbering{arabic}%
}
-\newif\ifthu at backmatter
\renewcommand\backmatter{%
- \if at openright
- \cleardoublepage
- \else
- \clearpage
- \fi
+ \clearpage
\@mainmatterfalse
- \thu at backmattertrue
\thusetup{toc-depth = 0}%
}
\pagestyle{fancy}
@@ -1518,7 +1497,7 @@
\renewcommand\headrulewidth{0pt}%
\fancyfoot[C]{
\ifthu at main@language at chinese
- \xiaowu
+ \fontsize{10.5bp}{12.075bp}\selectfont
\else
\normalsize
\fi
@@ -1826,13 +1805,8 @@
\AtEndOfPackageFile*{threeparttable}{
\g at addto@macro\TPT at defaults{\wuhao}
}
-\ifthu at degree@bachelor
- \newcommand{\thu at abstract@name}{中文摘要}
- \newcommand{\thu at abstract@name at en}{ABSTRACT}
-\else
- \newcommand{\thu at abstract@name}{摘\quad 要}
- \newcommand{\thu at abstract@name at en}{Abstract}
-\fi
+\newcommand{\thu at abstract@name}{摘\quad 要}
+\newcommand{\thu at abstract@name at en}{Abstract}
\ctexset{%
chapter = {
nameformat = {},
@@ -1859,25 +1833,26 @@
\ifthu at degree@bachelor
\ctexset{%
chapter = {
- format = \centering\sffamily\fontsize{15bp}{20bp}\selectfont,
+ format = \centering\sffamily\fontsize{16bp}{20.8bp}\selectfont,
+ titleformat = \thu at stretch{3em},
aftername = \quad,
- beforeskip = 30bp,
- afterskip = 20bp,
+ beforeskip = 27bp,
+ afterskip = 27bp,
},
section = {
- format = \sffamily\fontsize{14bp}{18bp}\selectfont,
+ format = \sffamily\fontsize{14bp}{20bp}\selectfont,
aftername = \quad,
- beforeskip = 25bp,
- afterskip = 12bp,
+ beforeskip = 24bp,
+ afterskip = 6bp,
},
subsection = {
- format = \sffamily\fontsize{13bp}{15bp}\selectfont,
+ format = \sffamily\fontsize{13bp}{20bp}\selectfont,
aftername = \quad,
beforeskip = 12bp,
afterskip = 6bp,
},
subsubsection = {
- format = \sffamily\fontsize{12bp}{14bp}\selectfont,
+ format = \sffamily\fontsize{12bp}{20bp}\selectfont,
aftername = \quad,
beforeskip = 12bp,
afterskip = 6bp,
@@ -1901,6 +1876,7 @@
\else
\ctexset{%
chapter = {
+ titleformat = {},
beforeskip = 27bp,
afterskip = 27bp,
number = \thechapter,
@@ -2012,9 +1988,7 @@
\thu at phantomsection
\addcontentsline{toc}{chapter}{#3}%
}%
- \ifthu at degree@bachelor\ctexset{chapter/beforeskip=40bp}\fi
\chapter*{#3}%
- \ifthu at degree@bachelor\ctexset{chapter/beforeskip=30bp}\fi
\IfValueTF{#4}{%
\ifthenelse{\equal{#4}{}}{%
\@mkboth{}{}%
@@ -2031,7 +2005,13 @@
\ifthu at degree@graduate
\thu at chapter*{\contentsname}%
\else
- \thu at chapter*[]{\contentsname}%
+ \ifthu at degree@bachelor
+ \ctexset{chapter/titleformat = \thu at stretch{2.5em}}%
+ \thu at chapter*[]{\contentsname}%
+ \ctexset{chapter/titleformat = \thu at stretch{3em}}%
+ \else
+ \thu at chapter*[]{\contentsname}%
+ \fi
\fi
\@starttoc{toc}%
}
@@ -2045,28 +2025,34 @@
default = arial,
},
}
-\newcommand\thu at leaders{\titlerule*[4bp]{.}}
+\thu at option@hook{toc-chapter-style}{\thu at deprecate{"toc-chapter-style" option}{}}
+\newcommand\thu at contents@label at delimiter{%
+ \ifthu at degree@bachelor
+ \ifthu at main@language at chinese
+ \space
+ \else
+ \quad
+ \fi
+ \else
+ \quad
+ \fi
+}
+\newcommand\thu at leaders{\nobreak\titlerule*[4bp]{.}\nobreak}
\newcommand\thu at set@toc at format{%
\contentsmargin{\z@}%
\ifthu at degree@bachelor
\ifthu at main@language at chinese
\titlecontents{chapter}
- [\z@]{\addvspace{6bp}
- \ifthu at toc@chapter at style@arial
- \sffamily
- \else
- \heiti
- \fi
- }
- {\contentspush{\thecontentslabel\quad}}{}
+ [0pt]{\sffamily}
+ {\contentspush{\thecontentslabel\space}\thu at stretch{3em}}{\thu at stretch{3em}}
{\rmfamily\thu at leaders\thecontentspage}%
\titlecontents{section}
[1em]{}
- {\contentspush{\thecontentslabel\quad}}{}
+ {\contentspush{\thecontentslabel\space}}{}
{\thu at leaders\thecontentspage}%
\titlecontents{subsection}
- [1.5em]{}
- {\contentspush{\thecontentslabel\quad}}{}
+ [2em]{}
+ {\contentspush{\thecontentslabel\space}}{}
{\thu at leaders\thecontentspage}%
\else
\ifthu at main@language at english
@@ -2175,20 +2161,7 @@
default = {Doctor of Philosophy},
name = degree at category@en,
},
- % 为了向后兼容
- degree-name = {
- name = degree at category,
- },
- degree-name* = {
- name = degree at category@en,
- },
}
-\thu at option@hook{degree-name}{%
- \thu at warning{`degree-name' is deprecated. Use `degree-category' instead.}
-}
-\thu at option@hook{degree-name*}{%
- \thu at warning{`degree-name*' is deprecated. Use `degree-category*' instead.}
-}
\thu at define@key{
department = {
default = {计算机科学与技术系},
@@ -2353,15 +2326,7 @@
\thusetup{language = chinese}%
\ifthu at degree@graduate
% 研究生
- \ifthu at thesis@type at thesis
- % 学位论文
- \thu at titlepage@thesis
- \else
- \ifthu at thesis@type at proposal
- % 选题报告
- \thu at titlepage@proposal
- \fi
- \fi
+ \thu at titlepage@thesis
\else
\ifthu at degree@bachelor
% 本科生
@@ -2424,42 +2389,6 @@
\clearpage
\restoregeometry
}
-\newcommand\thu at titlepage@proposal{%
- \newgeometry{
- top = 5cm,
- bottom = 3.25cm,
- hmargin = 3.17cm,
- }%
- \thispagestyle{empty}%
- \begingroup
- % \vspace*{0.1cm}%
- \centering
- % {\thu at titlepage@title}%
- \parbox[t][3cm]{\textwidth}{%
- \vskip 0.1cm%
- \centering
- \sffamily\fontsize{26bp}{46.8bp}\selectfont
- \thu at title\par
- }%
- \vskip 0.85cm%
- \thu at title@page at degree@category
- \vfill
- \parbox[t][8.5cm][t]{\textwidth}{%
- \centering
- \fangsong
- \ifLuaTeX
- \fontspec{\CJK at family}%
- \else
- \CJKfamily+{}%
- \fi
- \sanhao[1.95]%
- \thu at titlepage@info
- }\par
- \parbox[t][2.5cm][t]{\textwidth}{\centering\thu at titlepage@date}\par
- \endgroup
- \clearpage
- \restoregeometry
-}
\newcommand\thu at set@student at id{%
\ifthu at thesis@type at proposal\else
\ifx\thu at student@id\@empty\else
@@ -2523,7 +2452,7 @@
\fi
\ifthu at thesis@type at proposal
\ifx\thu at student@id\@empty
- \thu at warning{Missing option `student-id' in "\protect\thusetup", ID will not appear on cover.}
+ \thu at warning{Missing option `student-id' in "\protect\thusetup", ID will not appear on cover.}%
\else
\thu at info@item{学号}{}{\thu at student@id}%
\fi
@@ -2676,8 +2605,10 @@
}
\newcommand\thu at titlepage@bachelor{%
\newgeometry{
- vmargin = 2.54cm,
- hmargin = 3.17cm,
+ top = 3.8cm,
+ bottom = 3.2cm,
+ left = 3.2cm, % 装订线靠左 0.2 cm
+ right = 3cm,
}%
\thispagestyle{empty}%
\begingroup
@@ -2688,77 +2619,63 @@
\ifx\thu at secret@level\@empty\else
\thu at secret@level\space\thu at secret@year 年\par
\fi
- }%
+ }\par
\endgroup
- \vfill
+ \vspace{19bp}%
\begingroup
\centering
- \includegraphics{tsinghua-name-bachelor.pdf}%
- \vskip 0.94cm%
- \ifthu at thesis@type at proposal
- {\sffamily\bfseries\xiaochu\ziju{0.5}综合论文训练\\开题报告\par}%
- \else
- {\sffamily\bfseries\xiaochu\ziju{0.5}综合论文训练\par}%
- \fi
- \endgroup
- \vskip 1.8cm%
- \begingroup
- \heiti
- % 21.0cm - 0.2cm - 3cm * 2 - 18bp * 4 = 347bp
- \noindent\hspace{1em}\makebox[54bp]{\xiaoer[1.2]题目:}%
- \parbox[t]{347bp}{%
- \ifthu at main@language at chinese
- \yihao[1.56]%
- \else
- \fontsize{26bp}{32bp}\selectfont
+ \hspace*{-5bp}%
+ \includegraphics[width=50.4bp]{thu-fig-logo.pdf}%
+ \hspace{10bp}%
+ \raisebox{7bp}{\includegraphics[width=117bp]{thu-text-logo.pdf}}%
+ \par
+ \vspace{17bp}%
+ \begingroup
+ \sffamily\bfseries\xiaochu\ziju{0.3}%
+ 综合论文训练%
+ \ifthu at thesis@type at proposal
+ \\开题报告
\fi
- \renewcommand\ULthickness{0.05em}%
- \renewcommand\ULdepth{0.17em}%
- \expandafter\uline\expandafter{\thu at title}\par
+ \par
+ \endgroup
+ \vspace{48bp}%
+ \parbox[t][136bp]{\linewidth}{%
+ \centering
+ \heiti\fontsize{26bp}{32.5bp}\selectfont
+ \thu at title\par
\ifthu at main@language at english
\thusetup{language=english}%
- \expandafter\uline\expandafter{\thu at title@en}\par
+ \thu at title@en\par
\thusetup{language=chinese}%
\fi
}\par
\endgroup
- \vskip 1.9cm%
\begingroup
- \fangsong\sanhao[2.32]%
- \leftskip=2.5cm%
- \parindent=\z@
- \def\thu at info@item##1##2##3{%
- \ifx##3\@empty\else
- \thu at fixed@box{%
- \ifx\thu at co@supervisor\@empty
- 4em%
- \else
- 5.5em%
- \fi
- }{##1}:##2{##3}\par
- \fi
- }%
+ \fangsong
+ \fontsize{16bp}{30.96bp}\selectfont
+ \noindent
\def\thu at name@title at format##1##2{%
- \thu at stretch{3em}{##1}\quad ##2%
+ \thu at stretch{4em}{##1}%
+ \hspace{1.5em}%
+ \thu at stretch{2.5em}{##2}%
}%
- \thu at info@item{系别}{}{\thu at department}%
- \thu at info@item{专业}{}{\thu at discipline}%
- \thu at info@item{姓名}{\thu at name@title}{\thu at author}%
- \thu at info@item{指导教师}{\thu at name@title}{\thu at supervisor}%
- \thu at info@item{辅导教师}{\thu at name@title}{\thu at associate@supervisor}%
- \thu at info@item{联合指导教师}{\thu at name@title}{\thu at co@supervisor}%
+ \thu at titlepage@info at tabular{81bp}{2.5cm}{4em}{0.82cm}{%
+ \thu at info@item{系别}{}{\thu at department}%
+ \thu at info@item{专业}{}{\thu at discipline}%
+ \thu at info@item{姓名}{\thu at name@title}{\thu at author}%
+ \thu at info@item{指导教师}{\thu at name@title}{\thu at supervisor}%
+ \thu at info@item{副指导教师}{\thu at name@title}{\thu at associate@supervisor}%
+ \thu at info@item{联合指导教师}{\thu at name@title}{\thu at co@supervisor}%
+ }\par
\endgroup
- \vskip 1.4cm%
+ \vfill
\begingroup
\centering
- \ifLuaTeX
- \fontspec{\CJK at family}%
- \else
- \CJKfamily+{}%
- \fi
- \xiaosi\thu at format@date{\thu at date@zh at digit}{\thu at date}\par
+ \fontsize{16bp}{24bp}\selectfont
+ \ziju{0.03}%
+ \thu at format@date{\thu at date@zh at short}{\thu at date}\par
\endgroup
- \vfill
+ \vspace*{60bp}%
\clearpage
\restoregeometry
}
@@ -2879,8 +2796,8 @@
\fi
}
\newcommand\copyrightpage[1][]{%
- \cleardoublepage
\ifthu at degree@postdoc\relax\else
+ \cleardoublepage
\def\thu@@tmp{#1}
\ifx\thu@@tmp\@empty
\thusetup{language=chinese}%
@@ -2889,6 +2806,7 @@
\else
\thu at copyright@page at graduate
\fi
+ \clearpage
\thu at reset@main at language
\else
\thispagestyle{empty}%
@@ -2918,8 +2836,8 @@
},
}%
\thu at chapter*[]{关于学位论文使用授权的说明}%
- \thispagestyle{empty}%
\endgroup
+ \thispagestyle{empty}%
\vskip 13bp%
\begingroup
\fontsize{14bp}{26bp}\selectfont
@@ -2930,7 +2848,7 @@
(2)\nobreak 为教学和科研目的,学校可以将公开的学位论文作为资料在图书馆、资料室等场所供校内师生阅读,%
或在校园网上供校内师生浏览部分内容;\allowbreak
\ifthu at degree@doctor
- (3)\nobreak 根据《中华人民共和国学位条例暂行实施办法》及上级教育主管部门具体要求,向国家图书馆报送相应的学位论文。%
+ (3)\nobreak 根据《中华人民共和国学位法》及上级教育主管部门具体要求,向国家图书馆报送相应的学位论文。%
\else
(3)\nobreak 按照上级教育主管部门督导、抽查等要求,报送相应的学位论文。%
\fi
@@ -2953,27 +2871,29 @@
\begingroup
\ctexset{
chapter = {
- format = {\centering\sffamily\erhao[1]},
- beforeskip = 1bp,
- afterskip = 24bp,
+ format = {\centering\sffamily\erhao},
+ beforeskip = 40bp,
+ afterskip = 37bp,
},
}%
- \thu at chapter*[]{关于学位论文使用授权的说明}%
- \thispagestyle{empty}%
+ \thu at chapter*[]{关于论文使用授权的说明}%
\endgroup
- \vskip 4bp%
- 本人完全了解清华大学有关保留、使用学位论文的规定,即:%
- 学校有权保留学位论文的复印件,允许该论文被查阅和借阅;%
- 学校可以公布该论文的全部或部分内容,可以采用影印、缩印或其他复制手段保存该论文。\par
- \textbf{(涉密的学位论文在解密后应遵守此规定)}\par
- \null\par
+ \thispagestyle{empty}%
+ \vspace*{13bp}%
\begingroup
- \centering
- 签\quad 名:\thu at underline[6em]{}%
- 导师签名:\thu at underline[6em]{}%
- 日\quad 期:\thu at underline[6em]{}%
- \par
+ \fontsize{14bp}{26bp}\selectfont
+ 本人完全了解清华大学有关保留、使用综合论文训练论文的规定,即:%
+ 学校有权保留论文的复印件,允许论文被查阅和借阅;%
+ 学校可以公布论文的全部或部分内容,可以采用影印、缩印或其他复制手段保存论文。\par
\endgroup
+ \vspace{71bp}%
+ \begingroup
+ \setlength{\parindent}{0pt}%
+ \fontsize{12bp}{18bp}\selectfont
+ \hspace*{42bp}作者签名:\hspace{118bp}导师签名:\par
+ \vspace{11bp}%
+ \hspace*{42bp}日\hspace{2em}期:\hspace{118bp}日\hspace{2em}期:\par
+ \endgroup
}
\thu at define@key{
keywords,
@@ -2994,9 +2914,6 @@
\expandafter\comma at parse\expandafter{#1}{\thu at clist@processor}%
}
\newenvironment{abstract}{%
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
\thusetup{language = chinese}%
\ifthu at degree@graduate
\begingroup
@@ -3013,57 +2930,56 @@
}{%
\par
\null\par
- \ifthu at degree@graduate
+ \ifthu at degree@postdoc
+ \textbf{关键词:}%
+ \else
\noindent
\textsf{关键词:}%
- \else
- \textbf{关键词:}%
\fi
- \thu at clist@use{\thu at keywords}{;}%
+ \thu at clist@use{\thu at keywords}{;}\par
\gdef\thu at keywords{}%
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
\thu at reset@main at language % switch back to main language
}
\newenvironment{abstract*}{%
+ \thusetup{language = english}%
\ifthu at degree@bachelor
- \cleardoublepage
- \fi
- \thusetup{language = english}%
- \ifthu at degree@graduate
- \thu at chapter*{\thu at abstract@name at en}%
+ \begingroup
+ \ctexset{chapter/afterskip = 30bp}%
+ \thu at chapter*[]{\thu at abstract@name at en}%
+ \endgroup
\else
- \thu at chapter*[]{\thu at abstract@name at en}%
+ \ifthu at degree@graduate
+ \thu at chapter*{\thu at abstract@name at en}%
+ \else
+ \thu at chapter*[]{\thu at abstract@name at en}%
+ \fi
\fi
}{%
\par
\null\par
- \ifthu at degree@graduate
+ \ifthu at degree@postdoc\else
\noindent
\fi
- \textbf{Keywords:}\space
- \thu at clist@use{\thu at keywords@en}{; }%
- \ifthu at degree@graduate
- \vspace*{\stretch{1}}%
- \fi
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
+ \textbf{Keywords:} \thu at clist@use{\thu at keywords@en}{; }\par
\thu at reset@main at language % switch back to main language
}
\newenvironment{denotation}[1][2.5cm]{%
\ifthu at degree@bachelor
- \cleardoublepage
- \fi
- \ifthu at degree@graduate
- \thu at chapter*{\thu at denotation@name}%
+ \ifthu at main@language at chinese
+ \thu at chapter*[]{\thu at denotation@name}%
+ \else
+ \thu at chapter*{\thu at denotation@name}%
+ \fi
\else
- \thu at chapter*[]{\thu at denotation@name}%
+ \ifthu at degree@graduate
+ \thu at chapter*{\thu at denotation@name}%
+ \else
+ \thu at chapter*[]{\thu at denotation@name}%
+ \fi
\fi
- \vskip-30bp\xiaosi[1.6]\begin{thu at denotation}[labelwidth=#1]
+ \begin{thu at denotation}[labelwidth=#1]%
}{%
- \end{thu at denotation}
+ \end{thu at denotation}%
}
\newlist{thu at denotation}{description}{1}
\setlist[thu at denotation]{%
@@ -3076,23 +2992,26 @@
labelsep*=0.5cm,
itemindent=0pt,
}
-\newcommand{\thu at statement@text}{本人郑重声明:所呈交的学位论文,是本人在导师指导下
- ,独立进行研究工作所取得的成果。尽我所知,除文中已经注明引用的内容外,本学位论
- 文的研究成果不包含任何他人享有著作权的内容。对本论文所涉及的研究工作做出贡献的
- 其他个人和集体,均已在文中以明确方式标明。}
+\newcommand{\thu at statement@text at bachelor}{%
+ 本人郑重声明:所呈交的综合论文训练论文,是本人在导师指导下,独立进行研究工作所取得的成果。%
+ 尽我所知,除文中已经注明引用的内容外,本论文的研究成果不包含任何他人享有著作权的内容。%
+ 对本论文所涉及的研究工作做出贡献的其他个人和集体,均已在文中以明确方式标明。%
+}
+\newcommand{\thu at statement@text at graduate}{%
+ 本人郑重声明:所呈交的学位论文,是本人在导师指导下,独立进行研究工作所取得的成果%
+ \ifx\thu at secret@level\@empty
+ ,不包含涉及国家秘密的内容%
+ \fi%
+ 。尽我所知,除文中已经注明引用的内容外,本学位论文的研究成果不包含任何他人享有著作权的内容。%
+ 对本论文所涉及的研究工作做出贡献的其他个人和集体,均已在文中以明确方式标明。%
+}
\newcommand{\thu at signature}{签\hspace{1em}名:}
\newcommand{\thu at backdate}{日\hspace{1em}期:}
\newenvironment{acknowledgements}{%
\@mainmatterfalse
\thu at end@appendix at ref@section
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
\thu at chapter*{\thu at acknowledgements@name}%
}{%
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
}
\thu at define@key{
statement-page-style = {
@@ -3103,38 +3022,11 @@
plain,
},
default = auto,
- },
- statement-page-number = {
- name = statement at page@number,
- choices = {
- false,
- true,
- },
- default = false,
- },
+ }
}
-\thu at option@hook{statement-page-number}{%
- \ifthu at statement@page at number@false
- \thusetup{statement-page-style=empty}%
- \else
- \thusetup{statement-page-style=plain}%
- \fi
- \thu at warning{%
- The "statement-page-number" option is deprecated.
- Use "page-style" option of \protect\statement command instead%
- }%
-}
-\newif\ifthu at statement@exists
\newcommand\statement[1][]{%
\@mainmatterfalse
\thu at end@appendix at ref@section
- \thu at statement@existstrue
- \ifthu at degree@bachelor
- \cleardoublepage
- \def\thu at statement@name{声\hspace{2em}明}%
- \else
- \def\thu at statement@name{声\hspace{1em}明}%
- \fi
\let\thu at statement@file\@empty
\kv at define@key{thu at statement}{page-style}{\thusetup{statement-page-style=##1}}%
\kv at define@key{thu at statement}{file}{\let\thu at statement@file\kv at value}%
@@ -3148,17 +3040,9 @@
\kvsetkeys{thu at statement}{#1}%
\ifthu at statement@page at style@auto
\ifx\thu at statement@file\@empty
- \ifthu at degree@bachelor
- \thusetup{statement-page-style = empty}%
- \else
- \thusetup{statement-page-style = plain}%
- \fi
+ \thusetup{statement-page-style = empty}%
\else
- \ifthu at degree@bachelor
- \thusetup{statement-page-style = plain}%
- \else
- \thusetup{statement-page-style = empty}%
- \fi
+ \thusetup{statement-page-style = plain}%
\fi
\fi
\ifx\thu at statement@file\@empty
@@ -3174,14 +3058,27 @@
\thu at chapter*{\thu at statement@name}%
\endgroup
\thispagestyle{\thu at statement@page at style}%
- \thu at statement@text\par
\ifthu at degree@graduate
- \vskip 2cm%
+ \vspace{12bp}%
+ \fontsize{12bp}{21bp}\selectfont
+ \thu at statement@text at graduate\par
+ \vspace{79bp}%
+ \begingroup
+ \noindent\hspace{5.4cm}\fontsize{13bp}{18bp}\selectfont
+ \thu at signature\thu at underline[2.8cm]{}\hspace{-6bp}%
+ \thu at backdate\thu at underline[2.3cm]{}\par
+ \endgroup
\else
- \null\par
+ \ifthu at degree@bachelor
+ \begingroup
+ \renewcommand\CJKglue{\hspace{.1bp}}%
+ \thu at statement@text at bachelor\par
+ \endgroup
+ \vspace{40bp}%
+ \hfill 签\hspace{.5em}名:\thu at underline[2.75cm]{}\hspace{.5em}%
+ 日\hspace{.5em}期:\thu at underline[2.75cm]{}\par
+ \fi
\fi
- {\hfill\thu at signature\thu at underline[2.5cm]\relax
- \thu at backdate\thu at underline[2.5cm]\relax}%
\thu at reset@main at language
\else
\includepdf[pagecommand={%
@@ -3191,64 +3088,73 @@
\thispagestyle{\thu at statement@page at style}%
}]{\thu at statement@file}%
\fi
- \ifthu at degree@bachelor
- \cleardoublepage
- \fi
}
\let\acknowledgement\acknowledgements
\let\endacknowledgement\endacknowledgements
\def\thu at listof#1{% #1: float type
- \setcounter{tocdepth}{2} % restore tocdepth in case being modified
- \@ifstar
- {\thu at chapter*[]{\csname list#1name\endcsname}\@starttoc{\csname ext@#1\endcsname}}
- {\thu at chapter*{\csname list#1name\endcsname}\@starttoc{\csname ext@#1\endcsname}}%
-}
-\renewcommand\listoffigures{%
+ \setcounter{tocdepth}{2}% restore tocdepth in case being modified
+ \@ifstar{\thu at deprecate{starred form of \protect\listof... command}{}}{}%
\ifthu at degree@bachelor
- \ifthu at backmatter\else
- \thu at warning{The list of figures should be placed in back matter}%
+ \ifthu at main@language at chinese
+ \thu at chapter*[]{\csname list#1name\endcsname}%
+ \else
+ \thu at chapter*{\csname list#1name\endcsname}%
\fi
+ \else
+ \ifthu at degree@graduate
+ \thu at chapter*{\csname list#1name\endcsname}%
+ \else
+ \thu at chapter*[]{\csname list#1name\endcsname}%
+ \fi
\fi
+ \@starttoc{\csname ext@#1\endcsname}%
+}
+\renewcommand\listoffigures{%
\thu at listof{figure}%
}
\titlecontents{figure}
[\z@]{}
- {\contentspush{\figurename~\thecontentslabel\quad}}{}
- {\nobreak\thu at leaders\nobreak\hfil\thecontentspage}
+ {\contentspush{\figurename~\thecontentslabel\thu at contents@label at delimiter}}{}
+ {\thu at leaders\thecontentspage}
\renewcommand\listoftables{%
- \ifthu at degree@bachelor
- \ifthu at backmatter\else
- \thu at warning{The list of tables should be placed in back matter}%
- \fi
- \fi
\thu at listof{table}%
}
\titlecontents{table}
[\z@]{}
- {\contentspush{\tablename~\thecontentslabel\quad}}{}
+ {\contentspush{\tablename~\thecontentslabel\thu at contents@label at delimiter}}{}
{\thu at leaders\thecontentspage}
\newcommand\listoffiguresandtables{%
\ifthu at degree@bachelor
- \thu at warning{The list of figures and tables are for graduates only}%
- \listoffigures
- \listoftables
+ \ifthu at main@language at chinese
+ \thu at chapter*[]{\thu at list@figure at table@name}%
+ \else
+ \thu at chapter*{\thu at list@figure at table@name}%
+ \fi
\else
- \thu at chapter*{\thu at list@figure at table@name}%
- \@starttoc{lof}%
- \par
- \null\par
- \@starttoc{lot}%
+ \ifthu at degree@graduate
+ \thu at chapter*{\thu at list@figure at table@name}%
+ \else
+ \thu at chapter*[]{\thu at list@figure at table@name}%
+ \fi
\fi
+ \@starttoc{lof}%
+ \par
+ \null\par
+ \@starttoc{lot}%
}
\def\ext at equation{loe}
\def\equcaption#1{%
+ \thu at deprecate{"\protect\equcaption" command}{}%
\addcontentsline{\ext at equation}{equation}%
{\protect\numberline{#1}}}
-\newcommand\listofequations{\thu at listof{equation}}
+\newcommand\listofequations{%
+ \thu at deprecate{"\protect\listofequations" command}{}%
+ \thu at listof{equation}%
+}
\titlecontents{equation}
[0pt]{\addvspace{6bp}}
- {\thu at equation@name~\thecontentslabel}{}
- {\nobreak\thu at leaders\nobreak\thecontentspage}
+ {\contentspush{\thu at equation@name~\thecontentslabel\thu at contents@label at delimiter}}{}
+ {\thu at leaders\thecontentspage}
\contentsuse{equation}{loe}
\thu at define@key{
cite-style = {
@@ -3513,18 +3419,18 @@
\fi}{#1}{#2}}
\renewcommand\bibsection{\thu at chapter*{\bibname}}
\newcommand\thu at set@bibliography at format{%
+ \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}%
+ \setlength{\bibsep}{3bp \@plus 3bp \@minus 3bp}%
\ifthu at degree@bachelor
- \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}%
- \setlength{\bibsep}{6bp \@plus 3bp \@minus 3bp}%
\ifthu at main@language at chinese
- \setlength{\bibhang}{21bp}%
+ \setlength{\bibhang}{1cm}%
\else
+ \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}%
+ \setlength{\bibsep}{6bp \@plus 3bp \@minus 3bp}%
\setlength{\bibhang}{0.5in}%
\fi
\else
- \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}%
- \setlength{\bibsep}{3bp \@plus 3bp \@minus 3bp}%
- \setlength{\bibhang}{21bp}%
+ \setlength{\bibhang}{1cm}%
\fi
}
\thu at set@bibliography at format
@@ -3570,19 +3476,19 @@
\DeclareRobustCommand\inlinecite{\parencite}
\defbibheading{bibliography}[\bibname]{\thu at chapter*{\bibname}}
\newcommand\thu at set@bibliography at format{%
+ \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}%
+ \setlength{\bibitemsep}{3bp \@plus 3bp \@minus 3bp}%
\ifthu at degree@bachelor
- \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}%
- \setlength{\bibitemsep}{6bp \@plus 3bp \@minus 3bp}%
\ifthu at main@language at chinese
- \setlength{\bibhang}{21bp}%
+ \setlength{\bibhang}{1cm}%
\else
+ \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}%
+ \setlength{\bibitemsep}{6bp \@plus 3bp \@minus 3bp}%
\setlength{\bibhang}{0.5in}%
\fi
\else
- \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}%
- \setlength{\bibitemsep}{3bp \@plus 3bp \@minus 3bp}%
\setlength{\biblabelsep}{0.1cm}%
- \setlength{\bibhang}{21bp}%
+ \setlength{\bibhang}{1cm}%
\fi
}
\thu at set@bibliography at format
@@ -3593,10 +3499,16 @@
\AtBeginDocument{
\thu at set@chapter at names
}
- \renewcommand\bibliographytypesize{\fontsize{10.5bp}{17bp}\selectfont}
- \setlength{\bibitemsep}{6bp}
+ \renewcommand\bibliographytypesize{\fontsize{10.5bp}{16bp}\selectfont}
+ \setlength{\bibitemsep}{3bp \@plus 3bp \@minus 3bp}%
+ \ifthu at degree@bachelor
+ \ifthu at main@language at english
+ \renewcommand\bibliographytypesize{\fontsize{10.5bp}{17bp}\selectfont}%
+ \setlength{\bibitemsep}{6bp \@plus 3bp \@minus 3bp}%
+ \fi
+ \fi
\ifthu at main@language at chinese
- \setlength{\bibleftmargin}{21bp}
+ \setlength{\bibleftmargin}{1cm}
\setlength{\bibindent}{-\bibleftmargin}
\else
\setlength{\bibleftmargin}{0.5in}
@@ -3612,11 +3524,6 @@
}
\g at addto@macro\appendix{%
\@mainmattertrue
- \ifthu at degree@bachelor
- \ifthu at statement@exists\else
- \thu at warning{The appendices should be placed after statement}%
- \fi
- \fi
}
\thu at define@key{
toc-depth = {
@@ -3730,15 +3637,18 @@
\AtEndDocument{\thu at end@appendix at ref@section}
\renewcommand\thu at set@survey at bibheading{%
\renewcommand\bibsection{%
- \par
- \vskip 20bp%
- \thu at pdfbookmark{1}{\bibname}%
\begingroup
- \centering
- \xiaosi[1.667]\bibname\par
+ \ctexset{
+ section = {
+ numbering = false,
+ format = \centering\normalsize,
+ beforeskip = 20pt,
+ afterskip = 4pt,
+ },
+ }%
+ \section{\bibname}%
\endgroup
- \vskip 6bp%
- }%
+ }
}%
% \let\@xtestdef\@gobbletwo % This doesn't work
\def\bibunits at rerun@warning{\relax}
@@ -3763,14 +3673,18 @@
}
\renewcommand\thu at set@survey at bibheading{%
\defbibheading{bibliography}[\bibname]{%
- \par
- \vskip 20bp%
- \thu at pdfbookmark{1}{\bibname}%
+ \vspace{20bp}%
\begingroup
- \centering
- \xiaosi[1.667]##1\par
+ \ctexset{
+ section = {
+ numbering = false,
+ format = \centering\normalsize,
+ beforeskip = 0pt,
+ afterskip = 0pt,
+ },
+ }%
+ \section{\bibname}%
\endgroup
- \vskip 6bp%
}%
}%
\def\bibliographystyle#1{%
@@ -3834,12 +3748,7 @@
\vskip 20bp%
}%
\let\appendix\thu at appendix@appendix
- \def\bibsection{%
- \begingroup
- \ctexset{section/numbering=false}%
- \section{\bibname}%
- \endgroup
- }%
+ \thu at set@survey at bibheading
\startcontents[translation]%
}{%
\stopcontents[translation]%
@@ -3901,18 +3810,18 @@
\@mainmatterfalse
\thu at end@appendix at ref@section
\thu at chapter*{\thu at resume@name}%
- \ctexset{
- section = {
- format += \centering,
- numbering = false,
- },
- }%
+ \ctexset{section/numbering = false}%
+ \ifthu at degree@bachelor
+ \ctexset{section/aftertitle = {:\@@par}}%
+ \else
+ \ctexset{section/format += \centering}%
+ \fi
\ifthu at language@chinese
\ctexset{
subsection = {
format = \sffamily\fontsize{14bp}{20bp}\selectfont,
numbering = false,
- aftertitle = :,
+ aftertitle = {:\@@par},
},
}%
\setlist[achievements]{
@@ -4008,22 +3917,24 @@
\fi
}
\newcommand{\record}[1]{%
- \let\thu at record@file\@empty
- \kv at define@key{thu at record}{file}{\let\thu at record@file\kv at value}%
- \kv at set@family at handler{thu at record}{%
- \ifx\kv at value\relax
- \let\thu at record@file\kv at key
- \else
- \kv at handled@false
+ \ifthu at degree@bachelor
+ \let\thu at record@file\@empty
+ \kv at define@key{thu at record}{file}{\let\thu at record@file\kv at value}%
+ \kv at set@family at handler{thu at record}{%
+ \ifx\kv at value\relax
+ \let\thu at record@file\kv at key
+ \else
+ \kv at handled@false
+ \fi
+ }%
+ \kvsetkeys{thu at record}{#1}%
+ \ifx\thu at record@file\@empty
+ \thu at error{File path of \protect\record\space is required}
\fi
- }%
- \kvsetkeys{thu at record}{#1}%
- \ifx\thu at record@file\@empty
- \thu at error{File path of \protect\record\space is required}
+ \clearpage
+ \thu at pdfbookmark{0}{综合论文训练记录表}%
+ \includepdf[pages=-]{\thu at record@file}%
\fi
- \cleardoublepage
- \thu at pdfbookmark{0}{综合论文训练记录表}%
- \includepdf[pages=-]{\thu at record@file}%
}
\PassOptionsToPackage{
linktoc = all,
@@ -4102,16 +4013,16 @@
\newcommand\thu at set@siunitx at language{%
\ifthu at language@chinese
\sisetup{
- list-final-separator = { 和 },
- list-pair-separator = { 和 },
- range-phrase = {~},
+ list-final-separator = {\TextOrMath{\space}{\ }\text{和}\TextOrMath{\space}{\ }},
+ list-pair-separator = {\TextOrMath{\space}{\ }\text{和}\TextOrMath{\space}{\ }},
+ range-phrase = {\text{~}},
}%
\else
\ifthu at language@english
\sisetup{
- list-final-separator = {, and },
- list-pair-separator = { and },
- range-phrase = { to },
+ list-final-separator = {\TextOrMath{\space}{\ }\text{and}\TextOrMath{\space}{\ }},
+ list-pair-separator = {\TextOrMath{\space}{\ }\text{and}\TextOrMath{\space}{\ }},
+ range-phrase = {\TextOrMath{\space}{\ }\text{to}\TextOrMath{\space}{\ }},
}%
\fi
\fi
@@ -4185,7 +4096,7 @@
\contentsuse{algorithm}{loa}
\titlecontents{algorithm}
[\z@]{}
- {\contentspush{\fname at algorithm~\thecontentslabel\quad}}{}
+ {\contentspush{\fname at algorithm~\thecontentslabel\thu at contents@label at delimiter}}{}
{\thu at leaders\thecontentspage}
}
\PassOptionsToPackage{algochapter}{algorithm2e}
@@ -4203,7 +4114,7 @@
\contentsuse{algocf}{loa}
\titlecontents{algocf}
[\z@]{}
- {\contentspush{\algorithmcfname~\thecontentslabel\quad}}{}
+ {\contentspush{\algorithmcfname~\thecontentslabel\thu at contents@label at delimiter}}{}
{\thu at leaders\thecontentspage}
}
\AtEndOfPackageFile*{minted}{
Deleted: trunk/Master/texmf-dist/tex/latex/thuthesis/tsinghua-name-bachelor.pdf
===================================================================
(Binary files differ)
More information about the tex-live-commits
mailing list.