pkuthss (4apr21)

git-svn-id: svn://tug.org/texlive/trunk@58729 c570f23f-e606-0410-a88d-b1316a301751

20 files changed, 281 insertions, 137 deletions

diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf
index ea1a631bda0..a548fbcc132 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example.pdf
+++ b/Master/texmf-dist/doc/latex/pkuthss/example.pdf
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex
index 305792f8360..ea215a83c13 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/abs.tex
@@ -1,12 +1,12 @@
-% Copyright (c) 2014,2016 Casper Ti. Vector
+% Copyright (c) 2014,2016,2021 Casper Ti. Vector
 % Public domain.
 
 \begin{cabstract}
 	\pkuthssffaq % 中文测试文字。
 \end{cabstract}
 
-\begin{eabstract}
+\ifblind\begin{beabstract}\else\begin{eabstract}\fi
 	Test of the English abstract.
-\end{eabstract}
+\ifblind\end{beabstract}\else\end{eabstract}\fi
 
 % vim:ts=4:sw=4
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex b/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex
index 49d25b54251..b4103f1bf41 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/example/chap/origin.tex
@@ -1,5 +1,6 @@
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2017 Casper Ti. Vector
+% Copyright (c) 2010-2017,2021 Casper Ti. Vector
+% Copyright (c) 2021 Kurapica
 % All rights reserved.
 %
 % Redistribution and use in source and binary forms, with or without
@@ -31,10 +32,11 @@
 	\ctexset{section = {
 		format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp}
 	}}
-
-	% 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码且编入了目录。
-	% 此处以 Word 模版为实际标准进行设定。
 	\specialchap{北京大学学位论文原创性声明和使用授权说明}
+
+	% 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码。
+	% 此处以学校书面要求为准。
+	\thispagestyle{empty}
 	\mbox{}\vspace*{-3em}
 	\section*{原创性声明}
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex
index 9c5f042cb4e..30bc89d1aa7 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/example/thesis.tex
@@ -1,5 +1,6 @@
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016,2018-2019 Casper Ti. Vector
+% Copyright (c) 2010-2016,2018-2019,2021 Casper Ti. Vector
+% Copyright (c) 2021 Kurapica
 % Public domain.
 %
 % 使用前请先仔细阅读 pkuthss 和 biblatex-caspervector 的文档，
@@ -9,6 +10,7 @@
 %   texdoc biblatex-caspervector
 % 调出。
 
+% 如果格式审查提示字号不严格符合标准，可以在 [] 中加入“ugly”选项。
 \documentclass[UTF8]{pkuthss}
 % 如果的确须要使脚注按页编号的话，可以去掉后面 footmisc 包的注释。
 %\usepackage[perpage]{footmisc}
@@ -18,6 +20,8 @@
 % 若须按照中文文献在前，西文文献在后排序，请设置“sorting = cenyt”；
 % 若须按照引用顺序排序，请设置“sorting = none”。
 % 若须在排序中实现更复杂的需求，请参考 biblatex-caspervector 的文档。
+% biblatex-caspervector 也有一个“ugly”选项，使其更像国标格式；此外也可考虑
+% 改用 style = gb7714-2015 并去掉之后两选项，详见 biblatex-gb7714-2015 的文档。
 \usepackage[backend = biber, style = caspervector, utf8, sorting = ecnyt]{biblatex}
 
 % 对于 linespread 值的计算过程有兴趣的同学可以参考 pkuthss.cls。
@@ -25,19 +29,26 @@
 % 按学校要求设定参考文献列表的段间距。
 \setlength{\bibitemsep}{3bp}
 
+% 如是双盲版论文，将 \blindfalse 改为 \blindtrue。后面可用
+% \ifblind 根据是否双盲来条件地启用代码（参见本文件后面部分）。
+\newif\ifblind\blindfalse
 % 设定文档的基本信息。
 \pkuthssinfo{
-	cthesisname = {博士研究生学位论文}, ethesisname = {Doctor Thesis},
-	ctitle = {测试文档}, etitle = {Test Document},
-	cauthor = {某某},
-	eauthor = {Test},
-	studentid = {0123456789},
-	date = {某年某月},
-	school = {某某学院},
+	cthesisname = {博士学位论文}, ethesisname = {Doctor Thesis},
+	thesiscover = {博士研究生学位论文},
+	% 长标题可用 \thssnl 强制换行，不能用“\\”（双盲版会出错）。
+	ctitle = {测试文档},
+	etitle = {Test Document},
+	cauthor = {某某}, eauthor = {Test}, date = {某年某月},
+	studentid = {0123456789}, school = {某某学院},
 	cmajor = {某某专业}, emajor = {Some Major},
 	direction = {某某方向},
 	cmentor = {某某教授}, ementor = {Prof.\ Somebody},
-	ckeywords = {其一，其二}, ekeywords = {First, Second}
+	ckeywords = {其一，其二},
+	ekeywords = {First, Second},
+	% 以下两项无双盲评审需求的用户可保持原状。
+	% 注意 discipline/major 分别指一/二级学科。
+	blindid = {9876543210}, discipline = {某某学科}
 }
 % 载入参考文献数据库（注意不要省略“.bib”）。
 \addbibresource{thesis.bib}
@@ -57,7 +68,9 @@
 
 	如果编译时不出参考文献，
 	请参考 \texttt{texdoc pkuthss}“问题及其解决”一章
-	“上游宏包可能引起的问题”一节中关于 biber 的说明。%
+	“上游宏包可能引起的问题”一节中关于 biber 的说明。
+
+	因无法假定用户使用哪种方式排版表格，用户须自行保证表格字号符合学校规定。%
 }
 
 \begin{document}
@@ -66,7 +79,7 @@
 	% 此后到下一 \pagestyle 命令之前不排版页眉或页脚。
 	\pagestyle{empty}
 	% 自动生成封面。
-	\maketitle
+	\ifblind\makeblind\else\maketitle\fi
 	% 版权声明。封面要求单面打印，故须新开右页。
 	\cleardoublepage
 	\include{chap/copy}
@@ -100,7 +113,7 @@
 	% 以下为正文之后的部分，默认不进行章节编号。
 	\backmatter
 	% 致谢。
-	\include{chap/ack}
+	\ifblind\else\include{chap/ack}\fi
 	% 原创性声明和使用授权说明。
 	\include{chap/origin}
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf
index 837e5264559..9d172c65547 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf
+++ b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
index aaf026bf9f1..1d7835cf92c 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
@@ -1,3 +1,19 @@
+2010-03-29, v1.9.0
+
+	* API changes:
+	- Add support for double-blind review (thank @Kurapikov).
+	- Add `\thesiscover' for possibly different thesis name on the cover.
+
+	* Changes to package code:
+	- Greatly improve format compliance (thank @Kurapikov).
+
+	* Changes to documentation:
+	- More notes about table font and GB/T 7714.
+	- Avoid undefined `\textepsilon'.
+
+	* Misc:
+	- Minor fixes and cosmetics.
+
 2020-11-02, v1.8.3
 
 	* Changes to example template:
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex
index 49d25b54251..b4103f1bf41 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/origin.tex
@@ -1,5 +1,6 @@
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2017 Casper Ti. Vector
+% Copyright (c) 2010-2017,2021 Casper Ti. Vector
+% Copyright (c) 2021 Kurapica
 % All rights reserved.
 %
 % Redistribution and use in source and binary forms, with or without
@@ -31,10 +32,11 @@
 	\ctexset{section = {
 		format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp}
 	}}
-
-	% 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码且编入了目录。
-	% 此处以 Word 模版为实际标准进行设定。
 	\specialchap{北京大学学位论文原创性声明和使用授权说明}
+
+	% 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码。
+	% 此处以学校书面要求为准。
+	\thispagestyle{empty}
 	\mbox{}\vspace*{-3em}
 	\section*{原创性声明}
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
index 453d56bb690..06d20323507 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2014 Casper Ti. Vector
+% Copyright (c) 2010-2014,2021 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -31,9 +31,9 @@
 	本文介绍了 pkuthss 文档模版所提供的功能。
 \end{cabstract}
 
-\begin{eabstract}
+\ifblind\begin{beabstract}\else\begin{eabstract}\fi
 	This document describes the the functions provided by
 	the pkuthss document template.
-\end{eabstract}
+\ifblind\end{beabstract}\else\end{eabstract}\fi
 
 % vim:ts=4:sw=4
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
index 2859463747f..cd2deb28e94 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2012,2015 Casper Ti. Vector
+% Copyright (c) 2010-2012,2015,2021 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -31,7 +31,8 @@
 
 感谢北大未名 BBS 上 MathTools 版和 Thesis 版诸位同学的支持。
 特别感谢 pkuthss 模版的最初创作者 solvethis 网友，
-以及不断地对 Casper 提出的诸多问题予以解答的 cauchy 网友 :)
+不断地对 Casper 提出的诸多问题予以解答的 cauchy 网友，
+以及在论文格式合规性和双盲版论文格式上有主要贡献的 Kurapica 网友~:)
 
 此外还要感谢 \parencite{pku-thesisstyle} 的作者，
 让我校在学位论文格式要求的繁复程度上离隔壁更近了一步，
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
index c7c1c75c184..5d2f91185b5 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2019 Casper Ti. Vector
+% Copyright (c) 2010-2019,2021 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -150,7 +150,7 @@
 \end{Verbatim}
 
 \section{pkuthss 文档类提供的命令和环境}
-\subsection{设定文档信息的命令}
+\subsection{设定文档信息的命令}\label{ssec:set-cmd}
 
 这一类命令的语法为
 \begin{Verbatim}
@@ -159,21 +159,29 @@
 
 这些命令总结如下：
 \begin{itemize}
-	\item \texttt{\bfseries\string\ctitle}：设定论文中文标题；
+	\item \texttt{\bfseries\string\ctitle}：设定论文中文标题\footnote{%
+		因为 pkuthss 内部实现机制的缘故，\myemph{双盲版论文的（中文和西文）
+		标题如须强制换行，必须使用 pkuthss 提供的 \texttt{\string\thssnl}
+		命令而非 \texttt{\string\\}}，否则会出错。%
+	}；
 	\item \texttt{\bfseries\string\etitle}：设定论文西文标题；
 	\item \texttt{\bfseries\string\cauthor}：设定作者的中文名；
 	\item \texttt{\bfseries\string\eauthor}：设定作者的西文名；
-	\item \texttt{\bfseries\string\studentid}：设定作者的学号；
 	\item \texttt{\bfseries\string\date}：设定日期；
+	\item \texttt{\bfseries\string\studentid}：设定作者的学号；
 	\item \texttt{\bfseries\string\school}：设定作者的学院名；
-	\item \texttt{\bfseries\string\cmajor}：设定作者专业的中文名；
-	\item \texttt{\bfseries\string\emajor}：设定作者专业的西文名；
+	\item \texttt{\bfseries\string\cmajor}：设定作者专业（二级学科）的中文名；
+	\item \texttt{\bfseries\string\emajor}：设定作者专业（二级学科）的西文名；
 	\item \texttt{\bfseries\string\direction}：设定作者的研究方向；
 	\item \texttt{\bfseries\string\cmentor}：设定导师的中文名；
 	\item \texttt{\bfseries\string\ementor}：设定导师的西文名；
 	\item \texttt{\bfseries\string\ckeywords}：设定中文关键词；
-	\item \texttt{\bfseries\string\ekeywords}：设定西文关键词。
+	\item \texttt{\bfseries\string\ekeywords}：设定西文关键词；
+	\item \texttt{\bfseries\string\blindid}：设定论文编号（双盲评审用）；
+	\item \texttt{\bfseries\string\discipline}：设定一级学科（双盲评审用）。
 \end{itemize}
+排版双盲版论文时除了要去掉致谢等章节、隐去论文中其它可能泄露个人信息的部分外，
+还应注意在排版封面时须使用 \verb|\makeblind| 而非 \verb|\maketitle| 命令。
 
 例如，如果要设定专业为“化学”（“Chemistry”），则可以使用以下命令：
 \begin{Verbatim}
@@ -195,16 +203,20 @@
 	\item \texttt{\bfseries\string\euniversity}：大学的西文名。
 	\item \texttt{\bfseries\string\cthesisname}：论文类别的中文名。
 	\item \texttt{\bfseries\string\ethesisname}：论文类别的西文名。
+	\item \texttt{\bfseries\string\thesiscover}：封面显示的论文类别\footnote{%
+		出于兼容性的考虑，如果 \texttt{\string\thesiscover} 为空，
+		那么封面将显示 \texttt{\string\cthesisname}。%
+	}。
 	\item \texttt{\bfseries\string\cabstractname}：摘要的中文标题。
 	\item \texttt{\bfseries\string\eabstractname}：摘要的西文标题。
 \end{itemize}
 
-例如，
-如果要设定论文的类别为“本科生毕业论文”（“Undergraduate Thesis”），
-则可以使用以下命令：
+例如，如果要设定论文的类别为“博士学位论文”（“Doctor Thesis”），
+但封面要显示“博士研究生学位论文”，则可以使用以下命令：
 \begin{Verbatim}
-\renewcommand{\cthesisname}{本科生毕业论文}
-\renewcommand{\ethesisname}{Undergraduate Thesis}
+\renewcommand{\cthesisname}{博士学位论文}
+\renewcommand{\ethesisname}{Doctor Thesis}
+\renewcommand{\thesiscover}{博士研究生学位论文}
 \end{Verbatim}
 
 \subsection{以“key = value”格式设置文档信息}
@@ -235,8 +247,8 @@
 
 \subsection{其它命令和环境}\label{ssec:misc}
 
-\texttt{\bfseries cabstract} 和 \texttt{\bfseries eabstract}
-环境用于编写中西文摘要。
+\texttt{\bfseries cabstract} 和 \texttt{\bfseries eabstract} 环境用于编写
+中西文摘要；\texttt{\bfseries beabstract} 环境用于编写双盲评审版的西文摘要。
 用户只须要写摘要的正文；标题、作者、导师、专业等部分会自动生成。
 
 \texttt{\bfseries\string\specialchap} 命令
@@ -258,6 +270,9 @@
 此时就须要在设定完文档信息之后调用 \verb|\setpdfproperties|。%
 \myemph{注意：须要启用 \texttt{pdfprop} 选项才能使用此命令。}
 
+\texttt{\bfseries\string\thssnl} 命令用于在双盲版论文的（中文和西文）标题中
+强制换行，见第 \ref{ssec:set-cmd} 小节中关于 \verb|\ctitle| 说明的脚注。
+
 \section{从其它文档类和宏包继承的功能}\label{sec:thirdparty}
 
 pkuthss 文档类建立在 ctexbook\cupercite{ctex} 文档类之上，
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
index 0fbd72bd473..b5482a08eb5 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2019 Casper Ti. Vector
+% Copyright (c) 2010-2019,2021 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -33,6 +33,9 @@
 文档默认情况下是双面模式，章末可能产生空白页，
 解决方式见第 \ref{sec:options} 节。
 
+双盲版论文的（中文和西文）标题只能使用 pkuthss 提供的
+\verb|\thssnl| 命令而非 \verb|\\| 换行，见第 \ref{sec:options} 节。
+
 通过一些设置，还可以满足例如被引用的文献按照引用顺序排序，
 而未引用的文献按照西文文献在前、中文文献在后排序这样的需求，
 见第 \ref{sec:thirdparty} 节。
@@ -97,14 +100,20 @@ data source .../par-xxxxxxxx/cache-xxxxxxxx/
 
 \section{文档格式可能存在的问题}
 
-学校对学位论文格式的规定\cupercite{pku-thesisstyle}%
-显然没有考虑到非 MS Word 类排版工具的工作方式，
+目前在 \hologo{LaTeX} 中似乎没有一个可以很好地替代其它各类似宏包的
+用于排版表格的宏包，而 pkuthss 文档模版的作者也无意假定用户使用
+某一个宏包，因此模版并未尝试设定表格的默认字号，\myemph{用户
+须自行按学校规定\cupercite{pku-thesisstyle}进行设置}。
+
+学校对学位论文格式的规定显然没有考虑到非 MS Word 类排版工具的工作方式，
 因此 pkuthss 文档模版只是对其要求的格式进行模仿，
 而在一些小的细节上可能有所出入。
 
-biblatex-caspervector\cupercite{biblatex-caspervector} 所实现的格式和
-\parencite{pku-thesisstyle} 的规定并不一致，
-但其作者暂时没有精力也不愿意去实现后者所规定的比原格式更丑陋得多的格式。
+biblatex-caspervector\cupercite{biblatex-caspervector}
+所实现的格式和 \parencite{pku-thesisstyle} 的规定并不一致，
+但其作者没有精力也不愿意去实现后者所规定的比原格式更丑陋得多的格式。
+国标 GB/T 7714-2015 现在已经有了 biblatex-gb7714-2015%
+\cupercite{biblatex-gb7714-2015} 这一 biblatex 实现，用户也可以考虑使用。
 
 \section{反馈意见和建议}
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
index 68d86f34dee..e9cecd08d37 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
@@ -32,7 +32,9 @@
 
 版权所有 \copyright\ 2008--2009 solvethis
 \par
-版权所有 \copyright\ 2010--2019 Casper Ti. Vector
+版权所有 \copyright\ 2010--2021 Casper Ti. Vector
+\par
+版权所有 \copyright\ 2021 Kurapica
 \vskip 1em
 
 pkuthss 文档类及其说明文档均以 \hologo{LaTeX} Project Public License 发布。
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch
index ee9cadcad27..40b508c77c6 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss-english.patch
@@ -1,5 +1,5 @@
 diff --git a/doc/example/chap/abs.tex b/doc/example/chap/abs.tex
-index 305792f..cfa6cd3 100644
+index dcffe0e..8fd046f 100644
 --- a/doc/example/chap/abs.tex
 +++ b/doc/example/chap/abs.tex
 @@ -2,7 +2,7 @@
@@ -10,7 +10,7 @@ index 305792f..cfa6cd3 100644
 +	中文摘要。
  \end{cabstract}
  
- \begin{eabstract}
+ \ifblind\begin{beabstract}\else\begin{eabstract}\fi
 diff --git a/doc/example/chap/ack.tex b/doc/example/chap/ack.tex
 index 4af4d39..09de33d 100644
 --- a/doc/example/chap/ack.tex
@@ -100,10 +100,10 @@ index ac5b0c9..9d2ad60 100644
 -
  % vim:ts=4:sw=4
 diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex
-index 9c5f042..a54d01f 100644
+index 0009fe6..3f2d945 100644
 --- a/doc/example/thesis.tex
 +++ b/doc/example/thesis.tex
-@@ -12,54 +12,44 @@
+@@ -14,36 +14,42 @@
  \documentclass[UTF8]{pkuthss}
  % 如果的确须要使脚注按页编号的话，可以去掉后面 footmisc 包的注释。
  %\usepackage[perpage]{footmisc}
@@ -113,6 +113,8 @@ index 9c5f042..a54d01f 100644
 -% 若须按照中文文献在前，西文文献在后排序，请设置“sorting = cenyt”；
 -% 若须按照引用顺序排序，请设置“sorting = none”。
 -% 若须在排序中实现更复杂的需求，请参考 biblatex-caspervector 的文档。
+-% biblatex-caspervector 也有一个“ugly”选项，使其更像国标格式；此外也可考虑
+-% 改用 style = gb7714-2015 并去掉之后两选项，详见 biblatex-gb7714-2015 的文档。
 -\usepackage[backend = biber, style = caspervector, utf8, sorting = ecnyt]{biblatex}
 +% 使用 biblatex 排版参考文献，并规定其格式（详见 biblatex 的文档）。
 +\usepackage[backend = biber]{biblatex}
@@ -136,27 +138,32 @@ index 9c5f042..a54d01f 100644
 +	chapter/number = {\thechapter},
 +}
 +
+ % 如是双盲版论文，将 \blindfalse 改为 \blindtrue。后面可用
+ % \ifblind 根据是否双盲来条件地启用代码（参见本文件后面部分）。
+ \newif\ifblind\blindfalse
  % 设定文档的基本信息。
  \pkuthssinfo{
--	cthesisname = {博士研究生学位论文}, ethesisname = {Doctor Thesis},
--	ctitle = {测试文档}, etitle = {Test Document},
--	cauthor = {某某},
+-	cthesisname = {博士学位论文}, ethesisname = {Doctor Thesis},
+-	thesiscover = {博士研究生学位论文},
 +	ethesisname = {Doctor Thesis},
-+	etitle = {Test Document},
- 	eauthor = {Test},
- 	studentid = {0123456789},
--	date = {某年某月},
--	school = {某某学院},
+ 	% 长标题可用 \thssnl 强制换行，不能用“\\”（双盲版会出错）。
+-	ctitle = {测试文档},
+ 	etitle = {Test Document},
+-	cauthor = {某某}, eauthor = {Test}, date = {某年某月},
+-	studentid = {0123456789}, school = {某某学院},
 -	cmajor = {某某专业}, emajor = {Some Major},
 -	direction = {某某方向},
 -	cmentor = {某某教授}, ementor = {Prof.\ Somebody},
-+	date = {Some Date},
++	eauthor = {Test},
++	date = {Month Year}, studentid = {0123456789},
 +	school = {Some School},
 +	emajor = {Some Major},
 +	direction = {Some Direction},
 +	ementor = {Prof.\ Somebody},
- 	ckeywords = {其一，其二}, ekeywords = {First, Second}
- }
+ 	ckeywords = {其一，其二},
+ 	ekeywords = {First, Second},
+ 	% 以下两项无双盲评审需求的用户可保持原状。
+@@ -53,26 +59,6 @@
  % 载入参考文献数据库（注意不要省略“.bib”）。
  \addbibresource{thesis.bib}
  
@@ -175,18 +182,20 @@ index 9c5f042..a54d01f 100644
 -
 -	如果编译时不出参考文献，
 -	请参考 \texttt{texdoc pkuthss}“问题及其解决”一章
--	“上游宏包可能引起的问题”一节中关于 biber 的说明。%
+-	“上游宏包可能引起的问题”一节中关于 biber 的说明。
+-
+-	因无法假定用户使用哪种方式排版表格，用户须自行保证表格字号符合学校规定。%
 -}
 -
  \begin{document}
  	% 以下为正文之前的部分，默认不进行章节编号。
  	\frontmatter
 diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def
-index 9bc6000..7650e53 100644
+index d968f90..f99a891 100644
 --- a/tex/pkuthss-utf8.def
 +++ b/tex/pkuthss-utf8.def
-@@ -25,13 +25,13 @@
- 	[2019/11/17 v1.8.2 Labels and captions in UTF-8 encoding
+@@ -26,13 +26,13 @@
+ 	[2020/11/02 v1.8.3 Labels and captions in UTF-8 encoding
  		for the pkuthss document class]
  
 -\def\label@ctitle{题目：}
@@ -207,10 +216,10 @@ index 9bc6000..7650e53 100644
  \def\label@ckeywords{关键词：}
  \def\label@ekeywords{KEYWORDS:\ }
 diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls
-index e34fe2d..477b3f4 100644
+index 4499528..e6311cb 100644
 --- a/tex/pkuthss.cls
 +++ b/tex/pkuthss.cls
-@@ -304,7 +304,7 @@
+@@ -317,7 +317,7 @@
  	\fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
  	\fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
  	\if@twoside
@@ -219,23 +228,24 @@ index e34fe2d..477b3f4 100644
  		\fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
  	\else
  		\fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
-@@ -350,13 +350,13 @@
- 			\zihao{1}%
- 			\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
- 			\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
--			{\bfseries{\cthesisname}}%
-+			{\bfseries{\ethesisname}}%
+@@ -367,14 +367,14 @@
+ 				\zihao{1}\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
+ 				\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
+ 			\fi%
+-			{\bfseries\ifx\thesiscover\empty{\cthesisname}\else{\thesiscover}\fi}%
++			{\bfseries\ethesisname}%
  		}
  		\vfill
  		% Title of the thesis.
  		{%
- 			\zihao{2}{\label@ctitle}\linespread{1.6}\selectfont%
+ 			\ifthss@opt@ugly\zihao{-1}\else\zihao{2}\fi%
+ 			\linespread{1.6}\selectfont{\label@ctitle}%
 -			\thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}%
 +			\thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@etitle}}%
  		}
  		\vfill
  		% Information about the author.
-@@ -364,19 +364,19 @@
+@@ -382,19 +382,19 @@
  			% Slightly adjust the line skip when using new font size.
  			\zihao{3}\linespread{1.75}\selectfont
  			\def\thss@tmp@len{0.56\textwidth}
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
index 3404e2a59a8..3f4adbe05fb 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2019 Casper Ti. Vector
+% Copyright (c) 2010-2021 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -30,7 +30,7 @@
 @online{amsthm,
 	author = {{Publications Technical Group, American Mathematical Society}},
 	title = {Using the amsthm Package},
-	edition = {Ver.\ 2.20.3},
+	edition = {Ver.~2.20.3},
 	type = {M/OL},
 	date = {2017-09},
 	url = {https://ctan.org/pkg/amsthm},
@@ -41,7 +41,7 @@
 @online{biber,
 	author = {Kime, Philip and Charette, Fran\c{c}ois},
 	title = {Biber: A backend bibliography processor for biblatex},
-	edition = {Ver.\ 2.7},
+	edition = {Ver.~2.7},
 	type = {M/OL},
 	date = {2016-12-05},
 	url = {https://ctan.org/pkg/biber},
@@ -52,7 +52,7 @@
 @online{biblatex,
 	author = {Lehman, Philipp},
 	title = {The biblatex Package: Programmable Bibliographies and Citations},
-	edition = {Ver.\ 3.7},
+	edition = {Ver.~3.7},
 	type = {M/OL},
 	date = {2016-11-16},
 	url = {https://ctan.org/pkg/biblatex},
@@ -63,7 +63,7 @@
 @online{biblatex-caspervector,
 	author = {Vector, Casper Ti.},
 	title = {biblatex 参考文献和引用样式：caspervector},
-	edition = {Ver.\ 0.3.3},
+	edition = {Ver.~0.3.3},
 	type = {M/OL},
 	date = {2018-06-29},
 	url = {https://ctan.org/pkg/biblatex-caspervector},
@@ -71,6 +71,17 @@
 	language = {chinese},
 }
 
+@online{biblatex-gb7714-2015,
+	author = {胡振震},
+	title = {符合 GB/T 7714-2015 标准的 biblatex 参考文献样式},
+	edition = {Ver.~0.1w},
+	type = {M/OL},
+	date = {2021-01-19},
+	url = {https://ctan.org/pkg/biblatex-gb7714-2015},
+	urldate = {2021-03-04},
+	language = {chinese},
+}
+
 @online{caption,
 	author = {Sommerfeldt, Alex},
 	title = {Customizing captions of floating environments},
@@ -84,7 +95,7 @@
 @online{ctex,
 	author = {{ctex.org}},
 	title = {\CTeX 宏集手册},
-	edition = {Ver.\ 2.4.8},
+	edition = {Ver.~2.4.8},
 	type = {M/OL},
 	date = {2017-02-23},
 	url = {https://ctan.org/pkg/ctex},
@@ -105,7 +116,7 @@
 @online{fancyhdr,
 	author = {van Oostrum, Piet},
 	title = {Page layout in \hologo{LaTeX}},
-	edition = {Ver.\ 3.8},
+	edition = {Ver.~3.8},
 	type = {M/OL},
 	date = {2016-09-06},
 	url = {https://ctan.org/pkg/fancyhdr},
@@ -116,7 +127,7 @@
 @online{geometry,
 	author = {Umeki, Hideo},
 	title = {The geometry package},
-	edition = {Ver.\ 5.6},
+	edition = {Ver.~5.6},
 	type = {M/OL},
 	date = {2010-09-12},
 	url = {https://ctan.org/pkg/geometry},
@@ -137,7 +148,7 @@
 @online{hyperref,
 	author = {Rahtz, Sebastian and Oberdiek, Heiko},
 	title = {Hypertext marks in \hologo{LaTeX}: a manual for hyperref},
-	edition = {Ver.\ 6.82q},
+	edition = {Ver.~6.82q},
 	type = {M/OL},
 	date = {2012-11},
 	url = {https://ctan.org/pkg/hyperref},
@@ -148,7 +159,7 @@
 @online{latexsym,
 	author = {Mittelbach, Frank},
 	title = {The \hologo{LaTeX} symbol fonts for use with \hologo{LaTeX2e}},
-	edition = {Ver.\ 2.2e},
+	edition = {Ver.~2.2e},
 	type = {M/OL},
 	date = {1998-08-17},
 	url = {https://ctan.org/tex-archive/macros/latex/base},
@@ -179,7 +190,7 @@
 @online{subcaption,
 	author = {Sommerfeldt, Alex},
 	title = {The subcaption package},
-	edition = {Ver.\ 1.1-75},
+	edition = {Ver.~1.1-75},
 	type = {M/OL},
 	date = {2013-04-16},
 	url = {https://ctan.org/pkg/subcaption},
@@ -200,7 +211,7 @@
 @online{tocloft,
 	author = {Robertson, Will},
 	title = {The tocloft package},
-	edition = {Ver.\ 2.3f},
+	edition = {Ver.~2.3f},
 	type = {M/OL},
 	date = {2013-05-02},
 	url = {https://ctan.org/pkg/tocloft},
@@ -281,7 +292,7 @@
 @online{pku-thesisstyle,
 	author = {北京大学学位办公室},
 	title = {北京大学研究生学位论文写作指南},
-	edition = {Ver.\ 2.0},
+	edition = {Ver.~2.0},
 	type = {M/OL},
 	date = {2015-06-11},
 	url = {http://grs.pku.edu.cn/document/20150611115317661150.pdf},
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
index 522ebd9d549..83057208418 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016,2018-2019 Casper Ti. Vector
+% Copyright (c) 2010-2016,2018-2019,2021 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -50,31 +50,31 @@
 	tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}
 }
 
-\newcommand*{\docversion}{v1.8.3}
+\newif\ifblind\blindfalse
+\newcommand*{\docversion}{v1.9.0}
 \pkuthssinfo{
 	cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
-	ctitle = {北京大学学位论文模版\\pkuthss \docversion},
+	ctitle = {北京大学学位论文模版{\thssnl}pkuthss \docversion},
 	etitle = {%
-		PKU dissertation document class\texorpdfstring{\\}{: }%
-		pkuthss \docversion%
+		PKU dissertation document class%
+		\texorpdfstring{\thssnl}{: }pkuthss \docversion%
 	},
-	cauthor = {盖茨波·钛·维克托},
-	eauthor = {Casper Ti.\ Vector},
-	studentid = {00910???},
-	date = {\zhdigits{2020}年\zhnumber{11}月},
-	school = {化学与分子工程学院},
-	cmajor = {化学（？）}, emajor = {Chemistry ... ?},
+	cauthor = {盖茨波·钛·维克托}, eauthor = {Casper Ti.\ Vector},
+	date = {\zhdigits{2021}年\zhnumber{3}月},
+	studentid = {00910???}, school = {化学与分子工程学院},
+	cmajor = {应用化学}, emajor = {Applied Chemistry},
 	direction = {据说 Casper 自己也不知道},
 	cmentor = {XX 教授}, ementor = {Prof.\ XX},
-	ckeywords = {\hologo{LaTeX2e}，排版，文档类，\CTeX{}},
-	ekeywords = {\hologo{LaTeX2e}, Typesetting, Document class, \CTeX{}}
+	ckeywords = {\hologo{LaTeX}，排版，文档类，\CTeX{}},
+	ekeywords = {\hologo{LaTeX}, Typesetting, Document class, \CTeX{}},
+	blindid = {???01900}, discipline = {化学}
 }
 \addbibresource{pkuthss.bib}
 
 \begin{document}
 	\frontmatter
 	\pagestyle{empty}
-	\maketitle
+	\ifblind\makeblind\else\maketitle\fi
 	\cleardoublepage
 	\include{chap/pkuthss-copy}
 
@@ -97,7 +97,7 @@
 	\include{chap/pkuthss-encl1}
 
 	\backmatter
-	\include{chap/pkuthss-ack}
+	\ifblind\else\include{chap/pkuthss-ack}\fi
 	\include{chap/origin}
 \end{document}
 
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
index 03850ac253a..bf9659a6928 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index caf9986940a..28eb1ade7e6 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
@@ -1,7 +1,8 @@
 % Peking University dissertation document class
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2013,2015 Casper Ti. Vector
+% Copyright (c) 2010-2013,2015,2021 Casper Ti. Vector
+% Copyright (c) 2021 Kurapica
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -22,7 +23,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-gbk.def}
-	[2020/11/02 v1.8.3 Labels and captions in GBK encoding
+	[2021/03/29 v1.9.0 Labels and captions in GBK encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{��Ŀ��}
@@ -35,12 +36,19 @@
 \def\label@ementor{Directed by\ }
 \def\label@ckeywords{�ؼ��ʣ�}
 \def\label@ekeywords{KEYWORDS:\ }
+\def\label@blindcover{�������������ķ��棩}
+\def\label@blindctitle{������Ŀ��}
+\def\label@blindetitle{Ӣ����Ŀ��}
+\def\label@blinddiscipline{һ��ѧ�ƣ�}
+\def\label@blindmajor{����ѧ�ƣ�}
+\def\label@blindid{���ı�ţ�}
 
 \def\titlepagename{����}
 \def\cuniversity{������ѧ}
 \def\euniversity{Peking University}
-\def\cthesisname{��ʿ�о���ѧλ����}
+\def\cthesisname{��ʿѧλ����}
 \def\ethesisname{Doctor Thesis}
+\def\thesiscover{}
 \def\cabstractname{ժҪ}
 \def\eabstractname{ABSTRACT}
 
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
index a5f27221602..6ab9dc0ec8d 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
@@ -1,7 +1,8 @@
 % Peking University dissertation document class
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2013,2015 Casper Ti. Vector
+% Copyright (c) 2010-2013,2015,2021 Casper Ti. Vector
+% Copyright (c) 2021 Kurapica
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -22,7 +23,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-utf8.def}
-	[2020/11/02 v1.8.3 Labels and captions in UTF-8 encoding
+	[2021/03/29 v1.9.0 Labels and captions in UTF-8 encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{题目：}
@@ -35,12 +36,19 @@
 \def\label@ementor{Directed by\ }
 \def\label@ckeywords{关键词：}
 \def\label@ekeywords{KEYWORDS:\ }
+\def\label@blindcover{（匿名评阅论文封面）}
+\def\label@blindctitle{中文题目：}
+\def\label@blindetitle{英文题目：}
+\def\label@blinddiscipline{一级学科：}
+\def\label@blindmajor{二级学科：}
+\def\label@blindid{论文编号：}
 
 \def\titlepagename{封面}
 \def\cuniversity{北京大学}
 \def\euniversity{Peking University}
-\def\cthesisname{博士研究生学位论文}
+\def\cthesisname{博士学位论文}
 \def\ethesisname{Doctor Thesis}
+\def\thesiscover{}
 \def\cabstractname{摘要}
 \def\eabstractname{ABSTRACT}
 
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
index 0a021b8bd75..2abf2d72fb8 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -1,7 +1,8 @@
 % Peking University dissertation document class
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2019 Casper Ti. Vector
+% Copyright (c) 2010-2021 Casper Ti. Vector
+% Copyright (c) 2021 Kurapica
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -23,7 +24,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{pkuthss}
-	[2020/11/02 v1.8.3 Peking University dissertation document class]
+	[2021/03/29 v1.9.0 Peking University dissertation document class]
 
 % eg. `\thss@int@boolopt{spacing}{true}' will expand to:
 %   \newif\ifthss@opt@spacing \thss@opt@spacingtrue
@@ -113,11 +114,11 @@
 \ifthss@opt@pkufoot
 	% Handle the `Unparsed material' issue with latex/dvipdfmx compilation.
 	\unless\ifxetex\unless\ifpdf
-		\newcommand*\pgfsysdriver{pgfsys-dvipdfm.def}
+		\newcommand*{\pgfsysdriver}{pgfsys-dvipdfm.def}
 	\fi\fi
 	% Circled text, cf. <https://tex.stackexchange.com/questions/7032/>.
 	\RequirePackage{tikz}
-	\newcommand*\thss@int@circled[1]{%
+	\newcommand*{\thss@int@circled}[1]{%
 		\scalebox{0.8}{\tikz[baseline = (char.base)]{
 			\node[
 				shape = circle, draw = black, minimum size = 1.25em, inner sep = 0pt
@@ -150,9 +151,14 @@
 	% `tocloft'; it clashes with `subfigure'/`subfig', but the error message will
 	% say they cannot be used simultaneously.
 	\RequirePackage{caption, subcaption}
-	\DeclareCaptionFont{cfive}{\zihao{5}}
+	\ifthss@opt@ugly
+		\DeclareCaptionFont{capfsize}{\fontsize{11bp}{13.2bp}}
+	\else
+		\DeclareCaptionFont{capfsize}{\zihao{5}}
+	\fi
 	\DeclareCaptionLabelSeparator{quad}{\quad}
-	\captionsetup{font = cfive, labelsep = quad}
+	\captionsetup{font = capfsize, labelsep = quad}
+	\captionsetup[sub]{font = capfsize}
 \fi
 
 \ifthss@opt@spacing
@@ -235,20 +241,27 @@
 \thss@int@infoitema{ementor}
 \thss@int@infoitema{ckeywords}
 \thss@int@infoitema{ekeywords}
+\thss@int@infoitema{blindid}
+\thss@int@infoitema{discipline}
 \thss@int@infoitemb{cuniversity}
 \thss@int@infoitemb{euniversity}
 \thss@int@infoitemb{cthesisname}
 \thss@int@infoitemb{ethesisname}
+\thss@int@infoitemb{thesiscover}
 \thss@int@infoitemb{cabstractname}
 \thss@int@infoitemb{eabstractname}
 % Set up document information using the `key = value' grammar.
 \newcommand*{\pkuthssinfo}[1]{\setkeys{thss@info}{#1}}
+% Becomes \newline in the \makeblind scope.
+\newcommand{\thssnl}{\\}
 
 % Set up page layout.
-\geometry{
-	a4paper, hmargin = 2.6cm, top = 2.92cm, bottom = 3.03cm,
-	headheight = 0.45cm, headsep = 0.59cm, footskip = 1.05cm
-}
+\geometry{a4paper, hmargin = 2.6cm, headheight = 0.5cm, headsep = 0.6cm}
+\ifthss@opt@ugly
+	\geometry{top = 3.1cm, bottom = 3.0cm, footskip = 0.8cm}
+\else
+	\geometry{top = 3.0cm, bottom = 3.1cm, footskip = 1.1cm}
+\fi
 
 % Set up chapter/section/... captions.
 % The `*skip' values are not supposed to be modified by the `ugly' option:
@@ -258,29 +271,29 @@
 \setcounter{secnumdepth}{3}
 \setcounter{tocdepth}{2}
 \ctexset{
-	chapter = {
-		beforeskip = {0bp}, afterskip = {18bp plus 0.2ex},
-		nameformat = {}, titleformat = {}
-	}, section =
+	chapter = {beforeskip = {0bp}, afterskip = {18bp plus 0.2ex}},
+	section =
 		{beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}},
 	subsection =
 		{beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}},
 	subsubsection =
 		{beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}}
 }
+\ctexset{
+	chapter = {nameformat = {}, titleformat = {}},
+	subsubsection = {format = {\zihao{-4}\bfseries}}
+}
 \ifthss@opt@ugly
 	\ctexset{
 		chapter = {format = {\zihao{3}\bfseries\centering}},
 		section = {format = {\zihao{4}\bfseries}},
-		subsection = {format = {\fontsize{13bp}{15.6bp}\selectfont\bfseries}},
-		subsubsection = {format = {\zihao{-4}\bfseries}}
+		subsection = {format = {\fontsize{13bp}{15.6bp}\selectfont\bfseries}}
 	}
 \else
 	\ctexset{
 		chapter = {format = {\zihao{-2}\bfseries\centering}},
 		section = {format = {\zihao{-3}\bfseries}},
-		subsection = {format = {\zihao{4}\bfseries}},
-		subsubsection = {format = {\bfseries}}
+		subsection = {format = {\zihao{4}\bfseries}}
 	}
 \fi
 
@@ -344,18 +357,23 @@
 \renewcommand{\maketitle}{%
 	\thss@int@pdfmark{\titlepagename}{titlepage}
 	% Make the title page centered.
-	\begin{titlepage}\begingroup\centering
+	\begin{titlepage}\centering
 		% Emblem and inscription of the university, and type of thesis.
 		{%
-			\zihao{1}%
-			\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
-			\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
-			{\bfseries{\cthesisname}}%
+			\ifthss@opt@ugly%
+				\zihao{-0}\includegraphics[height = 1.9em]{pkulogo}\hspace{0.3em}%
+				\raisebox{0.32em}{\includegraphics[height = 1.3em]{pkuword}}\\[0.5em]
+			\else%
+				\zihao{1}\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
+				\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
+			\fi%
+			{\bfseries\ifx\thesiscover\empty{\cthesisname}\else{\thesiscover}\fi}%
 		}
 		\vfill
 		% Title of the thesis.
 		{%
-			\zihao{2}{\label@ctitle}\linespread{1.6}\selectfont%
+			\ifthss@opt@ugly\zihao{-1}\else\zihao{2}\fi%
+			\linespread{1.6}\selectfont{\label@ctitle}%
 			\thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}%
 		}
 		\vfill
@@ -382,7 +400,27 @@
 		\vfill
 		% Date.
 		{\ifthss@opt@ugly\zihao{3}\else\zihao{-2}\fi\@date}
-	\par\endgroup\end{titlepage}%
+	\par\end{titlepage}%
+}
+
+% Typeset the title page for double-blind review.
+\newcommand{\makeblind}{%
+	\thss@int@pdfmark{\titlepagename}{titlepage}
+	\begin{titlepage}\renewcommand{\thssnl}{\newline}
+		\centering\zihao{3}\selectfont\fangsong\vspace*{0.5cm}
+		{\zihao{-0}\heiti\cuniversity\cthesisname}\\[0.36\baselineskip]
+		{\zihao{-2}\fangsong\label@blindcover}%
+		\par\vspace{4\baselineskip}
+		\renewcommand{\arraystretch}{1.25}
+		\begin{tabular}{lp{0.75\textwidth}}
+			\label@blindctitle	&	{\@ctitle}	\\
+			\label@blindetitle	&	{\@etitle}	\\\\
+			\label@blinddiscipline	&	{\@discipline}	\\
+			\label@blindmajor	&	{\@cmajor}	\\
+			\label@blindid	&	{\@blindid}	\\
+		\end{tabular}\par\vfill
+		{\@date}\par\vspace*{0.5cm}
+	\end{titlepage}%
 }
 
 % Typeset the Chinese abstract.
@@ -406,5 +444,14 @@
 	\vfill\noindent\textbf{\label@ekeywords}{\@ekeywords}%
 }
 
+% Typeset the English abstract for double-blind review.
+\newenvironment{beabstract}{%
+	\thss@int@pdfmark{\eabstractname}{eabstract}
+	\chapter*{\sffamily\@etitle}\markboth{\eabstractname}{}
+	\begin{center}\textbf{\sffamily\eabstractname}\end{center}\par%
+}{% Keywords at the bottom of the page.
+	\vfill\noindent\textbf{\label@ekeywords}{\@ekeywords}%
+}
+
 \endinput
 % vim:ft=tex:ts=2:sw=2
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
index 5884b8efd3b..58b5193f46f 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf