pkuthss (3jul14)

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

15 files changed, 45 insertions, 34 deletions

diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex
index 35ad0537b52..6d91d1219b8 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/example-gbk/thesis.tex
@@ -12,7 +12,6 @@
 % 调出。
 
 % 在黑白打印时彩色链接可能变成浅灰色，此时可将“colorlinks”改为“nocolorlinks”。
-% 北大图书馆要求上传的电子版论文中目录采用黑色字体，可以用同样的方法处理。
 %
 % 采用了自定义的（包括大小写不同于原文件的）字体文件名，
 % 并改动 ctex.cfg 等配置文件的用户请自行加入 nofonts 选项；
@@ -61,7 +60,11 @@
 	% 中英文摘要。
 	\include{chap/abstract}
 	% 自动生成目录。
+	\begingroup
+	% 使目录条目为黑色。
+	\hypersetup{hidelinks}
 	\tableofcontents
+	\endgroup
 
 	% 以下为正文。
 	\mainmatter
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex
index 9f97c2a960b..aa384b93bee 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/example-utf8/thesis.tex
@@ -12,7 +12,6 @@
 % 璋冨嚭銆�
 
 % 鍦ㄩ粦鐧芥墦鍗版椂褰╄壊閾炬帴鍙兘鍙樻垚娴呯伆鑹诧紝姝ゆ椂鍙皢鈥渃olorlinks鈥濇敼涓衡�渘ocolorlinks鈥濄��
-% 鍖楀ぇ鍥句功棣嗚姹備笂浼犵殑鐢靛瓙鐗堣鏂囦腑鐩綍閲囩敤榛戣壊瀛椾綋锛屽彲浠ョ敤鍚屾牱鐨勬柟娉曞鐞嗐��
 %
 % 閲囩敤浜嗚嚜瀹氫箟鐨勶紙鍖呮嫭澶у皬鍐欎笉鍚屼簬鍘熸枃浠剁殑锛夊瓧浣撴枃浠跺悕锛�
 % 骞舵敼鍔� ctex.cfg 绛夐厤缃枃浠剁殑鐢ㄦ埛璇疯嚜琛屽姞鍏� nofonts 閫夐」锛�
@@ -61,7 +60,11 @@
 	% 涓嫳鏂囨憳瑕併��
 	\include{chap/abstract}
 	% 鑷姩鐢熸垚鐩綍銆�
+	\begingroup
+	% 浣跨洰褰曟潯鐩负榛戣壊銆�
+	\hypersetup{hidelinks}
 	\tableofcontents
+	\endgroup
 
 	% 浠ヤ笅涓烘鏂囥��
 	\mainmatter
diff --git a/Master/texmf-dist/doc/latex/pkuthss/example.pdf b/Master/texmf-dist/doc/latex/pkuthss/example.pdf
index 9b74a4eea7d..3bdb93bfe3b 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-src/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt
index dbafc76c61e..dbc03774193 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/ChangeLog.txt
@@ -1,3 +1,14 @@
+2014-07-04, v1.5.4
+
+	* Changes to example template:
+	- make TOC black, as stupidly required by PKU Library.
+
+	* Changes to documentation:
+	- re-sort and re-organise common problems.
+
+	* Misc:
+	- Minor fixes and improvements.
+
 2014-05-23, v1.5.3
 
 	* Changes to package code:
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex
index 8b620834910..f5775747b1e 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap1.tex
@@ -168,13 +168,13 @@ texdoc pkuthss
 	鍗冲彲閫氳繃鍦ㄤ富鏂囦欢鎵�鍦ㄧ洰褰曡皟鐢� Make 宸ュ叿鏉ュ疄鐜拌嚜鍔ㄧ紪璇戯細
 	濡傛灉鏄湪绫� UNIX 鐜涓嬶紝鍒欑敤鎴峰簲璇ヨ皟鐢ㄧ殑鍛戒护鍚嶄负 \verb|make|锛�
 \begin{Verbatim}[frame = single]
-cd /path/to/directory/with/pkuthss.tex
+cd /path/to/directory/with/thesis.tex
 make
 \end{Verbatim}
 	鑰屽鏋滄槸鍦� Windows 鐜涓嬶紝
 	鍒欑敤鎴峰簲璇ヨ皟鐢ㄧ殑鍛戒护鍚嶅彲鑳戒负 \verb|mingw32-make|锛�
 \begin{Verbatim}[frame = single]
-cd \path\to\directory\with\pkuthss.tex
+cd \path\to\directory\with\thesis.tex
 mingw32-make
 \end{Verbatim}
 
@@ -185,7 +185,7 @@ mingw32-make
 		璋冪敤鏃跺彲浠ヤ笉鏄惧紡鍦版寚鍑烘墿灞曞悕銆�%
 	}锛�
 \begin{Verbatim}[frame = single]
-cd \path\to\directory\with\pkuthss.tex
+cd \path\to\directory\with\thesis.tex
 make
 \end{Verbatim}
 	\myemph{%
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex
index 7086c8600b6..af98936c847 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap2.tex
@@ -170,11 +170,10 @@
 		\end{itemize}
 
 		渚嬪锛屽湪鎻愪氦鎵撳嵃鐗堢殑璁烘枃鏃讹紝
-		褰╄壊鐨勯摼鎺ユ枃瀛楀湪榛戠櫧鎵撳嵃鍑烘潵涔嬪悗鍙兘棰滆壊浼氬緢娴咃紱
-		鍖楀ぇ鍥句功棣嗕篃瑕佹眰鎻愪氦鐨勭數瀛愮増璁烘枃鐩綍浣跨敤榛戣壊瀛椾綋銆�
+		褰╄壊鐨勯摼鎺ユ枃瀛楀湪榛戠櫧鎵撳嵃鍑烘潵涔嬪悗鍙兘棰滆壊浼氬緢娴呫��
 		姝ゆ椂鐢ㄦ埛\myemph{%
 			鍙互鍚敤 pkuthss-extra 瀹忓寘鐨� \texttt{nocolorlinks} 閫夐」锛�
-			浣挎墍鏈夌殑閾炬帴鍙樹负榛戣壊锛屼互鍏嶅奖鍝嶆墦鍗版垨鎻愪氦%
+			浣挎墍鏈夌殑閾炬帴鍙樹负榛戣壊锛屼互鍏嶅奖鍝嶆墦鍗�%
 		}锛�
 \begin{Verbatim}[frame = single]
 \documentclass[..., nocolorlinks]{pkuthss} % 鈥�...鈥濅唬琛ㄥ叾瀹冪殑閫夐」銆�
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex
index 8d3aef9a21a..24bda395883 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/chap/chap3.tex
@@ -31,41 +31,36 @@
 \chapter{闂鍙婂叾瑙ｅ喅}
 	\section{鏂囨。涓凡缁忔彁鍒扮殑甯歌闂锛堟寜閲嶈鎬ф帓搴忥級}
 
-	鍖楀ぇ鍥句功棣嗚姹備笂浼犵殑璁烘枃涓洰褰曢噰鐢ㄩ粦鑹插瓧浣擄紱
+	鏂囨。榛樿鎯呭喌涓嬫槸鍙岄潰妯″紡锛岀珷鏈彲鑳戒骇鐢熺┖鐧介〉锛岃瑙佺 \ref{ssec:options} 灏忚妭銆�
 	鍦ㄩ粯璁よ缃紙鍚敤 \verb|colorlinks| 閫夐」锛変笅锛�
 	榛戠櫧鎵撳嵃鏃舵枃妗ｄ腑鐨勯儴鍒嗗僵鑹查摼鎺ュ彲鑳戒細鍙樻垚娴呯伆鑹诧紝
 	瑙ｅ喅鏂瑰紡瑙佺 \ref{ssec:extra} 灏忚妭銆�
 
+	閫氳繃涓�浜涜缃紝杩樺彲浠ユ弧瓒充緥濡傝寮曠敤鐨勬枃鐚寜鐓у紩鐢ㄩ『搴忔帓搴忥紝
+	鑰屾湭寮曠敤鐨勬枃鐚寜鐓ц嫳鏂囨枃鐚湪鍓嶃�佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇�姹傦紝
+	瑙佺 \ref{ssec:thirdparty} 灏忚妭銆�
+	鏃犳硶浣跨敤 biber 鐨勭敤鎴峰彲浠ヤ娇鐢� bibtex锛岃繖绉嶆儏鍐典笅寤鸿浣跨敤 GBK 缂栫爜锛�
+	鍏蜂綋璁剧疆鏂瑰紡璇疯绗� \ref{sec:compile} 鑺傘��
+
+	涓�浜涢珮绾ц缃紝
+	濡傚皝闈腑閮ㄥ垎鍐呭闀垮害瓒呰繃棰勮绌洪棿瀹归噺鏃剁殑璁剧疆锛�
+	瑙佺 \ref{sec:advanced} 鑺傘��
+
 	涓枃瀛椾綋瀛楀簱涓嶅叏锛堝彧鍖呭惈 GB2312 瀛楃闆嗗唴瀛楃锛夋椂锛�
 	鐢熸垚鐨� pdf 鏂囨。涓彲鑳界己灏戦儴鍒嗗瓧绗︼紝
 	瑙ｅ喅鏂瑰紡瑙佺 \ref{sec:req} 鑺傘��
+	浣跨敤杩囨棫鐨� \hologo{TeX} 绯荤粺鍜屽悇瀹忓寘锛�
+	鎴栦娇鐢ㄦ煇浜� Linux 鍙戣鐗堣蒋浠朵粨搴撴墍鎻愪緵鐨� \hologo{TeX} Live 鏃讹紝
+	鍙兘寮曡捣涓�浜涢棶棰橈紝
+	璇﹁绗� \ref{sec:req} 鑺傘��
 
 	Windows 鎵瑰鐞嗗浜� LF锛圽texttt{\string\n}锛夋崲琛岀殑鎵瑰鐞嗘枃浠舵敮鎸佹湁闂锛�
 	瑙ｅ喅鏂瑰紡瑙佺 \ref{sec:compile} 鑺傘��
-
 	Windows 鐨勨�滆浜嬫湰鈥濈▼搴忓湪鏌ョ湅 LF锛圽texttt{\string\n}锛�
 	鎹㈣鐨勬枃鏈枃浠舵椂瀛樺湪鐫�涓�浜涢棶棰橈紝
 	鍥犳寤鸿鐢ㄦ埛浣跨敤鏀寔 LF 鎹㈣鐨勬枃鏈紪杈戝櫒缂栬緫鏂囦欢锛�
 	璇﹁绗� \ref{sec:doc-dir} 鑺傘��
 
-	浣跨敤杩囨棫鐨� \hologo{TeX} 绯荤粺鍜屽悇瀹忓寘锛�
-	鎴栦娇鐢ㄦ煇浜� Linux 鍙戣鐗堣蒋浠朵粨搴撴墍鎻愪緵鐨� \hologo{TeX} Live 鏃讹紝
-	鍙兘寮曡捣涓�浜涢棶棰橈紝
-	璇﹁绗� \ref{sec:req} 鑺傘��
-
-	鏂囨。榛樿鎯呭喌涓嬫槸鍙岄潰妯″紡锛岀珷鏈彲鑳戒骇鐢熺┖鐧介〉锛岃瑙佺 \ref{ssec:options} 灏忚妭銆�
-
-	閫氳繃涓�浜涜缃紝杩樺彲浠ユ弧瓒充緥濡傝寮曠敤鐨勬枃鐚寜鐓у紩鐢ㄩ『搴忔帓搴忥紝
-	鑰屾湭寮曠敤鐨勬枃鐚寜鐓ц嫳鏂囨枃鐚湪鍓嶃�佷腑鏂囨枃鐚湪鍚庢帓搴忚繖鏍风殑闇�姹傦紝
-	瑙佺 \ref{ssec:thirdparty} 灏忚妭銆�
-
-	鏃犳硶浣跨敤 biber 鐨勭敤鎴峰彲浠ヤ娇鐢� bibtex锛岃繖绉嶆儏鍐典笅寤鸿浣跨敤 GBK 缂栫爜锛�
-	鍏蜂綋璁剧疆鏂瑰紡璇疯绗� \ref{sec:compile} 鑺傘��
-
-	涓�浜涢珮绾ц缃紝
-	濡傚皝闈腑閮ㄥ垎鍐呭闀垮害瓒呰繃棰勮绌洪棿瀹归噺鏃剁殑璁剧疆锛�
-	瑙佺 \ref{sec:advanced} 鑺傘��
-
 	\section{鍏跺畠鍙兘瀛樺湪鐨勯棶棰榼
 		\subsection{涓婃父瀹忓寘鍙兘寮曡捣鐨勯棶棰榼
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex
index 9166bbe39b5..664cb6f220c 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/readme-src/pkuthss.tex
@@ -37,7 +37,7 @@
 \usepackage{hologo}
 
 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
-\newcommand{\docversion}{v1.5.3}
+\newcommand{\docversion}{v1.5.4}
 
 \pkuthssinfo{
 	cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis},
@@ -49,7 +49,7 @@
 	cauthor = {鐩栬尐娉⒙烽挍路缁村厠鎵榼,
 	eauthor = {Casper Ti.\ Vector},
 	studentid = {00910???},
-	date = {浜屻�囦竴鍥涘勾浜旀湀},
+	date = {浜屻�囦竴鍥涘勾涓冩湀},
 	school = {鍖栧涓庡垎瀛愬伐绋嬪闄,
 	cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry ... ?},
 	direction = {鎹 Casper 鑷繁涔熶笉鐭ラ亾},
diff --git a/Master/texmf-dist/doc/latex/pkuthss/readme.pdf b/Master/texmf-dist/doc/latex/pkuthss/readme.pdf
index c8fb38f7e7f..2fdf99546d3 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/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
index b039a54ae45..994660c99f9 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 7092b2c94d8..794a52684ce 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}
-	[2014/05/24 v1.5.3 Common extra settings for the pkuthss document class]
+	[2014/07/04 v1.5.4 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 40f73dc55bc..8493347072c 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}
-	[2014/05/24 v1.5.3 Labels and captions in GBK encoding
+	[2014/07/04 v1.5.4 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 5f730d38244..45ed0befd22 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}
-	[2014/05/24 v1.5.3 Labels and captions in UTF-8 encoding
+	[2014/07/04 v1.5.4 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 034113d3a6e..1422876db1f 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}
-	[2014/05/24 v1.5.3 Peking University dissertation document class]
+	[2014/07/04 v1.5.4 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 88ddebc5b6f..e791f94fd6c 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf