pkuthss (24may14)

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

1 files changed, 19 insertions, 12 deletions

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{