pkuthss (4apr21)

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

5 files changed, 94 insertions, 31 deletions

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