pkuthss (24may16)

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

12 files changed, 85 insertions, 44 deletions

diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf
index 3fc96cbb807..2fe6104c540 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/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf
index d8b2fd2a930..0f348112b26 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
index a88eb3db074..cc9e535e3f6 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
@@ -1,3 +1,17 @@
+2016-05-24, v1.7.3
+
+	* Changes to package code:
+	- Replace subfig with subcaption.
+	- pkuthss.cls: fix `PDF destination not defined' regression.
+	- pkuthss.cls: add code in case the font size infractions get caught.
+
+	* Changes to documentation:
+	- pkuthss-chap2.tex: add hint about copying internal files before changes.
+	- Sanitise the README bibliography.
+
+	* Misc:
+	- Minor fixes and cosmetics.
+
 2016-03-22, v1.7.2
 
 	* Changes to documentation:
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
index 862e02e7dcd..d22d2503315 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
@@ -33,7 +33,7 @@
 \begin{itemize}
 	\item 一个基本的 \hologo{TeX} 发行版。
 	\item CJK 或 XeCJK（供 \hologo{XeLaTeX} 使用）宏包。
-	\item ctex\supercite{ctex,ctex-faq} 宏包（提供了 ctexbook 文档类）。
+	\item ctex\supercite{ctex} 宏包（提供了 ctexbook 文档类）。
 	\item 中文字体。
 	\item 如果要使用 biblatex 进行文献列表和引用的排版的话，
 		还需要 biblatex\supercite{biblatex} 宏包；
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 a2906aa3d08..e49f1fc040f 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
@@ -290,7 +290,7 @@ pkuthss 文档模版使用作者编写的 biblatex\supercite{biblatex} 样式%
 \end{Verbatim}
 在本文中将产生“\cite{ctex}，\parencite{ctex}，\supercite{ctex}”。
 
-就目前而言，在 \myemph{除 3.0--3.3 之外版本的} biblatex 中，
+就目前而言，在\myemph{除 3.0--3.3 之外版本的} biblatex 中，
 通过更复杂的设置，还可以满足例如被引用的文献按照引用顺序排序，
 而未引用的文献按照英文文献在前、中文文献在后排序这样的需求，
 详见 biblatex-caspervector 的文档\supercite{biblatex-caspervector}。
@@ -303,8 +303,8 @@ pkuthss 文档类可能调用以下这些宏包：
 	\item 启用 \verb|pkufoot| 选项时会调用
 		tikz\supercite{tikz} 和 scrextend\supercite{scrextend} 宏包。
 	\item 启用 \verb|pkuspace| 选项时会调用
-		tocloft\supercite{tocloft}、subfig\supercite{subfig} 和
-		caption\supercite{caption} 宏包。
+		tocloft\supercite{tocloft}、caption\supercite{caption} 和
+		subcaption\supercite{subcaption} 宏包。
 	\item 启用 \verb|spacing| 选项时会调用 setspace 和
 		enumitem\supercite{enumitem} 宏包。
 \end{itemize}
@@ -314,7 +314,33 @@ pkuthss 文档类可能调用以下这些宏包：
 
 pkuthss 文档模版的实现是简洁、清晰、灵活的。
 当一些细节的自定义无法通过模版提供的外部接口实现时，
-我们鼓励用户（在适当理解相关部分代码的前提下）通过修改模版进行自定义。
+我们鼓励用户（在适当理解相关部分代码的前提下）
+通过修改 pkuthss 文档类的源文件进行自定义。
+在目前常用的 \hologo{TeX} 系统中，
+假设 pkuthss 的说明文档所在目录具有下述形式的路径：
+\begin{Verbatim}[frame = single]
+# 说明文档所在目录（$TEXMFDIST 的形式见下面几行）：
+$TEXMFDIST/tex/latex/pkuthss/
+# 若用户使用 Windows 下的 TeX Live 系统，则 $TEXMFDIST 一般类似于：
+C:\texlive\2015\texmf-dist
+# 若用户使用类 Unix 下的 TeX Live 系统，则 $TEXMFDIST 一般类似于：
+/usr/local/texlive/2015/texmf-dist
+\end{Verbatim}
+则其源文件所在目录应该位于以下目录：
+\begin{Verbatim}[frame = single]
+$TEXMFDIST/doc/latex/pkuthss/
+\end{Verbatim}
+
+如果的确需要修改 pkuthss 文档类的源文件，\myemph{%
+	建议用户将 \texttt{pkuthss.cls} 或其它需要修改的文件
+	复制到被编译的主文件所在的目录，
+	然后对此副本进行修改%
+}\footnote{%
+	能这样做的原因是目前常用的 \hologo{TeX} 系统在读取编译用到的文件时，
+	会优先考虑工作目录（即主文件所在目录）中的文件。%
+}。这样做的目的主要是使用户不必在每次调整文档类文件时都去上述路径修改；
+同时这样也可以在（万一需要）更新 \hologo{TeX} 系统时，
+防止用户修改过的文档类文件在更新中被自动覆盖掉。
 
 一个常见的需求是封面中部分内容（特别是论文的标题、专业和研究方向）太长，
 超出了在预设的空间。
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
index fe7b23bccd9..3b5ba98fe3e 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.bib
@@ -13,18 +13,18 @@
 	title = {The biblatex Package: Programmable Bibliographies and Citations (Ver.\ 2.8a)},
 	type = {M/OL},
 	date = {2013-11-25},
-	url = {http://mirror.ctan.org/macros/latex/exptl/biblatex/},
-	urldate = {2014-05-24},
+	url = {http://mirror.ctan.org/macros/latex/contrib/biblatex/},
+	urldate = {2016-05-24},
 	language = {english},
 }
 
 @online{biblatex-caspervector,
 	author = {Vector, Casper Ti.},
-	title = {biblatex 参考文献和引用样式：caspervector v0.2.1},
+	title = {biblatex 参考文献和引用样式：caspervector v0.2.5},
 	type = {M/OL},
-	date = {2015-04-28},
-	url = {https://gitlab.com/CasperVector/biblatex-caspervector/releases/tag/v0.2.1},
-	urldate = {2015-04-28},
+	date = {2016-03-31},
+	url = {http://mirror.ctan.org/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/},
+	urldate = {2016-05-24},
 	language = {chinese},
 }
 
@@ -33,8 +33,8 @@
 	title = {Customizing captions of floating environments},
 	type = {M/OL},
 	date = {2011-11-02},
-	url = {http://mirror.ctan.org/macros/latex/contrib/caption},
-	urldate = {2013-06-03},
+	url = {http://mirror.ctan.org/macros/latex/contrib/caption/},
+	urldate = {2016-05-24},
 	language = {english},
 }
 
@@ -48,16 +48,6 @@
 	language = {chinese},
 }
 
-@online{ctex-faq,
-	author = {吴凌云},
-	title = {\CTeX{} FAQ（常见问题集），0.4 beta (89) 版},
-	type = {M/OL},
-	date = {2007-01-30},
-	url = {http://mirror.ctan.org/info/ctex-faq/},
-	urldate = {2012-08-01},
-	language = {chinese},
-}
-
 @online{enumitem,
 	author = {Bezos, Javier},
 	title = {Customizing lists with the enumitem package (Version 3.5.2)},
@@ -138,13 +128,13 @@
 	language = {english},
 }
 
-@online{subfig,
-	author = {Cochran, Steven Douglas},
-	title = {The Subfig Package (v1.3)},
+@online{subcaption,
+	author = {Sommerfeldt, Alex},
+	title = {The subcaption package (v1.1-75)},
 	type = {M/OL},
-	date = {2005-07-05},
-	url = {http://mirror.ctan.org/macros/latex/contrib/subfig},
-	urldate = {2015-04-26},
+	date = {2013-04-16},
+	url = {http://mirror.ctan.org/macros/latex/contrib/subcaption/},
+	urldate = {2016-05-24},
 	language = {english},
 }
 
@@ -160,11 +150,11 @@
 
 @online{tocloft,
 	author = {Robertson, Will},
-	title = {The tocloft package},
+	title = {The tocloft package (v2.3f)},
 	type = {M/OL},
-	date = {2013-12-20},
+	date = {2013-05-02},
 	url = {http://mirror.ctan.org/macros/latex/contrib/tocloft/},
-	urldate = {2013-05-02},
+	urldate = {2016-05-24},
 	language = {english},
 }
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
index e1d81f4554d..d3ad431ace5 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
@@ -43,7 +43,7 @@
 \hypersetup{colorlinks = true, allcolors = blue}
 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
 \newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}}
-\newcommand{\docversion}{v1.7.2}
+\newcommand{\docversion}{v1.7.3}
 
 \pkuthssinfo{
 	cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
@@ -55,7 +55,7 @@
 	cauthor = {盖茨波·钛·维克托},
 	eauthor = {Casper Ti.\ Vector},
 	studentid = {00910???},
-	date = {二〇一六年三月},
+	date = {二〇一六年五月},
 	school = {化学与分子工程学院},
 	cmajor = {化学（？）}, emajor = {Chemistry ... ?},
 	direction = {据说 Casper 自己也不知道},
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
index 8992cd90fee..66d19bf67ba 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 aafa45b2da1..9c792297518 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
@@ -22,7 +22,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-gbk.def}
-	[2016/03/22 v1.7.2 Labels and captions in GBK encoding
+	[2016/05/24 v1.7.3 Labels and captions in GBK encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{��Ŀ��}
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
index 370d0e21a4a..593e5b345e0 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
@@ -22,7 +22,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-utf8.def}
-	[2016/03/22 v1.7.2 Labels and captions in UTF-8 encoding
+	[2016/05/24 v1.7.3 Labels and captions in UTF-8 encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{题目：}
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
index de448e91a81..6d2789cac3f 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -23,7 +23,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{pkuthss}
-	[2016/03/22 v1.7.2 Peking University dissertation document class]
+	[2016/05/24 v1.7.3 Peking University dissertation document class]
 
 % eg. `\pkuthss@int@boolopt{spacing}{true}' will expand to:
 %   \newif\ifpkuthss@opt@spacing \pkuthss@opt@spacingtrue
@@ -78,7 +78,8 @@
 % `hyperref', `fntef', `fancyhdr' and `cs4size' are deprecated in ctex 2.x.
 % hyperref now does not make citation hyperlinks if not explicitly loaded.
 % All compatibility support for ctex 1.x is scheduled for removal in 2017.
-\RequirePackage{hyperref}
+% `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace.
+\AtEndOfClass{\RequirePackage{hyperref}}
 
 \ifpkuthss@opt@gbk
 	\input{pkuthss-gbk.def}
@@ -139,17 +140,17 @@
 \ifpkuthss@opt@pkuspace
 	% lineskip / baselineskip = 20 bp / (12 bp * (6 / 5)).
 	\linespread{1.39}\selectfont
-	% Quite harmless and frequently used package. Loaded together with `tocloft'
-	% plus a compatibility option to avoid package clash.
-	\RequirePackage{subfig}
 	% Provides utilities for setting TOC format; `titles' applied to avoid
 	% interfering with LaTeX's own title mechanism.
-	\RequirePackage[subfigure, titles]{tocloft}
+	\RequirePackage[titles]{tocloft}
 	\setlength{\cftbeforechapskip}{6bp plus 1bp}
 	\setlength{\cftsecindent}{\ccwd}
 	\setlength{\cftsubsecindent}{2\ccwd}
-	% Modify font size and separator of captions.
-	\RequirePackage{caption}
+	% `caption' modifies font size and separator of captions.  `subcaption'
+	% provides functions similar to `subfigure'/`subfig' but does not clash with
+	% `tocloft'; it clashes with `subfigure'/`subfig', but the error message will
+	% say they cannot be used simultaneously.
+	\RequirePackage{caption, subcaption}
 	\DeclareCaptionFont{cfive}{\zihao{5}}
 	\DeclareCaptionLabelSeparator{quad}{\quad}
 	\captionsetup{font = cfive, labelsep = quad}
@@ -266,23 +267,33 @@
 \setlength{\belowdisplayskip}{6bp plus 1.5bp minus 3.5bp}
 
 % Set up chapter/section/... captions.
+% The alternative settings in comments can be used in case the infractions
+% (intended to make the style less ugly) get caught; note that the `*skip'
+% values are not supposed to be modified: the actual style of the school's
+% guide and Word template seem to be different from the written specification
+% (when applied verbatim in LaTeX), and here the actual style is used.
 \CTEXsetup[
 	nameformat = {\zihao{-2}\bfseries},
 	titleformat = {\zihao{-2}\bfseries},
+	%nameformat = {\zihao{3}\bfseries},
+	%titleformat = {\zihao{3}\bfseries},
 	beforeskip = {0bp}, afterskip = {18bp}
 ]{chapter}
 \CTEXsetup[
 	format = {\zihao{-3}\bfseries},
+	%format = {\zihao{4}\bfseries},
 	beforeskip = {20bp plus 1ex minus 0.2ex},
 	afterskip = {6bp plus 0.2ex}
 ]{section}
 \CTEXsetup[
 	format = {\zihao{4}\bfseries},
+	%format = {\fontsize{13bp}{15.6bp}\selectfont\bfseries},
 	beforeskip = {12bp plus 1ex minus 0.2ex},
 	afterskip = {6bp plus 0.2ex}
 ]{subsection}
 \CTEXsetup[
 	format = {\bfseries},
+	%format = {\zihao{-4}\bfseries},
 	beforeskip = {12bp plus 1ex minus 0.2ex},
 	afterskip = {6bp plus 0.2ex}
 ]{subsubsection}
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
index ec3da41bc45..603efdc2ab5 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf