pkuthss (24may14)

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

6 files changed, 24 insertions, 17 deletions

diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkulogo.pdf
index d8222fc52f4..b039a54ae45 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 7b072b8ab3e..7092b2c94d8 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/04/17 v1.5.2 Common extra settings for the pkuthss document class]
+	[2014/05/24 v1.5.3 Common extra settings for the pkuthss document class]
 
 % Check the dependency of pkuthss.
 \@ifclassloaded{pkuthss}{}{
@@ -76,7 +76,7 @@
 	\linespread{1.41}\selectfont
 	% Automatically insert a space between the label and the text in footnotes.
 	\RequirePackage{footmisc}
-	\renewcommand{\footnotelayout}{\ }
+	\renewcommand*{\footnotelayout}{\ }
 \fi
 
 \ifpkuthssextra@opt@tightlist
@@ -119,7 +119,7 @@
 	\ifpkuthssextra@opt@pdfprop
 		% Automatically generate properties for generated PDF.
 		% Use English properties to avoid problems with character encodings.
-		\newcommand{\setpdfproperties}{
+		\newcommand*{\setpdfproperties}{
 			\hypersetup{
 				pdfauthor = {\@eauthor}, pdftitle = {\@etitle},
 				pdfsubject = {\euniversity\ \ethesisname}, pdfkeywords = {\@ekeywords}
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def
index 4b16b451e6a..40f73dc55bc 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/04/17 v1.5.2 Labels and captions in GBK encoding
+	[2014/05/24 v1.5.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 44a597b06c4..5f730d38244 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/04/17 v1.5.2 Labels and captions in UTF-8 encoding
+	[2014/05/24 v1.5.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 cfa2a97f1c1..034113d3a6e 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/04/17 v1.5.2 Peking University dissertation document class]
+	[2014/05/24 v1.5.3 Peking University dissertation document class]
 
 % Process the encoding options.
 \newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue
@@ -74,15 +74,22 @@
 % Whether to enable the default extra settings.
 \ifpkuthss@opt@extra\RequirePackage{pkuthss-extra}\fi
 
-\ifxetex\ifpkuthss@opt@gbk
-	% No support for XeLaTeX compilation in non-unicode encoding, i.e. GBK.
-	\ClassError{pkuthss}%
-		{XeLaTeX compilation is not supported without UTF-8}%
-		{%
-			XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak
-			Therefore please use UTF-8 encoding for the LaTeX code.%
-		}
-\fi\fi
+\ifpkuthss@opt@gbk
+	\ifxetex
+		% No support for XeLaTeX compilation in non-unicode encoding, i.e. GBK.
+		\ClassError{pkuthss}%
+			{XeLaTeX compilation is not supported without UTF-8}%
+			{%
+				XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak
+				Therefore please use UTF-8 encoding for the LaTeX code.%
+			}
+	\else\ifpdf
+		% Fix garbled text in bookmarks for pdfLaTeX compilation in GBK.
+		% Temporary fix until release of ctex 2.x, which will by itself
+		% load xCJK2uni when necessary.
+		\RequirePackage{xCJK2uni}
+	\fi\fi
+\fi
 
 \AtEndOfClass{
 	% Setting chinese captions and labels.
@@ -99,7 +106,7 @@
 \def\pkuthss@int@setpagestyle{
 	% Set the headers and footers on the first page in every chapter.
 	\fancypagestyle{plain}{
-		\fancyhf{}\renewcommand{\headrulewidth}{0pt}
+		\fancyhf{}\renewcommand*{\headrulewidth}{0pt}
 		\if@twoside
 			\fancyfoot[RO,LE]{\small\normalfont --~\thepage~--}
 		\else
@@ -174,7 +181,7 @@
 \pkuthss@int@infoitemb{cabstractname}
 \pkuthss@int@infoitemb{eabstractname}
 % Set document information using the `key = value' grammar.
-\newcommand{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}}
+\newcommand*{\pkuthssinfo}[1]{\setkeys{pkuthss@info}{#1}}
 
 % Usage: \pkuthss@int@fillinblank{(number of lines)}{(line width)}{(contents)}
 \def\pkuthss@int@fillinblank#1#2#3{
diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
index c8be82e9ca6..88ddebc5b6f 100644
--- a/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf
+++ b/Master/texmf-dist/tex/latex/pkuthss/pkuword.pdf