pkuthss (30jun15)

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

19 files changed, 116 insertions, 106 deletions

diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf
index 7be74754a80..31fe9395a32 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 5304c7af7f4..437091e6b69 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 53e9360b66b..71b0a7b1b94 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/ChangeLog.txt
@@ -1,3 +1,12 @@
+2015-06-30, v1.6.3
+
+	* Changes to documentation:
+	- Disambiguate file names wrt CTAN recommendation.
+	- pkuthss-chap2.tex: fix some minor details.
+
+	* Misc:
+	- dist: reduce duplication in zipballs according to CTAN recommendation.
+
 2015-05-30, v1.6.2
 
 	* Changes to example template:
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/abstract.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abstract.tex
index 84d0cb64ef1..cdecf891d9c 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/abstract.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-abstract.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \begin{cabstract}
 	本文介绍了 pkuthss 文档模版所提供的功能。
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/acknowledge.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-acknowledge.tex
index 39a388cfd66..77ad708b1b9 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/acknowledge.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-acknowledge.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \chapter{致谢}
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
index 2fc48cc968c..1a9552d368c 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap1.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \chapter{使用介绍}
 	\section{系统要求}\label{sec:req}
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
index 7bff3bce6b6..ba3bed4e104 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap2.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \chapter{pkuthss 文档模版提供的功能}
 	\section{pkuthss 文档模版提供的文档类和宏包选项}
@@ -100,6 +100,7 @@
 				具体地说，启用 \verb|pkuspace| 选项后会按
 				\parencite{pku-thesisstyle} 中的要求修改以下几项设置：
 			\begin{itemize}
+				\item 正文的行距。
 				\item 目录中条目的缩进方式。
 				\item 图表标题的字号，
 					以及标题中编号和标题文字之间的间隔方式
@@ -333,8 +334,8 @@
 \end{Verbatim}
 		在本文中将产生“\cite{ctex}，\parencite{ctex}，\supercite{ctex}”。
 
-		就目前而言，在 biblatex 2.x 中，通过更复杂的设置，
-		还可以满足例如被引用的文献按照引用顺序排序，
+		就目前而言，在 biblatex 2.x（\myemph{即不含 biblatex 3.0}）中，
+		通过更复杂的设置，还可以满足例如被引用的文献按照引用顺序排序，
 		而未引用的文献按照英文文献在前、中文文献在后排序这样的需求，
 		详见 biblatex-caspervector 的文档\supercite{biblatex-caspervector}。
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
index 10252d661cc..927a4fff142 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/chap3.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \chapter{问题及其解决}
 	\section{文档中已经提到的常见问题（按重要性排序）}
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/conclusion.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-conclusion.tex
index 50d93d09641..e462c82a642 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/conclusion.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-conclusion.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \specialchap{结论}
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/copyright.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex
index 1774784d248..b787f061e0e 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/copyright.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \chapter*{版权声明}
 \markboth{版权声明}{}
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/encl1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex
index ea0e17a7db4..c4fe8be1e68 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/encl1.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \chapter{更新记录}
 \raggedbottom
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-introduction.tex
index 36406bf08b6..f86dc396ddb 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/chap/introduction.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/chap/pkuthss-introduction.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \specialchap{序言}
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
index 7d5a38852d3..e3daa269ebc 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme/pkuthss.tex
@@ -18,15 +18,15 @@
 %
 % This work consists of the following files:
 %   pkuthss.tex
-%   chap/copyright.tex
-%   chap/abstract.tex
-%   chap/introduction.tex
-%   chap/chap1.tex
-%   chap/chap2.tex
-%   chap/chap3.tex
-%   chap/conclusion.tex
-%   chap/encl1.tex
-%   chap/acknowledge.tex
+%   chap/pkuthss-copyright.tex
+%   chap/pkuthss-abstract.tex
+%   chap/pkuthss-introduction.tex
+%   chap/pkuthss-chap1.tex
+%   chap/pkuthss-chap2.tex
+%   chap/pkuthss-chap3.tex
+%   chap/pkuthss-conclusion.tex
+%   chap/pkuthss-encl1.tex
+%   chap/pkuthss-acknowledge.tex
 
 \documentclass[UTF8, colorlinks]{pkuthss}
 
@@ -44,7 +44,7 @@
 
 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
 \newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}}
-\newcommand{\docversion}{v1.6.2}
+\newcommand{\docversion}{v1.6.3}
 
 \pkuthssinfo{
 	cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
@@ -76,23 +76,23 @@
 	\setcounter{page}{0}
 	\pagenumbering{Roman}
 
-	\include{chap/copyright}
-	\include{chap/abstract}
+	\include{chap/pkuthss-copyright}
+	\include{chap/pkuthss-abstract}
 	\tableofcontents
 
 	\mainmatter
-	\include{chap/introduction}
-	\include{chap/chap1}
-	\include{chap/chap2}
-	\include{chap/chap3}
-	\include{chap/conclusion}
+	\include{chap/pkuthss-introduction}
+	\include{chap/pkuthss-chap1}
+	\include{chap/pkuthss-chap2}
+	\include{chap/pkuthss-chap3}
+	\include{chap/pkuthss-conclusion}
 
 	\appendix
 	\printbibliography[heading = bibintoc, sorting = ecnty]
-	\include{chap/encl1}
+	\include{chap/pkuthss-encl1}
 
 	\backmatter
-	\include{chap/acknowledge}
+	\include{chap/pkuthss-acknowledge}
 	\include{chap/originauth}
 \end{document}
 
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
index 5eab5a8443c..66dc945397a 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-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
index 2f10ec27956..51a785b405a 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
@@ -26,7 +26,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{pkuthss-extra}
-	[2015/06/18 v1.6.2 Common extra settings for the pkuthss document class]
+	[2015/06/30 v1.6.3 Common extra settings for the pkuthss document class]
 
 % Check the dependency of pkuthss.
 \@ifclassloaded{pkuthss}{}{
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index d9bc8899e7b..85dde02cb03 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
@@ -25,7 +25,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-gbk.def}
-	[2015/06/18 v1.6.2 Labels and captions in GBK encoding
+	[2015/06/30 v1.6.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 215cad5de1c..7edca1b51b6 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
@@ -25,7 +25,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-utf8.def}
-	[2015/06/18 v1.6.2 Labels and captions in UTF-8 encoding
+	[2015/06/30 v1.6.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 606bf2406a1..a630a829f13 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -26,7 +26,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{pkuthss}
-	[2015/06/18 v1.6.2 Peking University dissertation document class]
+	[2015/06/30 v1.6.3 Peking University dissertation document class]
 
 % Process the encoding options.
 \newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
index 02ad319a882..842c49a3e07 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf