pkuthss (18jan13)

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

13 files changed, 64 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt
index 7d1941c98ae..2183d691603 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt
@@ -1,3 +1,13 @@
+2013-01-10, v1.4 rc1
+
+	* Changes to documentation:
+	- Remove troublesome `hologo' package.
+	- chap3.tex: add notice about biblatex's `\bibname' issue.
+	- introduction.tex: update info about location of example source code.
+
+	* Misc:
+	- README: add not-intended-as-documentation notice.
+
 2012-11-12, v1.4 beta3
 
 	* Misc:
@@ -5,6 +15,7 @@
 	- utils/dist: Fix date conversion code again.
 
 2012-10-11, v1.4 beta2
+
 	* Changes to package code:
 	- Adjust pkulogo/pkuword typesetting according to
 	  <http://web5.pku.edu.cn/bs/images/cgzs/images1/13.png>
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex
index 9b5982f91f4..ae535f7a057 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap1.tex
@@ -10,7 +10,7 @@
 	正确编译需要以下几部分：
 	\begin{itemize}
 		\item 一个基本的 \TeX{} 发行版。
-		\item CJK 或 XeCJK（供 \hologo{XeLaTeX} 使用）宏包。
+		\item CJK 或 XeCJK（供 Xe\LaTeX{} 使用）宏包。
 		\item ctex 宏包\supercite{ctex,ctex-faq}（提供了 ctexbook 文档类）。
 		\item 中文字体。
 		\item 如果要使用 biblatex 进行文献列表和引用的排版的话，
@@ -120,7 +120,7 @@ texdoc pkuthss
 		\end{itemize}
 			\myemph{%
 				注：%
-				\hologo{pdfLaTeX} 方式编译（见第 \ref{sec:compile} 节）
+				pdf\LaTeX{} 方式编译（见第 \ref{sec:compile} 节）
 				可能需要将 eps 图片转换为 pdf 格式，
 				而使用 Makefile 或伪“Makefile”时这些图片可以自动生成；
 				不使用 Makefile 的用户可以手动运行 %
@@ -136,15 +136,15 @@ texdoc pkuthss
 		\item \LaTeX{} -- dvipdfmx 方式：\\
 			依次执行 \verb|latex|，\verb|biber|（或 \verb|bibtex|），%
 			\verb|latex|，\verb|latex| 和 \verb|dvipdfmx|。
-		\item \hologo{pdfLaTeX} 方式：\\
+		\item pdf\LaTeX{} 方式：\\
 			依次执行 \verb|pdflatex|，\verb|biber|（或 \verb|bibtex|），%
 			\verb|pdflatex| 和 \verb|pdflatex|。
-		\item \hologo{XeLaTeX} 方式：\\
+		\item Xe\LaTeX{} 方式：\\
 			依次执行 \verb|xelatex|，\verb|biber|（或 \verb|bibtex|），%
 			\verb|xelatex| 和 \verb|xelatex|。\\
 			\myemph{%
-				注意：\hologo{XeLaTeX} 对非 UTF-8 的编码支持不好，
-				因此 \hologo{XeLaTeX} 方式的编译不支持 GBK 编码。
+				注意：Xe\LaTeX{} 对非 UTF-8 的编码支持不好，
+				因此 Xe\LaTeX{} 方式的编译不支持 GBK 编码。
 			}
 	\end{itemize}
 
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 5a85109c458..704b1d83d2b 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/chap3.tex
@@ -30,6 +30,14 @@
 	如封面中部分内容长度超过预设空间容量时的设置，
 	见第 \ref{sec:advanced} 节。
 
+	biblatex 宏包\cite{biblatex}会自行设定 \verb|\bibname|，
+	故会覆盖通过 \verb|\CTEXoptions| 设定的参考文献列表标题。
+	使用 biblatex 的用户可以使用 \verb|\printbibliography| 的
+	\verb|title| 选项来手动设定参考文献列表的标题，例如：
+\begin{Verbatim}[frame = single]
+\printbibliography[title = {文献}, ...] % “...”为其它选项。
+\end{Verbatim}
+
 	\section{其它可能存在的问题}
 		\subsection{上游宏包可能引起的问题}
 
@@ -50,7 +58,7 @@
 
 		\subsection{其它一些问题}
 
-		使用 GBK 编码和 \hologo{pdfLaTeX} 编译方式时需要用户%
+		使用 GBK 编码和 pdf\LaTeX{} 编译方式时需要用户%
 		运行 \verb|gbk2uni| 程序来转换 \verb|.out| 文件，
 		否则生成的 pdf 书签可能乱码。
 		考虑到用户可能没有 \verb|gbk2uni| 程序，且有用户使用 UTF-8 编码，
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/introduction.tex
index e2485963cfe..4ea0950ea76 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/introduction.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/chap/introduction.tex
@@ -26,7 +26,7 @@ pkuthss 文档模版由三部分构成：
 texdoc pkuthss
 \end{Verbatim}
 		同时，
-		本文档的源代码（位于 \verb|doc/| 目录下）%
+		本文档的源代码（位和本文档的 pdf 文件处于同一目录下）%
 		也正是用户撰写自己的学位论文时的一个模版：
 		用户只需按照模版中的框架修改代码，
 		即可写出自己的论文。
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.bib
index 3a3d501cd8b..62356815231 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.4},
+	title = {biblatex 参考文献和引用样式：caspervector v0.1.6},
 	type = {M/OL},
 	date = {2012-10-11},
-	url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.4.zip},
-	urldate = {2012-10-11},
+	url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.6.zip},
+	urldate = {2013-01-10},
 	userf = {zh},
 }
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex
index 2be40dd793b..c16f3deeb14 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex
@@ -22,14 +22,12 @@
 \usepackage{amssymb}
 % 提供 Verbatim 环境和 \VerbatimInput 命令。
 \usepackage{fancyvrb}
-% 提供各种 TeX logo，特别是 XeTeX 系的诡异 logo。
-\usepackage{hologo}
 
 % 使被强调的内容为红色。
 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
 
 % pkuthss 文档模版的版本。
-\newcommand{\docversion}{v1.4 beta3}
+\newcommand{\docversion}{v1.4 rc1}
 % 设定文档的基本信息。
 \pkuthssinfo{
 	cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
@@ -45,7 +43,7 @@
 	cauthor = {盖茨波 $\cdot$ 钛 $\cdot$ 维克托},
 	eauthor = {Casper Ti.\ Vector},
 	studentid = {00910???},
-	date = {二〇一二年十一月},
+	date = {二〇一三年一月},
 	school = {化学与分子工程学院},
 	cmajor = {化学（？）}, emajor = {Chemistry},
 	direction = {据说 Casper 自己也不知道},
diff --git a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf
index c22b0734538..662467b582b 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 a78adf57699..23d5699498b 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt
@@ -1,3 +1,13 @@
+2013-01-10, v1.4 rc1
+
+	* Changes to documentation:
+	- Remove troublesome `hologo' package.
+	- chap3.tex: add notice about biblatex's `\bibname' issue.
+	- introduction.tex: update info about location of example source code.
+
+	* Misc:
+	- README: add not-intended-as-documentation notice.
+
 2012-11-12, v1.4 beta3
 
 	* Misc:
@@ -5,6 +15,7 @@
 	- utils/dist: Fix date conversion code again.
 
 2012-10-11, v1.4 beta2
+
 	* Changes to package code:
 	- Adjust pkulogo/pkuword typesetting according to
 	  <http://web5.pku.edu.cn/bs/images/cgzs/images1/13.png>
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex
index 28e17061046..fc06ee0afb7 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap1.tex
@@ -10,7 +10,7 @@
 	姝ｇ‘缂栬瘧闇�瑕佷互涓嬪嚑閮ㄥ垎锛�
 	\begin{itemize}
 		\item 涓�涓熀鏈殑 \TeX{} 鍙戣鐗堛��
-		\item CJK 鎴� XeCJK锛堜緵 \hologo{XeLaTeX} 浣跨敤锛夊畯鍖呫��
+		\item CJK 鎴� XeCJK锛堜緵 Xe\LaTeX{} 浣跨敤锛夊畯鍖呫��
 		\item ctex 瀹忓寘\supercite{ctex,ctex-faq}锛堟彁渚涗簡 ctexbook 鏂囨。绫伙級銆�
 		\item 涓枃瀛椾綋銆�
 		\item 濡傛灉瑕佷娇鐢� biblatex 杩涜鏂囩尞鍒楄〃鍜屽紩鐢ㄧ殑鎺掔増鐨勮瘽锛�
@@ -120,7 +120,7 @@ texdoc pkuthss
 		\end{itemize}
 			\myemph{%
 				娉細%
-				\hologo{pdfLaTeX} 鏂瑰紡缂栬瘧锛堣绗� \ref{sec:compile} 鑺傦級
+				pdf\LaTeX{} 鏂瑰紡缂栬瘧锛堣绗� \ref{sec:compile} 鑺傦級
 				鍙兘闇�瑕佸皢 eps 鍥剧墖杞崲涓� pdf 鏍煎紡锛�
 				鑰屼娇鐢� Makefile 鎴栦吉鈥淢akefile鈥濇椂杩欎簺鍥剧墖鍙互鑷姩鐢熸垚锛�
 				涓嶄娇鐢� Makefile 鐨勭敤鎴峰彲浠ユ墜鍔ㄨ繍琛� %
@@ -136,15 +136,15 @@ texdoc pkuthss
 		\item \LaTeX{} -- dvipdfmx 鏂瑰紡锛歕\
 			渚濇鎵ц \verb|latex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝%
 			\verb|latex|锛孿verb|latex| 鍜� \verb|dvipdfmx|銆�
-		\item \hologo{pdfLaTeX} 鏂瑰紡锛歕\
+		\item pdf\LaTeX{} 鏂瑰紡锛歕\
 			渚濇鎵ц \verb|pdflatex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝%
 			\verb|pdflatex| 鍜� \verb|pdflatex|銆�
-		\item \hologo{XeLaTeX} 鏂瑰紡锛歕\
+		\item Xe\LaTeX{} 鏂瑰紡锛歕\
 			渚濇鎵ц \verb|xelatex|锛孿verb|biber|锛堟垨 \verb|bibtex|锛夛紝%
 			\verb|xelatex| 鍜� \verb|xelatex|銆俓\
 			\myemph{%
-				娉ㄦ剰锛歕hologo{XeLaTeX} 瀵归潪 UTF-8 鐨勭紪鐮佹敮鎸佷笉濂斤紝
-				鍥犳 \hologo{XeLaTeX} 鏂瑰紡鐨勭紪璇戜笉鏀寔 GBK 缂栫爜銆�
+				娉ㄦ剰锛歑e\LaTeX{} 瀵归潪 UTF-8 鐨勭紪鐮佹敮鎸佷笉濂斤紝
+				鍥犳 Xe\LaTeX{} 鏂瑰紡鐨勭紪璇戜笉鏀寔 GBK 缂栫爜銆�
 			}
 	\end{itemize}
 
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 21b076f2711..9562ed6e451 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/chap3.tex
@@ -30,6 +30,14 @@
 	濡傚皝闈腑閮ㄥ垎鍐呭闀垮害瓒呰繃棰勮绌洪棿瀹归噺鏃剁殑璁剧疆锛�
 	瑙佺 \ref{sec:advanced} 鑺傘��
 
+	biblatex 瀹忓寘\cite{biblatex}浼氳嚜琛岃瀹� \verb|\bibname|锛�
+	鏁呬細瑕嗙洊閫氳繃 \verb|\CTEXoptions| 璁惧畾鐨勫弬鑰冩枃鐚垪琛ㄦ爣棰樸��
+	浣跨敤 biblatex 鐨勭敤鎴峰彲浠ヤ娇鐢� \verb|\printbibliography| 鐨�
+	\verb|title| 閫夐」鏉ユ墜鍔ㄨ瀹氬弬鑰冩枃鐚垪琛ㄧ殑鏍囬锛屼緥濡傦細
+\begin{Verbatim}[frame = single]
+\printbibliography[title = {鏂囩尞}, ...] % 鈥�...鈥濅负鍏跺畠閫夐」銆�
+\end{Verbatim}
+
 	\section{鍏跺畠鍙兘瀛樺湪鐨勯棶棰榼
 		\subsection{涓婃父瀹忓寘鍙兘寮曡捣鐨勯棶棰榼
 
@@ -50,7 +58,7 @@
 
 		\subsection{鍏跺畠涓�浜涢棶棰榼
 
-		浣跨敤 GBK 缂栫爜鍜� \hologo{pdfLaTeX} 缂栬瘧鏂瑰紡鏃堕渶瑕佺敤鎴�%
+		浣跨敤 GBK 缂栫爜鍜� pdf\LaTeX{} 缂栬瘧鏂瑰紡鏃堕渶瑕佺敤鎴�%
 		杩愯 \verb|gbk2uni| 绋嬪簭鏉ヨ浆鎹� \verb|.out| 鏂囦欢锛�
 		鍚﹀垯鐢熸垚鐨� pdf 涔︾鍙兘涔辩爜銆�
 		鑰冭檻鍒扮敤鎴峰彲鑳芥病鏈� \verb|gbk2uni| 绋嬪簭锛屼笖鏈夌敤鎴蜂娇鐢� UTF-8 缂栫爜锛�
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/introduction.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/introduction.tex
index b940144f3d2..df62312cbb7 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/introduction.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/chap/introduction.tex
@@ -26,7 +26,7 @@ pkuthss 鏂囨。妯＄増鐢变笁閮ㄥ垎鏋勬垚锛�
 texdoc pkuthss
 \end{Verbatim}
 		鍚屾椂锛�
-		鏈枃妗ｇ殑婧愪唬鐮侊紙浣嶄簬 \verb|doc/| 鐩綍涓嬶級%
+		鏈枃妗ｇ殑婧愪唬鐮侊紙浣嶅拰鏈枃妗ｇ殑 pdf 鏂囦欢澶勪簬鍚屼竴鐩綍涓嬶級%
 		涔熸鏄敤鎴锋挵鍐欒嚜宸辩殑瀛︿綅璁烘枃鏃剁殑涓�涓ā鐗堬細
 		鐢ㄦ埛鍙渶鎸夌収妯＄増涓殑妗嗘灦淇敼浠ｇ爜锛�
 		鍗冲彲鍐欏嚭鑷繁鐨勮鏂囥��
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.bib
index d9aee4ee4fa..ef693b0d830 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.4},
+	title = {biblatex 鍙傝�冩枃鐚拰寮曠敤鏍峰紡锛歝aspervector v0.1.6},
 	type = {M/OL},
 	date = {2012-10-11},
-	url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.4.zip},
-	urldate = {2012-10-11},
+	url = {http://caspervector.googlecode.com/files/biblatex-caspervector-0.1.6.zip},
+	urldate = {2013-01-10},
 	userf = {zh},
 }
 
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex
index 4e3604094a0..9d5a35d9813 100644
--- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex
+++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex
@@ -22,14 +22,12 @@
 \usepackage{amssymb}
 % 鎻愪緵 Verbatim 鐜鍜� \VerbatimInput 鍛戒护銆�
 \usepackage{fancyvrb}
-% 鎻愪緵鍚勭 TeX logo锛岀壒鍒槸 XeTeX 绯荤殑璇″紓 logo銆�
-\usepackage{hologo}
 
 % 浣胯寮鸿皟鐨勫唴瀹逛负绾㈣壊銆�
 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
 
 % pkuthss 鏂囨。妯＄増鐨勭増鏈��
-\newcommand{\docversion}{v1.4 beta3}
+\newcommand{\docversion}{v1.4 rc1}
 % 璁惧畾鏂囨。鐨勫熀鏈俊鎭��
 \pkuthssinfo{
 	cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis},
@@ -45,7 +43,7 @@
 	cauthor = {鐩栬尐娉� $\cdot$ 閽� $\cdot$ 缁村厠鎵榼,
 	eauthor = {Casper Ti.\ Vector},
 	studentid = {00910???},
-	date = {浜屻�囦竴浜屽勾鍗佷竴鏈坿,
+	date = {浜屻�囦竴涓夊勾涓�鏈坿,
 	school = {鍖栧涓庡垎瀛愬伐绋嬪闄,
 	cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry},
 	direction = {鎹 Casper 鑷繁涔熶笉鐭ラ亾},