pkuthss (30mar13)

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

15 files changed, 116 insertions, 109 deletions

diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt
index 2183d691603..fcf985c6ddf 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt
@@ -1,3 +1,15 @@
+2013-03-30, v1.4 rc2
+
+	* Changes to package code:
+	- Use the internal hyperref support in ctex 1.02c+.
+	- Remove usage of etoolbox.
+
+	* Changes to documentation:
+	- Add hint for split sorting with biblatex.
+
+	* Misc:
+	- Minor improvements.
+
 2013-01-10, v1.4 rc1
 
 	* Changes to documentation:
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap2.tex
index 7abadafadd8..563addbc529 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap2.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap2.tex
@@ -229,7 +229,7 @@
 }
 \end{Verbatim}
 
-		\subsection{pkuthss 文档模版提供的其它命令和环境\label{ssec:misc}}
+		\subsection{pkuthss 文档模版提供的其它命令和环境}\label{ssec:misc}
 
 		\texttt{\bfseries cabstract} 和 \texttt{\bfseries eabstract} %
 		环境用于编写中英文摘要。
@@ -262,13 +262,12 @@
 			才能使用此命令。%
 		}
 
-		\subsection{从其它文档类和宏包继承的功能}
+		\subsection{从其它文档类和宏包继承的功能}\label{ssec:thirdparty}
 
 		pkuthss 文档类建立在 ctexbook\supercite{ctex} 文档类的基础上，
 		并调用了 CJKfntef、%
-		graphicx\supercite{graphicx}、geometry\supercite{geometry}、%
-		fancyhdr\supercite{fancyhdr} 和 %
-		etoolbox\supercite{etoolbox} 等几个宏包。
+		graphicx\supercite{graphicx}、geometry\supercite{geometry} 和%
+		fancyhdr\supercite{fancyhdr} 等几个宏包。
 		因此，ctexbook 文档类和这些宏包所提供的功能均可以使用。
 
 		例如，用户如果想将目录的标题改为“目{\quad\quad}录”，
@@ -281,7 +280,7 @@
 		pkuthss 文档模版使用作者编写的 %
 		biblatex\supercite{biblatex} 样式\supercite{biblatex-caspervector}%
 		进行参考文献和引用的排版，
-		用户可以使用其提供的功能。
+		用户可以使用它以及 biblatex 本身所提供的功能。
 		例如，
 		用户可以分别使用 \verb|\cite|、\verb|\parencite| 和 \verb|\supercite| %
 		生成未格式化的、带方括号的和上标且带方括号的引用标记：
@@ -290,6 +289,10 @@
 \end{Verbatim}
 		在本文中将产生“\cite{ctex}，\parencite{ctex}，\supercite{ctex}”。
 
+		通过更复杂的设置，还可以满足例如被引用的文献按照引用顺序排序，
+		而未引用的文献按照英文文献在前、中文文献在后排序这样的需求，
+		详见 biblatex-caspervector 的文档\supercite{biblatex-caspervector}。
+
 		pkuthss-extra 宏包可能调用以下这些宏包：
 		\begin{itemize}
 			\item 启用 \verb|spacing| 选项时会调用 %
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex
index 704b1d83d2b..4cf927c7737 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex
@@ -26,30 +26,29 @@
 
 	文档默认情况下是双面模式，章末可能产生空白页，详见第 \ref{ssec:options} 小节。
 
+	通过一些设置，还可以满足例如被引用的文献按照引用顺序排序，
+	而未引用的文献按照英文文献在前、中文文献在后排序这样的需求，
+	见第 \ref{ssec:thirdparty} 小节。
+
 	一些高级设置，
 	如封面中部分内容长度超过预设空间容量时的设置，
 	见第 \ref{sec:advanced} 节。
 
-	biblatex 宏包\cite{biblatex}会自行设定 \verb|\bibname|，
-	故会覆盖通过 \verb|\CTEXoptions| 设定的参考文献列表标题。
-	使用 biblatex 的用户可以使用 \verb|\printbibliography| 的
-	\verb|title| 选项来手动设定参考文献列表的标题，例如：
+	\section{其它可能存在的问题}
+		\subsection{上游宏包可能引起的问题}
+
+		biblatex 宏包\supercite{biblatex}会自行设定 \verb|\bibname|，
+		故会覆盖通过 \verb|\CTEXoptions| 设定的参考文献列表标题。
+		使用 biblatex 的用户可以使用 \verb|\printbibliography| 的
+		\verb|title| 选项来手动设定参考文献列表的标题，例如：
 \begin{Verbatim}[frame = single]
 \printbibliography[title = {文献}, ...] % “...”为其它选项。
 \end{Verbatim}
 
-	\section{其它可能存在的问题}
-		\subsection{上游宏包可能引起的问题}
-
 		hyperref 宏包\supercite{hyperref}和一些宏包可能发生冲突。
 		关于如何避免这些冲突，可以参考 hyperref 宏包的文档。
 		此文件通常和执行 \verb|texdoc hyperref| %
 		时打开的 pdf 文件位于同一目录中。
-		低于 1.02c 版本的 ctex 宏包中对 hyperref 的设置有些不周，
-		因此文档类中对其进行了一些手动的处理。
-		考虑到新版本 ctex 宏包将逐渐被更多人采用，
-		进行这些处理的代码将在以后被删除，
-		而改成直接调用 ctex 宏包的 \verb|hyperref| 选项。
 
 		\subsection{文档格式可能存在的问题}
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib
index 62356815231..cf832a574ec 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib
@@ -20,11 +20,11 @@ vim:ts=4:sw=4
 
 @online{biblatex-caspervector,
 	author = {Vector, Casper Ti.},
-	title = {biblatex 参考文献和引用样式：caspervector v0.1.6},
+	title = {biblatex 参考文献和引用样式：caspervector v0.1.7},
 	type = {M/OL},
-	date = {2012-10-11},
-	url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.6.zip},
-	urldate = {2013-01-10},
+	date = {2013-03-30},
+	url = {https://caspervector.googlecode.com/files/biblatex-caspervector-0.1.7.zip},
+	urldate = {2013-03-30},
 	userf = {zh},
 }
 
@@ -57,15 +57,6 @@ vim:ts=4:sw=4
 	urldate = {2012-08-01},
 }
 
-@online{etoolbox,
-	author = {Lehman, Philipp},
-	title = {The etoolbox package: An e-TeX Toolbox for Class and Package Authors (Version 2.1)},
-	type = {M/OL},
-	date = {2011-01-03},
-	url = {http://mirror.ctan.org/macros/latex/contrib/etoolbox/},
-	urldate = {2012-08-01},
-}
-
 @online{fancyhdr,
 	author = {van Oostrum, Piet},
 	title = {Page layout in \LaTeX{}},
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex
index c16f3deeb14..c00a92f35eb 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex
@@ -12,10 +12,14 @@
 % 调出。
 
 % 在黑白打印时彩色链接可能变成浅灰色，此时可将“colorlinks”改为“nocolorlinks”。
-\documentclass[GBK, colorlinks, notocbibind]{pkuthss}
+\documentclass[GBK, colorlinks]{pkuthss}
 
 % 使用 biblatex 排版参考文献，并规定其格式。
-\usepackage[backend = biber, style = caspervector, gbk]{biblatex}
+% 默认按照引用顺序排序（“sorting = none”），详见 biblatex-caspervector 的文档
+% （因为是默认设置所以其实不用写，不过出于完备性的考虑仍然在这里列出）。
+% 若需要按照英文文献在前，中文文献在后排序，请设置“sorting = ecnty”；
+% 若需要按照中文文献在前，英文文献在后排序，请设置“sorting = centy”。
+\usepackage[backend = biber, style = caspervector, gbk, sorting = none]{biblatex}
 % 使得打字机粗体可以被使用。
 \usepackage{lmodern}
 % 产生 originauth.tex 里的 \square。
@@ -27,7 +31,7 @@
 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
 
 % pkuthss 文档模版的版本。
-\newcommand{\docversion}{v1.4 rc1}
+\newcommand{\docversion}{v1.4 rc2}
 % 设定文档的基本信息。
 \pkuthssinfo{
 	cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
@@ -43,7 +47,7 @@
 	cauthor = {盖茨波 $\cdot$ 钛 $\cdot$ 维克托},
 	eauthor = {Casper Ti.\ Vector},
 	studentid = {00910???},
-	date = {二〇一三年一月},
+	date = {二〇一三年三月},
 	school = {化学与分子工程学院},
 	cmajor = {化学（？）}, emajor = {Chemistry},
 	direction = {据说 Casper 自己也不知道},
@@ -81,9 +85,17 @@
 
 	% 正文中的附录部分。
 	\appendix
-	% 排版参考文献列表，并使其出现在目录中。
-	% 如果同时要使参考文献列表参与章节编号，可将“bibintoc”改为“bibnumbered”。
-	\printbibliography[heading = bibintoc]
+	% 排版参考文献列表。
+	\printbibliography[
+		% 使“参考文献”出现在目录中；如果同时要使参考文献列表参与章节编号，
+		% 可将“bibintoc”改为“bibnumbered”。
+		heading = bibintoc,
+		% 单独设定排序方案。此设定会局部覆盖之前的全局设置。
+		% 注：只有同时使用 2.x 或之后版本的 biblatex 和相应兼容版本的 biber，
+		% 才能对每个 \printbibliography 命令采用不同的排序方案，
+		% 否则只能在导入 biblatex 宏包时就（全局）指定排序方案。
+		sorting = ecnty
+	]
 	% 各附录。
 	\include{chap/encl1}
 	\include{chap/encl2}
diff --git a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf
index 662467b582b..e5803d843c8 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/utf8lf/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt
index 23d5699498b..7130ba00582 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt
@@ -1,3 +1,15 @@
+2013-03-30, v1.4 rc2
+
+	* Changes to package code:
+	- Use the internal hyperref support in ctex 1.02c+.
+	- Remove usage of etoolbox.
+
+	* Changes to documentation:
+	- Add hint for split sorting with biblatex.
+
+	* Misc:
+	- Minor improvements.
+
 2013-01-10, v1.4 rc1
 
 	* Changes to documentation:
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap2.tex
index 6f9bfedd5f8..b7c810fd4c9 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap2.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap2.tex
@@ -229,7 +229,7 @@
 }
 \end{Verbatim}
 
-		\subsection{pkuthss 鏂囨。妯＄増鎻愪緵鐨勫叾瀹冨懡浠ゅ拰鐜\label{ssec:misc}}
+		\subsection{pkuthss 鏂囨。妯＄増鎻愪緵鐨勫叾瀹冨懡浠ゅ拰鐜}\label{ssec:misc}
 
 		\texttt{\bfseries cabstract} 鍜� \texttt{\bfseries eabstract} %
 		鐜鐢ㄤ簬缂栧啓涓嫳鏂囨憳瑕併��
@@ -262,13 +262,12 @@
 			鎵嶈兘浣跨敤姝ゅ懡浠ゃ��%
 		}
 
-		\subsection{浠庡叾瀹冩枃妗ｇ被鍜屽畯鍖呯户鎵跨殑鍔熻兘}
+		\subsection{浠庡叾瀹冩枃妗ｇ被鍜屽畯鍖呯户鎵跨殑鍔熻兘}\label{ssec:thirdparty}
 
 		pkuthss 鏂囨。绫诲缓绔嬪湪 ctexbook\supercite{ctex} 鏂囨。绫荤殑鍩虹涓婏紝
 		骞惰皟鐢ㄤ簡 CJKfntef銆�%
-		graphicx\supercite{graphicx}銆乬eometry\supercite{geometry}銆�%
-		fancyhdr\supercite{fancyhdr} 鍜� %
-		etoolbox\supercite{etoolbox} 绛夊嚑涓畯鍖呫��
+		graphicx\supercite{graphicx}銆乬eometry\supercite{geometry} 鍜�%
+		fancyhdr\supercite{fancyhdr} 绛夊嚑涓畯鍖呫��
 		鍥犳锛宑texbook 鏂囨。绫诲拰杩欎簺瀹忓寘鎵�鎻愪緵鐨勫姛鑳藉潎鍙互浣跨敤銆�
 
 		渚嬪锛岀敤鎴峰鏋滄兂灏嗙洰褰曠殑鏍囬鏀逛负鈥滅洰{\quad\quad}褰曗�濓紝
@@ -281,7 +280,7 @@
 		pkuthss 鏂囨。妯＄増浣跨敤浣滆�呯紪鍐欑殑 %
 		biblatex\supercite{biblatex} 鏍峰紡\supercite{biblatex-caspervector}%
 		杩涜鍙傝�冩枃鐚拰寮曠敤鐨勬帓鐗堬紝
-		鐢ㄦ埛鍙互浣跨敤鍏舵彁渚涚殑鍔熻兘銆�
+		鐢ㄦ埛鍙互浣跨敤瀹冧互鍙� biblatex 鏈韩鎵�鎻愪緵鐨勫姛鑳姐��
 		渚嬪锛�
 		鐢ㄦ埛鍙互鍒嗗埆浣跨敤 \verb|\cite|銆乗verb|\parencite| 鍜� \verb|\supercite| %
 		鐢熸垚鏈牸寮忓寲鐨勩�佸甫鏂规嫭鍙风殑鍜屼笂鏍囦笖甯︽柟鎷彿鐨勫紩鐢ㄦ爣璁帮細
@@ -290,6 +289,10 @@
 \end{Verbatim}
 		鍦ㄦ湰鏂囦腑灏嗕骇鐢熲�淺cite{ctex}锛孿parencite{ctex}锛孿supercite{ctex}鈥濄��
 
+		閫氳繃鏇村鏉傜殑璁剧疆锛岃繕鍙互婊¤冻渚嬪琚紩鐢ㄧ殑鏂囩尞鎸夌収寮曠敤椤哄簭鎺掑簭锛�
+		鑰屾湭寮曠敤鐨勬枃鐚寜鐓ц嫳鏂囨枃鐚湪鍓嶃�佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇�姹傦紝
+		璇﹁ biblatex-caspervector 鐨勬枃妗supercite{biblatex-caspervector}銆�
+
 		pkuthss-extra 瀹忓寘鍙兘璋冪敤浠ヤ笅杩欎簺瀹忓寘锛�
 		\begin{itemize}
 			\item 鍚敤 \verb|spacing| 閫夐」鏃朵細璋冪敤 %
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex
index 9562ed6e451..90d810b013d 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex
@@ -26,30 +26,29 @@
 
 	鏂囨。榛樿鎯呭喌涓嬫槸鍙岄潰妯″紡锛岀珷鏈彲鑳戒骇鐢熺┖鐧介〉锛岃瑙佺 \ref{ssec:options} 灏忚妭銆�
 
+	閫氳繃涓�浜涜缃紝杩樺彲浠ユ弧瓒充緥濡傝寮曠敤鐨勬枃鐚寜鐓у紩鐢ㄩ『搴忔帓搴忥紝
+	鑰屾湭寮曠敤鐨勬枃鐚寜鐓ц嫳鏂囨枃鐚湪鍓嶃�佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇�姹傦紝
+	瑙佺 \ref{ssec:thirdparty} 灏忚妭銆�
+
 	涓�浜涢珮绾ц缃紝
 	濡傚皝闈腑閮ㄥ垎鍐呭闀垮害瓒呰繃棰勮绌洪棿瀹归噺鏃剁殑璁剧疆锛�
 	瑙佺 \ref{sec:advanced} 鑺傘��
 
-	biblatex 瀹忓寘\cite{biblatex}浼氳嚜琛岃瀹� \verb|\bibname|锛�
-	鏁呬細瑕嗙洊閫氳繃 \verb|\CTEXoptions| 璁惧畾鐨勫弬鑰冩枃鐚垪琛ㄦ爣棰樸��
-	浣跨敤 biblatex 鐨勭敤鎴峰彲浠ヤ娇鐢� \verb|\printbibliography| 鐨�
-	\verb|title| 閫夐」鏉ユ墜鍔ㄨ瀹氬弬鑰冩枃鐚垪琛ㄧ殑鏍囬锛屼緥濡傦細
+	\section{鍏跺畠鍙兘瀛樺湪鐨勯棶棰榼
+		\subsection{涓婃父瀹忓寘鍙兘寮曡捣鐨勯棶棰榼
+
+		biblatex 瀹忓寘\supercite{biblatex}浼氳嚜琛岃瀹� \verb|\bibname|锛�
+		鏁呬細瑕嗙洊閫氳繃 \verb|\CTEXoptions| 璁惧畾鐨勫弬鑰冩枃鐚垪琛ㄦ爣棰樸��
+		浣跨敤 biblatex 鐨勭敤鎴峰彲浠ヤ娇鐢� \verb|\printbibliography| 鐨�
+		\verb|title| 閫夐」鏉ユ墜鍔ㄨ瀹氬弬鑰冩枃鐚垪琛ㄧ殑鏍囬锛屼緥濡傦細
 \begin{Verbatim}[frame = single]
 \printbibliography[title = {鏂囩尞}, ...] % 鈥�...鈥濅负鍏跺畠閫夐」銆�
 \end{Verbatim}
 
-	\section{鍏跺畠鍙兘瀛樺湪鐨勯棶棰榼
-		\subsection{涓婃父瀹忓寘鍙兘寮曡捣鐨勯棶棰榼
-
 		hyperref 瀹忓寘\supercite{hyperref}鍜屼竴浜涘畯鍖呭彲鑳藉彂鐢熷啿绐併��
 		鍏充簬濡備綍閬垮厤杩欎簺鍐茬獊锛屽彲浠ュ弬鑰� hyperref 瀹忓寘鐨勬枃妗ｃ��
 		姝ゆ枃浠堕�氬父鍜屾墽琛� \verb|texdoc hyperref| %
 		鏃舵墦寮�鐨� pdf 鏂囦欢浣嶄簬鍚屼竴鐩綍涓��
-		浣庝簬 1.02c 鐗堟湰鐨� ctex 瀹忓寘涓 hyperref 鐨勮缃湁浜涗笉鍛紝
-		鍥犳鏂囨。绫讳腑瀵瑰叾杩涜浜嗕竴浜涙墜鍔ㄧ殑澶勭悊銆�
-		鑰冭檻鍒版柊鐗堟湰 ctex 瀹忓寘灏嗛�愭笎琚洿澶氫汉閲囩敤锛�
-		杩涜杩欎簺澶勭悊鐨勪唬鐮佸皢鍦ㄤ互鍚庤鍒犻櫎锛�
-		鑰屾敼鎴愮洿鎺ヨ皟鐢� ctex 瀹忓寘鐨� \verb|hyperref| 閫夐」銆�
 
 		\subsection{鏂囨。鏍煎紡鍙兘瀛樺湪鐨勯棶棰榼
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib
index ef693b0d830..59906b549b7 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib
@@ -20,11 +20,11 @@ vim:ts=4:sw=4
 
 @online{biblatex-caspervector,
 	author = {Vector, Casper Ti.},
-	title = {biblatex 鍙傝�冩枃鐚拰寮曠敤鏍峰紡锛歝aspervector v0.1.6},
+	title = {biblatex 鍙傝�冩枃鐚拰寮曠敤鏍峰紡锛歝aspervector v0.1.7},
 	type = {M/OL},
-	date = {2012-10-11},
-	url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.6.zip},
-	urldate = {2013-01-10},
+	date = {2013-03-30},
+	url = {https://caspervector.googlecode.com/files/biblatex-caspervector-0.1.7.zip},
+	urldate = {2013-03-30},
 	userf = {zh},
 }
 
@@ -57,15 +57,6 @@ vim:ts=4:sw=4
 	urldate = {2012-08-01},
 }
 
-@online{etoolbox,
-	author = {Lehman, Philipp},
-	title = {The etoolbox package: An e-TeX Toolbox for Class and Package Authors (Version 2.1)},
-	type = {M/OL},
-	date = {2011-01-03},
-	url = {http://mirror.ctan.org/macros/latex/contrib/etoolbox/},
-	urldate = {2012-08-01},
-}
-
 @online{fancyhdr,
 	author = {van Oostrum, Piet},
 	title = {Page layout in \LaTeX{}},
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex
index 9d5a35d9813..1d767e2f733 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex
@@ -12,10 +12,14 @@
 % 璋冨嚭銆�
 
 % 鍦ㄩ粦鐧芥墦鍗版椂褰╄壊閾炬帴鍙兘鍙樻垚娴呯伆鑹诧紝姝ゆ椂鍙皢鈥渃olorlinks鈥濇敼涓衡�渘ocolorlinks鈥濄��
-\documentclass[UTF8, colorlinks, notocbibind]{pkuthss}
+\documentclass[UTF8, colorlinks]{pkuthss}
 
 % 浣跨敤 biblatex 鎺掔増鍙傝�冩枃鐚紝骞惰瀹氬叾鏍煎紡銆�
-\usepackage[backend = biber, style = caspervector, utf8]{biblatex}
+% 榛樿鎸夌収寮曠敤椤哄簭鎺掑簭锛堚�渟orting = none鈥濓級锛岃瑙� biblatex-caspervector 鐨勬枃妗�
+% 锛堝洜涓烘槸榛樿璁剧疆鎵�浠ュ叾瀹炰笉鐢ㄥ啓锛屼笉杩囧嚭浜庡畬澶囨�х殑鑰冭檻浠嶇劧鍦ㄨ繖閲屽垪鍑猴級銆�
+% 鑻ラ渶瑕佹寜鐓ц嫳鏂囨枃鐚湪鍓嶏紝涓枃鏂囩尞鍦ㄥ悗鎺掑簭锛岃璁剧疆鈥渟orting = ecnty鈥濓紱
+% 鑻ラ渶瑕佹寜鐓т腑鏂囨枃鐚湪鍓嶏紝鑻辨枃鏂囩尞鍦ㄥ悗鎺掑簭锛岃璁剧疆鈥渟orting = centy鈥濄��
+\usepackage[backend = biber, style = caspervector, utf8, sorting = none]{biblatex}
 % 浣垮緱鎵撳瓧鏈虹矖浣撳彲浠ヨ浣跨敤銆�
 \usepackage{lmodern}
 % 浜х敓 originauth.tex 閲岀殑 \square銆�
@@ -27,7 +31,7 @@
 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
 
 % pkuthss 鏂囨。妯＄増鐨勭増鏈��
-\newcommand{\docversion}{v1.4 rc1}
+\newcommand{\docversion}{v1.4 rc2}
 % 璁惧畾鏂囨。鐨勫熀鏈俊鎭��
 \pkuthssinfo{
 	cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis},
@@ -43,7 +47,7 @@
 	cauthor = {鐩栬尐娉� $\cdot$ 閽� $\cdot$ 缁村厠鎵榼,
 	eauthor = {Casper Ti.\ Vector},
 	studentid = {00910???},
-	date = {浜屻�囦竴涓夊勾涓�鏈坿,
+	date = {浜屻�囦竴涓夊勾涓夋湀},
 	school = {鍖栧涓庡垎瀛愬伐绋嬪闄,
 	cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry},
 	direction = {鎹 Casper 鑷繁涔熶笉鐭ラ亾},
@@ -81,9 +85,17 @@
 
 	% 姝ｆ枃涓殑闄勫綍閮ㄥ垎銆�
 	\appendix
-	% 鎺掔増鍙傝�冩枃鐚垪琛紝骞朵娇鍏跺嚭鐜板湪鐩綍涓��
-	% 濡傛灉鍚屾椂瑕佷娇鍙傝�冩枃鐚垪琛ㄥ弬涓庣珷鑺傜紪鍙凤紝鍙皢鈥渂ibintoc鈥濇敼涓衡�渂ibnumbered鈥濄��
-	\printbibliography[heading = bibintoc]
+	% 鎺掔増鍙傝�冩枃鐚垪琛ㄣ��
+	\printbibliography[
+		% 浣库�滃弬鑰冩枃鐚�濆嚭鐜板湪鐩綍涓紱濡傛灉鍚屾椂瑕佷娇鍙傝�冩枃鐚垪琛ㄥ弬涓庣珷鑺傜紪鍙凤紝
+		% 鍙皢鈥渂ibintoc鈥濇敼涓衡�渂ibnumbered鈥濄��
+		heading = bibintoc,
+		% 鍗曠嫭璁惧畾鎺掑簭鏂规銆傛璁惧畾浼氬眬閮ㄨ鐩栦箣鍓嶇殑鍏ㄥ眬璁剧疆銆�
+		% 娉細鍙湁鍚屾椂浣跨敤 2.x 鎴栦箣鍚庣増鏈殑 biblatex 鍜岀浉搴斿吋瀹圭増鏈殑 biber锛�
+		% 鎵嶈兘瀵规瘡涓� \printbibliography 鍛戒护閲囩敤涓嶅悓鐨勬帓搴忔柟妗堬紝
+		% 鍚﹀垯鍙兘鍦ㄥ鍏� biblatex 瀹忓寘鏃跺氨锛堝叏灞�锛夋寚瀹氭帓搴忔柟妗堛��
+		sorting = ecnty
+	]
 	% 鍚勯檮褰曘��
 	\include{chap/encl1}
 	\include{chap/encl2}
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
index a2d40ebaba5..aadc1945d5c 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty
@@ -24,7 +24,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{pkuthss-extra}
-	[2013/01/10 v1.4-rc1 Common extra settings for the pkuthss document class]
+	[2013/03/30 v1.4-rc2 Common extra settings for the pkuthss document class]
 
 % Check the dependency of pkuthss.
 \@ifclassloaded{pkuthss}{}{
@@ -47,8 +47,7 @@
 \pkuthssextra@int@boolopt{spacing}{true}
 % Whether to use list environments that are tighter than LaTeX defaults.
 \pkuthssextra@int@boolopt{tightlist}{true}
-% Whether to use some common settings about table of contents, bibliography and
-% indexes.
+% Add PDF bookmark for table of contents.
 \pkuthssextra@int@boolopt{pdftoc}{true}
 % Whether to enable `\Uppercase' (works problematically) in heading marks.
 \pkuthssextra@int@boolopt{uppermark}{false}
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index d6c0e41a99c..c20c97a1835 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
@@ -23,7 +23,7 @@
 %   pkuthss-extra.sty
 
 \ProvidesFile{pkuthss-gbk.def}
-	[2013/01/10 v1.4-rc1 Labels and captions in GBK encoding
+	[2013/03/30 v1.4-rc2 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 db040732fd6..391fe54b5a0 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def
@@ -23,7 +23,7 @@
 %   pkuthss-extra.sty
 
 \ProvidesFile{pkuthss-utf8.def}
-	[2013/01/10 v1.4-rc1 Labels and captions in UTF-8 encoding
+	[2013/03/30 v1.4-rc2 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 be6a7f28955..e06ec19150b 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls
@@ -24,7 +24,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{pkuthss}
-	[2013/01/10 v1.4-rc1 Peking University dissertation document class]
+	[2013/03/30 v1.4-rc2 Peking University dissertation document class]
 
 % Process the encoding options.
 \newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue
@@ -59,16 +59,13 @@
 % pkuthss is based on ctexbook; We use A4 paper, and `xiao 4' as default font size.
 % CJKfntef provides \CJKunderline used in \maketitle.
 % fancyhdr provides utilities for setting headers and footers.
-\LoadClass[fntef,a4paper,fancyhdr,cs4size]{ctexbook}[2009/10/20]
+\LoadClass[hyperref, a4paper, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11]
 % Provide support for `key = val' grammar.
 \RequirePackage{keyval}
 % Graphics support.
 \RequirePackage{graphicx}[1999/02/16]
 % Provide utilities for setting page layout.
 \RequirePackage{geometry}
-% Provide \AtEndPreamble used later.
-% To be removed by summer in 2013, see the fix of `\hypersetup' below.
-\RequirePackage{etoolbox}
 % Whether to enable the default extra settings.
 \ifpkuthss@opt@extra\RequirePackage{pkuthss-extra}\fi
 
@@ -87,29 +84,6 @@
 	\ifpkuthss@opt@gbk\input{pkuthss-gbk.def}
 	\else\input{pkuthss-utf8.def}
 	\fi
-
-	% Automatically generate hyperlinks and bookmarks for table of contents,
-	% citations and index.
-	% Code copied with minor modifications from ctex-common.def in `ctex' package.
-	% Not directly using the `hyperref' option of `ctex' package in order to avoid
-	% the conflicts caused by loading of `hyperref' before `setspace' in `ctex'
-	% package older than 1.02c.
-	% This piece of code will be removed by summer in 2013, and we will use the
-	% `hyperref' option of `ctex' package instead, considering most people
-	% will be using newer versions of `ctex' package at that time.
-	\providecommand\hypersetup[1]{\PassOptionsToPackage{#1}{hyperref}}
-	\AtEndPreamble{\RequirePackage{hyperref}}
-	\ifpkuthss@opt@gbk
-		\unless\ifxetex
-			\hypersetup{CJKbookmarks}
-			\unless\ifpdf
-				\AtBeginDvi{\special{pdf:tounicode GBK-EUC-UCS2}}
-			\fi
-		\fi
-	\else
-		\hypersetup{unicode}
-	\fi
-	\hypersetup{driverfallback = dvipdfmx}
 }
 
 % Set page layout.